[Pkg-privacy-commits] [vidalia] 117/160: Imported Upstream version 0.3.3~alpha
Ximin Luo
infinity0 at moszumanska.debian.org
Sat Aug 22 13:14:52 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 5992023fe173a585a6c917a42994800802bc4d39
Author: Dererk <dererk at debian.org>
Date: Thu Jul 12 01:21:43 2012 -0300
Imported Upstream version 0.3.3~alpha
---
.gitignore | 4 +-
CHANGELOG | 342 +-
CMakeLists.txt | 8 +-
cmake/FindGeoIP.cmake | 20 +-
cmake/VidaliaMacros.cmake | 38 +
debian/README.debs | 12 +-
doc/getting-started.txt | 397 ++
doc/plugin-framework.txt | 153 +
doc/plugin-tutorial.txt | 544 +++
pkg/build-geoip-cache.sh | 8 +-
pkg/osx/CMakeLists.txt | 94 +-
pkg/osx/vidalia.conf.sample | 3 +
pkg/package.sh | 8 +-
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/crypto.cpp | 92 +
src/common/crypto.h | 7 +
src/common/file.cpp | 27 +
src/common/file.h | 3 +
src/common/procutil.cpp | 66 +-
src/common/procutil.h | 3 +-
src/common/sha256.c | 331 ++
src/common/stringutil.cpp | 47 +
src/common/stringutil.h | 1 +
src/torcontrol/Circuit.cpp | 68 +-
src/torcontrol/Circuit.h | 40 +
src/torcontrol/ControlConnection.cpp | 121 +-
src/torcontrol/ControlConnection.h | 5 +-
src/torcontrol/ControlSocket.cpp | 142 +-
src/torcontrol/ControlSocket.h | 19 +-
src/torcontrol/RouterDescriptor.cpp | 22 +
src/torcontrol/RouterDescriptor.h | 5 +
src/torcontrol/SendCommandEvent.cpp | 18 +-
src/torcontrol/Stream.cpp | 4 +-
src/torcontrol/Stream.h | 1 +
src/torcontrol/TorControl.cpp | 223 +-
src/torcontrol/TorControl.h | 43 +-
src/torcontrol/TorEvents.cpp | 42 +
src/torcontrol/TorEvents.h | 50 +-
src/torcontrol/TorProcess.cpp | 4 +-
src/torcontrol/TorSignal.h | 2 +-
src/vidalia/CMakeLists.txt | 262 +-
src/vidalia/ControlPasswordInputDialog.cpp | 32 +-
src/vidalia/ControlPasswordInputDialog.h | 15 -
src/vidalia/ControlPasswordInputDialog.ui | 146 +-
src/vidalia/FirstRunWizard.cpp | 151 +
src/vidalia/FirstRunWizard.h | 66 +
src/vidalia/LanguageSupport.cpp | 46 +-
src/vidalia/MainWindow.cpp | 2822 +++++++-------
src/vidalia/MainWindow.h | 198 +-
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 | 138 -
src/vidalia/VClickLabel.h | 75 -
src/vidalia/VMessageBox.cpp | 53 +-
src/vidalia/VMessageBox.h | 11 +-
src/vidalia/VTabWidget.cpp | 58 +
src/vidalia/VTabWidget.h | 46 +
src/vidalia/Vidalia.cpp | 9 +-
src/vidalia/Vidalia.h | 5 +
src/vidalia/VidaliaTab.cpp | 76 +
src/vidalia/VidaliaTab.h | 74 +
src/vidalia/bwgraph/BandwidthGraph.cpp | 27 +-
src/vidalia/bwgraph/BandwidthGraph.h | 12 +-
src/vidalia/bwgraph/BandwidthGraph.ui | 659 ++--
src/vidalia/config/AbstractTorSettings.cpp | 10 +
src/vidalia/config/AbstractTorSettings.h | 6 +
src/vidalia/config/AdvancedPage.cpp | 81 +-
src/vidalia/config/AdvancedPage.h | 16 +
src/vidalia/config/AdvancedPage.ui | 219 +-
src/vidalia/config/BridgeUsageDialog.ui | 63 +-
src/vidalia/config/ConfigDialog.cpp | 23 +-
src/vidalia/config/ConfigDialog.h | 10 +-
src/vidalia/config/ConfigPage.h | 6 +
src/vidalia/config/DefaultSettings.cpp | 20 +
src/vidalia/config/DefaultSettings.h | 37 +
src/vidalia/config/GeneralPage.cpp | 25 -
src/vidalia/config/GeneralPage.h | 2 -
src/vidalia/config/GeneralPage.ui | 158 +-
src/vidalia/config/NetworkPage.cpp | 53 +-
src/vidalia/config/NetworkPage.h | 6 +
src/vidalia/config/NetworkSettings.cpp | 113 +-
src/vidalia/config/ServerPage.cpp | 103 +-
src/vidalia/config/ServerPage.h | 5 +
src/vidalia/config/ServerPage.ui | 322 +-
src/vidalia/config/ServerSettings.cpp | 336 +-
src/vidalia/config/ServerSettings.h | 26 +-
src/vidalia/config/Service.cpp | 119 -
src/vidalia/config/Service.h | 80 -
src/vidalia/config/ServiceList.cpp | 56 -
src/vidalia/config/ServiceList.h | 51 -
src/vidalia/config/ServicePage.cpp | 613 ----
src/vidalia/config/ServicePage.h | 80 -
src/vidalia/config/ServicePage.ui | 166 -
src/vidalia/config/ServiceSettings.cpp | 167 -
src/vidalia/config/ServiceSettings.h | 61 -
src/vidalia/config/TorSettings.cpp | 259 +-
src/vidalia/config/TorSettings.h | 25 +
src/vidalia/config/TorrcDialog.cpp | 115 +-
src/vidalia/config/TorrcDialog.h | 1 +
src/vidalia/config/TorrcDialog.ui | 328 +-
src/vidalia/config/VSettings.cpp | 25 +-
src/vidalia/config/VSettings.h | 12 +
src/vidalia/config/VidaliaSettings.cpp | 154 +-
src/vidalia/config/VidaliaSettings.h | 73 +-
src/vidalia/config/torrc/Torrc.cpp | 271 ++
src/vidalia/config/torrc/Torrc.h | 77 +
src/vidalia/config/torrc/TorrcParser.cpp | 430 +++
src/vidalia/config/torrc/TorrcParser.h | 189 +
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/en/contents.xml | 10 +-
src/vidalia/help/content/en/server.html | 44 +-
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 | 6 +-
src/vidalia/help/content/ru/index.html | 2 +-
src/vidalia/i18n/CMakeLists.txt | 60 +-
src/vidalia/i18n/po/.tx/config | 125 +-
src/vidalia/i18n/po/af/qt_af.po | 5 +-
src/vidalia/i18n/po/af/vidalia_af.po | 364 +-
src/vidalia/i18n/po/ak/qt_ak.po | 5 +-
src/vidalia/i18n/po/ak/vidalia_ak.po | 364 +-
src/vidalia/i18n/po/am/qt_am.po | 5 +-
src/vidalia/i18n/po/am/vidalia_am.po | 364 +-
src/vidalia/i18n/po/ar/qt_ar.po | 29 +-
src/vidalia/i18n/po/ar/vidalia_ar.po | 543 ++-
src/vidalia/i18n/po/arn/qt_arn.po | 5 +-
src/vidalia/i18n/po/arn/vidalia_arn.po | 364 +-
src/vidalia/i18n/po/ast/qt_ast.po | 5 +-
src/vidalia/i18n/po/ast/vidalia_ast.po | 364 +-
src/vidalia/i18n/po/az/qt_az.po | 5 +-
src/vidalia/i18n/po/az/vidalia_az.po | 364 +-
src/vidalia/i18n/po/be/qt_be.po | 5 +-
src/vidalia/i18n/po/be/vidalia_be.po | 756 +---
src/vidalia/i18n/po/bg/qt_bg.po | 5 +-
src/vidalia/i18n/po/bg/vidalia_bg.po | 1627 ++++-----
src/vidalia/i18n/po/bn/qt_bn.po | 5 +-
src/vidalia/i18n/po/bn/vidalia_bn.po | 756 +---
src/vidalia/i18n/po/bn_IN/qt_bn_IN.po | 5 +-
src/vidalia/i18n/po/bn_IN/vidalia_bn_IN.po | 364 +-
src/vidalia/i18n/po/bo/qt_bo.po | 5 +-
src/vidalia/i18n/po/bo/vidalia_bo.po | 2882 +++++----------
src/vidalia/i18n/po/br/qt_br.po | 5 +-
src/vidalia/i18n/po/br/vidalia_br.po | 756 +---
src/vidalia/i18n/po/bs/qt_bs.po | 5 +-
src/vidalia/i18n/po/bs/vidalia_bs.po | 756 +---
src/vidalia/i18n/po/ca/qt_ca.po | 100 +-
src/vidalia/i18n/po/ca/vidalia_ca.po | 1853 +++++-----
src/vidalia/i18n/po/cs/qt_cs.po | 67 +-
src/vidalia/i18n/po/cs/vidalia_cs.po | 1263 ++++---
src/vidalia/i18n/po/csb/qt_csb.po | 5 +-
src/vidalia/i18n/po/csb/vidalia_csb.po | 364 +-
src/vidalia/i18n/po/cy/qt_cy.po | 38 +-
src/vidalia/i18n/po/cy/vidalia_cy.po | 869 +++--
src/vidalia/i18n/po/da/qt_da.po | 28 +-
src/vidalia/i18n/po/da/vidalia_da.po | 2095 ++++++-----
src/vidalia/i18n/po/de/qt_de.po | 29 +-
src/vidalia/i18n/po/de/vidalia_de.po | 466 ++-
src/vidalia/i18n/po/de_CH/qt_de_CH.po | 5 +-
src/vidalia/i18n/po/de_CH/vidalia_de_CH.po | 364 +-
src/vidalia/i18n/po/de_DE/qt_de_DE.po | 5 +-
src/vidalia/i18n/po/de_DE/vidalia_de_DE.po | 2882 +++++----------
src/vidalia/i18n/po/dz/qt_dz.po | 5 +-
src/vidalia/i18n/po/dz/vidalia_dz.po | 364 +-
src/vidalia/i18n/po/el/qt_el.po | 31 +-
src/vidalia/i18n/po/el/vidalia_el.po | 761 ++--
src/vidalia/i18n/po/eo/qt_eo.po | 28 +-
src/vidalia/i18n/po/eo/vidalia_eo.po | 416 +--
src/vidalia/i18n/po/es/qt_es.po | 25 +-
src/vidalia/i18n/po/es/vidalia_es.po | 784 ++--
src/vidalia/i18n/po/et/qt_et.po | 5 +-
src/vidalia/i18n/po/et/vidalia_et.po | 364 +-
src/vidalia/i18n/po/eu/qt_eu.po | 170 +-
src/vidalia/i18n/po/eu/vidalia_eu.po | 2143 ++++++-----
src/vidalia/i18n/po/fa/qt_fa.po | 28 +-
src/vidalia/i18n/po/fa/vidalia_fa.po | 2046 +++++------
src/vidalia/i18n/po/fi/qt_fi.po | 28 +-
src/vidalia/i18n/po/fi/vidalia_fi.po | 940 ++---
src/vidalia/i18n/po/fil/qt_fil.po | 5 +-
src/vidalia/i18n/po/fil/vidalia_fil.po | 364 +-
src/vidalia/i18n/po/fo/qt_fo.po | 5 +-
src/vidalia/i18n/po/fo/vidalia_fo.po | 756 +---
src/vidalia/i18n/po/fr/qt_fr.po | 31 +-
src/vidalia/i18n/po/fr/vidalia_fr.po | 1092 +++---
src/vidalia/i18n/po/fur/qt_fur.po | 5 +-
src/vidalia/i18n/po/fur/vidalia_fur.po | 364 +-
src/vidalia/i18n/po/fy/qt_fy.po | 5 +-
src/vidalia/i18n/po/fy/vidalia_fy.po | 756 +---
src/vidalia/i18n/po/ga/qt_ga.po | 5 +-
src/vidalia/i18n/po/ga/vidalia_ga.po | 364 +-
src/vidalia/i18n/po/gl/qt_gl.po | 5 +-
src/vidalia/i18n/po/gl/vidalia_gl.po | 364 +-
src/vidalia/i18n/po/gu/qt_gu.po | 15 +-
src/vidalia/i18n/po/gu/vidalia_gu.po | 404 +-
src/vidalia/i18n/po/gun/qt_gun.po | 5 +-
src/vidalia/i18n/po/gun/vidalia_gun.po | 364 +-
src/vidalia/i18n/po/ha/qt_ha.po | 5 +-
src/vidalia/i18n/po/ha/vidalia_ha.po | 364 +-
src/vidalia/i18n/po/he/qt_he.po | 169 +-
src/vidalia/i18n/po/he/vidalia_he.po | 1333 ++++---
src/vidalia/i18n/po/hi/qt_hi.po | 5 +-
src/vidalia/i18n/po/hi/vidalia_hi.po | 845 ++---
src/vidalia/i18n/po/hr/qt_hr.po | 5 +-
src/vidalia/i18n/po/hr/vidalia_hr.po | 364 +-
src/vidalia/i18n/po/hr_HR/qt_hr_HR.po | 435 ---
src/vidalia/i18n/po/hr_HR/vidalia_hr_HR.po | 3847 --------------------
src/vidalia/i18n/po/ht/qt_ht.po | 5 +-
src/vidalia/i18n/po/ht/vidalia_ht.po | 364 +-
src/vidalia/i18n/po/hu/qt_hu.po | 27 +-
src/vidalia/i18n/po/hu/vidalia_hu.po | 466 ++-
src/vidalia/i18n/po/hy/qt_hy.po | 5 +-
src/vidalia/i18n/po/hy/vidalia_hy.po | 756 +---
src/vidalia/i18n/po/id/qt_id.po | 28 +-
src/vidalia/i18n/po/id/vidalia_id.po | 1773 +++++----
src/vidalia/i18n/po/is/qt_is.po | 5 +-
src/vidalia/i18n/po/is/vidalia_is.po | 408 +--
src/vidalia/i18n/po/it/qt_it.po | 37 +-
src/vidalia/i18n/po/it/vidalia_it.po | 592 ++-
src/vidalia/i18n/po/ja/qt_ja.po | 49 +-
src/vidalia/i18n/po/ja/vidalia_ja.po | 1358 ++-----
src/vidalia/i18n/po/jv/qt_jv.po | 5 +-
src/vidalia/i18n/po/jv/vidalia_jv.po | 756 +---
src/vidalia/i18n/po/ka/qt_ka.po | 5 +-
src/vidalia/i18n/po/ka/vidalia_ka.po | 2882 +++++----------
src/vidalia/i18n/po/km/qt_km.po | 5 +-
src/vidalia/i18n/po/km/vidalia_km.po | 2882 +++++----------
src/vidalia/i18n/po/kn/qt_kn.po | 5 +-
src/vidalia/i18n/po/kn/vidalia_kn.po | 364 +-
src/vidalia/i18n/po/ko/qt_ko.po | 170 +-
src/vidalia/i18n/po/ko/vidalia_ko.po | 3709 +++++++------------
src/vidalia/i18n/po/ku/qt_ku.po | 5 +-
src/vidalia/i18n/po/ku/vidalia_ku.po | 2882 +++++----------
src/vidalia/i18n/po/kw/qt_kw.po | 5 +-
src/vidalia/i18n/po/kw/vidalia_kw.po | 756 +---
src/vidalia/i18n/po/ky/qt_ky.po | 5 +-
src/vidalia/i18n/po/ky/vidalia_ky.po | 756 +---
src/vidalia/i18n/po/lb/qt_lb.po | 5 +-
src/vidalia/i18n/po/lb/vidalia_lb.po | 364 +-
src/vidalia/i18n/po/ln/qt_ln.po | 5 +-
src/vidalia/i18n/po/ln/vidalia_ln.po | 364 +-
src/vidalia/i18n/po/lo/qt_lo.po | 5 +-
src/vidalia/i18n/po/lo/vidalia_lo.po | 364 +-
src/vidalia/i18n/po/lt/qt_lt.po | 5 +-
src/vidalia/i18n/po/lt/vidalia_lt.po | 802 ++--
src/vidalia/i18n/po/lv/qt_lv.po | 5 +-
src/vidalia/i18n/po/lv/vidalia_lv.po | 364 +-
src/vidalia/i18n/po/mg/qt_mg.po | 5 +-
src/vidalia/i18n/po/mg/vidalia_mg.po | 364 +-
src/vidalia/i18n/po/mi/qt_mi.po | 5 +-
src/vidalia/i18n/po/mi/vidalia_mi.po | 364 +-
src/vidalia/i18n/po/mk/qt_mk.po | 5 +-
src/vidalia/i18n/po/mk/vidalia_mk.po | 364 +-
src/vidalia/i18n/po/ml/qt_ml.po | 5 +-
src/vidalia/i18n/po/ml/vidalia_ml.po | 364 +-
src/vidalia/i18n/po/mn/qt_mn.po | 5 +-
src/vidalia/i18n/po/mn/vidalia_mn.po | 364 +-
src/vidalia/i18n/po/mr/qt_mr.po | 5 +-
src/vidalia/i18n/po/mr/vidalia_mr.po | 364 +-
src/vidalia/i18n/po/ms/qt_ms.po | 5 +-
src/vidalia/i18n/po/ms/vidalia_ms.po | 364 +-
src/vidalia/i18n/po/mt/qt_mt.po | 5 +-
src/vidalia/i18n/po/mt/vidalia_mt.po | 364 +-
src/vidalia/i18n/po/my/qt_my.po | 28 +-
src/vidalia/i18n/po/my/vidalia_my.po | 2088 ++++++-----
src/vidalia/i18n/po/nah/qt_nah.po | 5 +-
src/vidalia/i18n/po/nah/vidalia_nah.po | 364 +-
src/vidalia/i18n/po/nap/qt_nap.po | 5 +-
src/vidalia/i18n/po/nap/vidalia_nap.po | 364 +-
src/vidalia/i18n/po/nb/qt_nb.po | 28 +-
src/vidalia/i18n/po/nb/vidalia_nb.po | 467 ++-
src/vidalia/i18n/po/ne/qt_ne.po | 5 +-
src/vidalia/i18n/po/ne/vidalia_ne.po | 364 +-
src/vidalia/i18n/po/nl/qt_nl.po | 41 +-
src/vidalia/i18n/po/nl/vidalia_nl.po | 948 +++--
src/vidalia/i18n/po/nn/qt_nn.po | 5 +-
src/vidalia/i18n/po/nn/vidalia_nn.po | 364 +-
src/vidalia/i18n/po/nso/qt_nso.po | 5 +-
src/vidalia/i18n/po/nso/vidalia_nso.po | 364 +-
src/vidalia/i18n/po/oc/qt_oc.po | 5 +-
src/vidalia/i18n/po/oc/vidalia_oc.po | 364 +-
src/vidalia/i18n/po/or/qt_or.po | 5 +-
src/vidalia/i18n/po/or/vidalia_or.po | 756 +---
src/vidalia/i18n/po/pa/qt_pa.po | 5 +-
src/vidalia/i18n/po/pa/vidalia_pa.po | 364 +-
src/vidalia/i18n/po/pap/qt_pap.po | 5 +-
src/vidalia/i18n/po/pap/vidalia_pap.po | 364 +-
src/vidalia/i18n/po/pl/qt_pl.po | 28 +-
src/vidalia/i18n/po/pl/vidalia_pl.po | 633 ++--
src/vidalia/i18n/po/pms/qt_pms.po | 5 +-
src/vidalia/i18n/po/pms/vidalia_pms.po | 364 +-
src/vidalia/i18n/po/ps/qt_ps.po | 5 +-
src/vidalia/i18n/po/ps/vidalia_ps.po | 364 +-
src/vidalia/i18n/po/pt/qt_pt.po | 45 +-
src/vidalia/i18n/po/pt/vidalia_pt.po | 983 +++--
src/vidalia/i18n/po/pt_BR/qt_pt_BR.po | 78 +-
src/vidalia/i18n/po/pt_BR/vidalia_pt_BR.po | 866 +++--
src/vidalia/i18n/po/ro/qt_ro.po | 28 +-
src/vidalia/i18n/po/ro/vidalia_ro.po | 901 +----
src/vidalia/i18n/po/ru/qt_ru.po | 33 +-
src/vidalia/i18n/po/ru/vidalia_ru.po | 447 +--
src/vidalia/i18n/po/sco/qt_sco.po | 5 +-
src/vidalia/i18n/po/sco/vidalia_sco.po | 364 +-
src/vidalia/i18n/po/sk/qt_sk.po | 171 +-
src/vidalia/i18n/po/sk/vidalia_sk.po | 2117 ++++-------
src/vidalia/i18n/po/sl/qt_sl.po | 6 +-
src/vidalia/i18n/po/sl/vidalia_sl.po | 1811 +++++----
src/vidalia/i18n/po/so/qt_so.po | 5 +-
src/vidalia/i18n/po/so/vidalia_so.po | 756 +---
src/vidalia/i18n/po/son/qt_son.po | 5 +-
src/vidalia/i18n/po/son/vidalia_son.po | 364 +-
src/vidalia/i18n/po/sq/qt_sq.po | 6 +-
src/vidalia/i18n/po/sq/vidalia_sq.po | 813 +----
src/vidalia/i18n/po/sr/qt_sr.po | 28 +-
src/vidalia/i18n/po/sr/vidalia_sr.po | 2378 +++++-------
src/vidalia/i18n/po/st/qt_st.po | 5 +-
src/vidalia/i18n/po/st/vidalia_st.po | 756 +---
src/vidalia/i18n/po/su/qt_su.po | 5 +-
src/vidalia/i18n/po/su/vidalia_su.po | 364 +-
src/vidalia/i18n/po/sv/qt_sv.po | 21 +-
src/vidalia/i18n/po/sv/vidalia_sv.po | 1333 ++-----
src/vidalia/i18n/po/sw/qt_sw.po | 5 +-
src/vidalia/i18n/po/sw/vidalia_sw.po | 364 +-
src/vidalia/i18n/po/ta/qt_ta.po | 5 +-
src/vidalia/i18n/po/ta/vidalia_ta.po | 364 +-
src/vidalia/i18n/po/te/qt_te.po | 5 +-
src/vidalia/i18n/po/te/vidalia_te.po | 364 +-
src/vidalia/i18n/po/templates/qt.pot | 195 +-
src/vidalia/i18n/po/templates/vidalia.pot | 2164 +++++------
src/vidalia/i18n/po/tg/qt_tg.po | 5 +-
src/vidalia/i18n/po/tg/vidalia_tg.po | 364 +-
src/vidalia/i18n/po/th/qt_th.po | 5 +-
src/vidalia/i18n/po/th/vidalia_th.po | 410 +--
src/vidalia/i18n/po/ti/qt_ti.po | 5 +-
src/vidalia/i18n/po/ti/vidalia_ti.po | 364 +-
src/vidalia/i18n/po/tk/qt_tk.po | 5 +-
src/vidalia/i18n/po/tk/vidalia_tk.po | 364 +-
src/vidalia/i18n/po/tr/qt_tr.po | 47 +-
src/vidalia/i18n/po/tr/vidalia_tr.po | 964 +++--
src/vidalia/i18n/po/uk/qt_uk.po | 173 +-
src/vidalia/i18n/po/uk/vidalia_uk.po | 2899 +++++----------
src/vidalia/i18n/po/ur/qt_ur.po | 5 +-
src/vidalia/i18n/po/ur/vidalia_ur.po | 364 +-
src/vidalia/i18n/po/ve/qt_ve.po | 5 +-
src/vidalia/i18n/po/ve/vidalia_ve.po | 364 +-
src/vidalia/i18n/po/vi/qt_vi.po | 5 +-
src/vidalia/i18n/po/vi/vidalia_vi.po | 410 +--
src/vidalia/i18n/po/wa/qt_wa.po | 5 +-
src/vidalia/i18n/po/wa/vidalia_wa.po | 756 +---
src/vidalia/i18n/po/wo/qt_wo.po | 5 +-
src/vidalia/i18n/po/wo/vidalia_wo.po | 756 +---
src/vidalia/i18n/po/zh_CN/qt_zh_CN.po | 21 +-
src/vidalia/i18n/po/zh_CN/vidalia_zh_CN.po | 559 ++-
src/vidalia/i18n/po/zh_HK/qt_zh_HK.po | 5 +-
src/vidalia/i18n/po/zh_HK/vidalia_zh_HK.po | 364 +-
src/vidalia/i18n/po/zh_TW/qt_zh_TW.po | 18 +-
src/vidalia/i18n/po/zh_TW/vidalia_zh_TW.po | 828 +----
src/vidalia/i18n/po/zu/qt_zu.po | 5 +-
src/vidalia/i18n/po/zu/vidalia_zu.po | 364 +-
src/vidalia/i18n/vidalia_i18n.qrc | 52 +-
src/vidalia/log/LogFilter.cpp | 241 ++
src/vidalia/log/LogFilter.h | 70 +
src/vidalia/log/LogTreeWidget.cpp | 16 +-
src/vidalia/log/LogTreeWidget.h | 13 +-
src/vidalia/log/MessageLog.cpp | 146 +-
src/vidalia/log/MessageLog.h | 18 +-
src/vidalia/log/MessageLog.ui | 923 +++--
src/vidalia/main.cpp | 4 +-
src/vidalia/network/CircuitListWidget.cpp | 31 +-
src/vidalia/network/CircuitListWidget.h | 6 +-
src/vidalia/network/CountryInfo.cpp | 285 +-
src/vidalia/network/NetViewer.cpp | 257 +-
src/vidalia/network/NetViewer.h | 45 +-
src/vidalia/network/NetViewer.ui | 860 +++--
src/vidalia/network/RouterDescriptorView.cpp | 11 +-
src/vidalia/network/RouterInfoDialog.cpp | 34 +-
src/vidalia/network/RouterListItem.cpp | 158 +
src/vidalia/network/RouterListItem.h | 26 +-
src/vidalia/network/RouterListWidget.cpp | 159 +-
src/vidalia/network/RouterListWidget.h | 23 +-
src/vidalia/network/StreamItem.cpp | 34 +
src/vidalia/network/StreamItem.h | 7 +
src/vidalia/network/TorMapWidget.cpp | 105 +-
src/vidalia/network/TorMapWidget.h | 7 +-
src/vidalia/network/TorMapWidgetInputHandler.cpp | 138 -
src/vidalia/network/TorMapWidgetInputHandler.h | 55 -
src/vidalia/network/TorMapWidgetPopupMenu.cpp | 37 +-
src/vidalia/network/TorMapWidgetPopupMenu.h | 20 +-
src/vidalia/network/ZImageView.cpp | 4 +-
src/vidalia/plugin/DebugDialog.cpp | 69 +
src/vidalia/plugin/DebugDialog.h | 49 +
src/vidalia/plugin/DebugDialog.ui | 64 +
src/vidalia/plugin/PluginEngine.cpp | 240 ++
src/vidalia/plugin/PluginEngine.h | 63 +
src/vidalia/plugin/PluginWrapper.cpp | 244 ++
src/vidalia/plugin/PluginWrapper.h | 68 +
.../plugin/extensions/VidaliaExtensions.cpp | 26 +
src/vidalia/plugin/extensions/VidaliaExtensions.h | 17 +
.../plugin/extensions/VidaliaExtensionsInit.cpp | 25 +
.../plugin/extensions/qtscript_TorControl.cpp | 704 ++++
.../plugin/prototypes/HelperProcessPrototype.cpp | 100 +
.../plugin/prototypes/HelperProcessPrototype.h | 32 +
src/vidalia/plugin/prototypes/TorrcPrototype.cpp | 71 +
src/vidalia/plugin/prototypes/TorrcPrototype.h | 63 +
.../plugin/prototypes/VidaliaTabPrototype.cpp | 75 +
.../plugin/prototypes/VidaliaTabPrototype.h | 42 +
src/vidalia/plugin/prototypes/prototypemacros.h | 49 +
src/vidalia/res/16x16/detach-arrow.png | Bin 0 -> 602 bytes
src/vidalia/res/16x16/detach-arrow.readme.txt | 6 +
src/vidalia/res/country-coordinates.csv | 495 ++-
src/vidalia/res/credits.html | 1 +
src/vidalia/res/flags/ad.png | Bin 0 -> 1185 bytes
src/vidalia/res/flags/ae.png | Bin 1048 -> 1093 bytes
src/vidalia/res/flags/af.png | Bin 1063 -> 1170 bytes
src/vidalia/res/flags/ag.png | Bin 0 -> 1195 bytes
src/vidalia/res/flags/ai.png | Bin 0 -> 1185 bytes
src/vidalia/res/flags/al.png | Bin 1061 -> 1185 bytes
src/vidalia/res/flags/am.png | Bin 1063 -> 1185 bytes
src/vidalia/res/flags/an.png | Bin 1062 -> 1117 bytes
src/vidalia/res/flags/ao.png | Bin 1062 -> 1125 bytes
src/vidalia/res/flags/aq.png | Bin 0 -> 998 bytes
src/vidalia/res/flags/ar.png | Bin 1064 -> 1132 bytes
src/vidalia/res/flags/as.png | Bin 0 -> 1177 bytes
src/vidalia/res/flags/at.png | Bin 1062 -> 1096 bytes
src/vidalia/res/flags/au.png | Bin 1064 -> 1185 bytes
src/vidalia/res/flags/aw.png | Bin 1064 -> 1185 bytes
src/vidalia/res/flags/ax.png | Bin 0 -> 1185 bytes
src/vidalia/res/flags/az.png | Bin 1063 -> 1182 bytes
src/vidalia/res/flags/ba.png | Bin 1064 -> 1185 bytes
src/vidalia/res/flags/bb.png | Bin 1064 -> 1185 bytes
src/vidalia/res/flags/bd.png | Bin 1061 -> 1185 bytes
src/vidalia/res/flags/be.png | Bin 1060 -> 1170 bytes
src/vidalia/res/flags/bf.png | Bin 1063 -> 1182 bytes
src/vidalia/res/flags/bg.png | Bin 602 -> 1038 bytes
src/vidalia/res/flags/bh.png | Bin 1052 -> 1153 bytes
src/vidalia/res/flags/bi.png | Bin 1064 -> 1185 bytes
src/vidalia/res/flags/bj.png | Bin 1063 -> 1185 bytes
src/vidalia/res/flags/bl.png | Bin 0 -> 1083 bytes
src/vidalia/res/flags/bm.png | Bin 1057 -> 1176 bytes
src/vidalia/res/flags/bn.png | Bin 1064 -> 1189 bytes
src/vidalia/res/flags/bo.png | Bin 1063 -> 1185 bytes
src/vidalia/res/flags/br.png | Bin 1064 -> 1185 bytes
src/vidalia/res/flags/bs.png | Bin 1063 -> 1179 bytes
src/vidalia/res/flags/bt.png | Bin 1064 -> 1185 bytes
src/vidalia/res/flags/bv.png | Bin 0 -> 1185 bytes
src/vidalia/res/flags/bw.png | Bin 1053 -> 1185 bytes
src/vidalia/res/flags/by.png | Bin 1064 -> 1185 bytes
src/vidalia/res/flags/bz.png | Bin 1064 -> 1185 bytes
src/vidalia/res/flags/ca.png | Bin 1064 -> 1171 bytes
src/vidalia/res/flags/cc.png | Bin 0 -> 1179 bytes
src/vidalia/res/flags/cd.png | Bin 0 -> 1185 bytes
src/vidalia/res/flags/cf.png | Bin 1064 -> 1171 bytes
src/vidalia/res/flags/cg.png | Bin 1061 -> 1185 bytes
src/vidalia/res/flags/ch.png | Bin 1045 -> 1185 bytes
src/vidalia/res/flags/ci.png | Bin 1061 -> 1083 bytes
src/vidalia/res/flags/ck.png | Bin 1064 -> 1185 bytes
src/vidalia/res/flags/cl.png | Bin 1046 -> 1039 bytes
src/vidalia/res/flags/cm.png | Bin 1064 -> 1185 bytes
src/vidalia/res/flags/cn.png | Bin 645 -> 1185 bytes
src/vidalia/res/flags/co.png | Bin 1051 -> 1185 bytes
src/vidalia/res/flags/cr.png | Bin 1064 -> 1185 bytes
src/vidalia/res/flags/cu.png | Bin 1064 -> 1185 bytes
src/vidalia/res/flags/cv.png | Bin 1062 -> 1185 bytes
src/vidalia/res/flags/cx.png | Bin 0 -> 1185 bytes
src/vidalia/res/flags/cy.png | Bin 1062 -> 902 bytes
src/vidalia/res/flags/cz.png | Bin 1063 -> 1040 bytes
src/vidalia/res/flags/de.png | Bin 194 -> 1185 bytes
src/vidalia/res/flags/dj.png | Bin 0 -> 1174 bytes
src/vidalia/res/flags/dk.png | Bin 1058 -> 1185 bytes
src/vidalia/res/flags/dm.png | Bin 0 -> 1185 bytes
src/vidalia/res/flags/do.png | Bin 0 -> 1185 bytes
src/vidalia/res/flags/dz.png | Bin 1058 -> 1042 bytes
src/vidalia/res/flags/ec.png | Bin 1063 -> 1185 bytes
src/vidalia/res/flags/ee.png | Bin 1062 -> 1189 bytes
src/vidalia/res/flags/eg.png | Bin 1062 -> 1063 bytes
src/vidalia/res/flags/eh.png | Bin 0 -> 1174 bytes
src/vidalia/res/flags/er.png | Bin 1064 -> 1185 bytes
src/vidalia/res/flags/es.png | Bin 342 -> 1185 bytes
src/vidalia/res/flags/et.png | Bin 1064 -> 1185 bytes
src/vidalia/res/flags/eu.png | Bin 146 -> 1185 bytes
src/vidalia/res/flags/fi.png | Bin 344 -> 1028 bytes
src/vidalia/res/flags/fj.png | Bin 1064 -> 1185 bytes
src/vidalia/res/flags/fk.png | Bin 0 -> 1176 bytes
src/vidalia/res/flags/fm.png | Bin 0 -> 1185 bytes
src/vidalia/res/flags/fo.png | Bin 1062 -> 1035 bytes
src/vidalia/res/flags/fr.png | Bin 226 -> 1083 bytes
src/vidalia/res/flags/ga.png | Bin 1064 -> 1185 bytes
src/vidalia/res/flags/gb.png | Bin 1064 -> 1185 bytes
src/vidalia/res/flags/gd.png | Bin 0 -> 1185 bytes
src/vidalia/res/flags/ge.png | Bin 649 -> 1141 bytes
src/vidalia/res/flags/gf.png | Bin 0 -> 1179 bytes
src/vidalia/res/flags/gg.png | Bin 0 -> 1021 bytes
src/vidalia/res/flags/gh.png | Bin 0 -> 1185 bytes
src/vidalia/res/flags/gi.png | Bin 1060 -> 1024 bytes
src/vidalia/res/flags/gl.png | Bin 1059 -> 1057 bytes
src/vidalia/res/flags/gm.png | Bin 0 -> 1185 bytes
src/vidalia/res/flags/gn.png | Bin 0 -> 1185 bytes
src/vidalia/res/flags/gp.png | Bin 1051 -> 1173 bytes
src/vidalia/res/flags/gq.png | Bin 0 -> 1165 bytes
src/vidalia/res/flags/gr.png | Bin 1064 -> 1176 bytes
src/vidalia/res/flags/gs.png | Bin 0 -> 1182 bytes
src/vidalia/res/flags/gt.png | Bin 1064 -> 1150 bytes
src/vidalia/res/flags/gu.png | Bin 1064 -> 1185 bytes
src/vidalia/res/flags/gw.png | Bin 0 -> 1185 bytes
src/vidalia/res/flags/gy.png | Bin 1062 -> 1185 bytes
src/vidalia/res/flags/hk.png | Bin 1062 -> 1185 bytes
src/vidalia/res/flags/hm.png | Bin 0 -> 1185 bytes
src/vidalia/res/flags/hn.png | Bin 0 -> 1149 bytes
src/vidalia/res/flags/hr.png | Bin 1062 -> 1149 bytes
src/vidalia/res/flags/ht.png | Bin 1064 -> 1185 bytes
src/vidalia/res/flags/hu.png | Bin 606 -> 1096 bytes
src/vidalia/res/flags/id.png | Bin 1062 -> 1109 bytes
src/vidalia/res/flags/ie.png | Bin 1063 -> 1102 bytes
src/vidalia/res/flags/il.png | Bin 1063 -> 1065 bytes
src/vidalia/res/flags/im.png | Bin 0 -> 1185 bytes
src/vidalia/res/flags/in.png | Bin 1064 -> 1156 bytes
src/vidalia/res/flags/io.png | Bin 0 -> 1185 bytes
src/vidalia/res/flags/iq.png | Bin 1063 -> 1097 bytes
src/vidalia/res/flags/ir.png | Bin 1064 -> 1132 bytes
src/vidalia/res/flags/is.png | Bin 1064 -> 1185 bytes
src/vidalia/res/flags/it.png | Bin 231 -> 1083 bytes
src/vidalia/res/flags/je.png | Bin 0 -> 1106 bytes
src/vidalia/res/flags/jm.png | Bin 1063 -> 1185 bytes
src/vidalia/res/flags/jo.png | Bin 1063 -> 1158 bytes
src/vidalia/res/flags/jp.png | Bin 669 -> 897 bytes
src/vidalia/res/flags/ke.png | Bin 1060 -> 1182 bytes
src/vidalia/res/flags/kg.png | Bin 1062 -> 1185 bytes
src/vidalia/res/flags/kh.png | Bin 1064 -> 1185 bytes
src/vidalia/res/flags/ki.png | Bin 1063 -> 1182 bytes
src/vidalia/res/flags/km.png | Bin 0 -> 1180 bytes
src/vidalia/res/flags/kn.png | Bin 0 -> 1179 bytes
src/vidalia/res/flags/kp.png | Bin 1064 -> 1185 bytes
src/vidalia/res/flags/kr.png | Bin 1061 -> 1058 bytes
src/vidalia/res/flags/kw.png | Bin 1032 -> 1137 bytes
src/vidalia/res/flags/ky.png | Bin 1062 -> 1182 bytes
src/vidalia/res/flags/kz.png | Bin 1063 -> 1182 bytes
src/vidalia/res/flags/la.png | Bin 0 -> 1189 bytes
src/vidalia/res/flags/lb.png | Bin 1063 -> 1074 bytes
src/vidalia/res/flags/lc.png | Bin 1064 -> 1185 bytes
src/vidalia/res/flags/li.png | Bin 0 -> 1185 bytes
src/vidalia/res/flags/lk.png | Bin 1064 -> 1185 bytes
src/vidalia/res/flags/lr.png | Bin 0 -> 1182 bytes
src/vidalia/res/flags/ls.png | Bin 0 -> 1134 bytes
src/vidalia/res/flags/lt.png | Bin 1062 -> 1185 bytes
src/vidalia/res/flags/lu.png | Bin 1062 -> 1096 bytes
src/vidalia/res/flags/lv.png | Bin 1053 -> 1185 bytes
src/vidalia/res/flags/ly.png | Bin 644 -> 1185 bytes
src/vidalia/res/flags/ma.png | Bin 104 -> 1185 bytes
src/vidalia/res/flags/mc.png | Bin 1061 -> 1109 bytes
src/vidalia/res/flags/md.png | Bin 1062 -> 1185 bytes
src/vidalia/res/flags/me.png | Bin 0 -> 1185 bytes
src/vidalia/res/flags/mf.png | Bin 0 -> 1083 bytes
src/vidalia/res/flags/mg.png | Bin 1062 -> 1113 bytes
src/vidalia/res/flags/mh.png | Bin 0 -> 1198 bytes
src/vidalia/res/flags/mk.png | Bin 294 -> 1185 bytes
src/vidalia/res/flags/ml.png | Bin 0 -> 1185 bytes
src/vidalia/res/flags/mm.png | Bin 0 -> 1185 bytes
src/vidalia/res/flags/mn.png | Bin 1064 -> 1185 bytes
src/vidalia/res/flags/mo.png | Bin 1062 -> 1182 bytes
src/vidalia/res/flags/mp.png | Bin 1063 -> 1185 bytes
src/vidalia/res/flags/mq.png | Bin 0 -> 1185 bytes
src/vidalia/res/flags/mr.png | Bin 0 -> 1182 bytes
src/vidalia/res/flags/ms.png | Bin 1064 -> 1182 bytes
src/vidalia/res/flags/mt.png | Bin 647 -> 1101 bytes
src/vidalia/res/flags/mu.png | Bin 0 -> 1185 bytes
src/vidalia/res/flags/mv.png | Bin 0 -> 1185 bytes
src/vidalia/res/flags/mw.png | Bin 0 -> 1182 bytes
src/vidalia/res/flags/mx.png | Bin 1063 -> 1171 bytes
src/vidalia/res/flags/my.png | Bin 1064 -> 1182 bytes
src/vidalia/res/flags/mz.png | Bin 1064 -> 1185 bytes
src/vidalia/res/flags/na.png | Bin 1064 -> 1185 bytes
src/vidalia/res/flags/nc.png | Bin 1062 -> 1083 bytes
src/vidalia/res/flags/ne.png | Bin 0 -> 1132 bytes
src/vidalia/res/flags/nf.png | Bin 1062 -> 1182 bytes
src/vidalia/res/flags/ng.png | Bin 0 -> 1083 bytes
src/vidalia/res/flags/ni.png | Bin 0 -> 1132 bytes
src/vidalia/res/flags/nl.png | Bin 607 -> 1096 bytes
src/vidalia/res/flags/no.png | Bin 1062 -> 1185 bytes
src/vidalia/res/flags/np.png | Bin 104 -> 935 bytes
src/vidalia/res/flags/nr.png | Bin 1059 -> 1185 bytes
src/vidalia/res/flags/nu.png | Bin 0 -> 1185 bytes
src/vidalia/res/flags/nz.png | Bin 1063 -> 1185 bytes
src/vidalia/res/flags/om.png | Bin 1062 -> 1109 bytes
src/vidalia/res/flags/pa.png | Bin 1062 -> 1171 bytes
src/vidalia/res/flags/pe.png | Bin 1064 -> 1083 bytes
src/vidalia/res/flags/pf.png | Bin 1064 -> 1062 bytes
src/vidalia/res/flags/pg.png | Bin 0 -> 1130 bytes
src/vidalia/res/flags/ph.png | Bin 1064 -> 1195 bytes
src/vidalia/res/flags/pk.png | Bin 1062 -> 1129 bytes
src/vidalia/res/flags/pl.png | Bin 583 -> 1182 bytes
src/vidalia/res/flags/pm.png | Bin 1064 -> 1185 bytes
src/vidalia/res/flags/pn.png | Bin 0 -> 1185 bytes
src/vidalia/res/flags/pr.png | Bin 1064 -> 1176 bytes
src/vidalia/res/flags/ps.png | Bin 0 -> 1129 bytes
src/vidalia/res/flags/pt.png | Bin 355 -> 1182 bytes
src/vidalia/res/flags/pw.png | Bin 0 -> 1185 bytes
src/vidalia/res/flags/py.png | Bin 1062 -> 1129 bytes
src/vidalia/res/flags/qa.png | Bin 668 -> 1109 bytes
src/vidalia/res/flags/re.png | Bin 0 -> 1083 bytes
src/vidalia/res/flags/ro.png | Bin 1063 -> 1185 bytes
src/vidalia/res/flags/rs.png | Bin 0 -> 1176 bytes
src/vidalia/res/flags/ru.png | Bin 232 -> 1029 bytes
src/vidalia/res/flags/rw.png | Bin 0 -> 1182 bytes
src/vidalia/res/flags/sa.png | Bin 1063 -> 1185 bytes
src/vidalia/res/flags/sb.png | Bin 1064 -> 1185 bytes
src/vidalia/res/flags/sc.png | Bin 0 -> 1198 bytes
src/vidalia/res/flags/sd.png | Bin 1062 -> 1087 bytes
src/vidalia/res/flags/se.png | Bin 1062 -> 1185 bytes
src/vidalia/res/flags/sg.png | Bin 1062 -> 1112 bytes
src/vidalia/res/flags/sh.png | Bin 0 -> 1182 bytes
src/vidalia/res/flags/si.png | Bin 1063 -> 1090 bytes
src/vidalia/res/flags/sj.png | Bin 0 -> 1185 bytes
src/vidalia/res/flags/sk.png | Bin 1063 -> 1090 bytes
src/vidalia/res/flags/sl.png | Bin 1063 -> 1093 bytes
src/vidalia/res/flags/sm.png | Bin 946 -> 990 bytes
src/vidalia/res/flags/sn.png | Bin 0 -> 1185 bytes
src/vidalia/res/flags/so.png | Bin 1054 -> 1185 bytes
src/vidalia/res/flags/sr.png | Bin 0 -> 1182 bytes
src/vidalia/res/flags/st.png | Bin 0 -> 1185 bytes
src/vidalia/res/flags/sv.png | Bin 0 -> 1129 bytes
src/vidalia/res/flags/sy.png | Bin 104 -> 1096 bytes
src/vidalia/res/flags/sz.png | Bin 0 -> 1185 bytes
src/vidalia/res/flags/tc.png | Bin 1061 -> 1182 bytes
src/vidalia/res/flags/td.png | Bin 0 -> 1185 bytes
src/vidalia/res/flags/tf.png | Bin 0 -> 1185 bytes
src/vidalia/res/flags/tg.png | Bin 1064 -> 1185 bytes
src/vidalia/res/flags/th.png | Bin 1064 -> 1185 bytes
src/vidalia/res/flags/tj.png | Bin 0 -> 1154 bytes
src/vidalia/res/flags/tk.png | Bin 0 -> 1185 bytes
src/vidalia/res/flags/tl.png | Bin 0 -> 1185 bytes
src/vidalia/res/flags/tm.png | Bin 0 -> 1185 bytes
src/vidalia/res/flags/tn.png | Bin 1062 -> 1185 bytes
src/vidalia/res/flags/to.png | Bin 670 -> 1179 bytes
src/vidalia/res/flags/tr.png | Bin 1050 -> 1185 bytes
src/vidalia/res/flags/tt.png | Bin 1064 -> 1182 bytes
src/vidalia/res/flags/tv.png | Bin 1064 -> 1185 bytes
src/vidalia/res/flags/tw.png | Bin 654 -> 1179 bytes
src/vidalia/res/flags/tz.png | Bin 1061 -> 1179 bytes
src/vidalia/res/flags/ua.png | Bin 1062 -> 1185 bytes
src/vidalia/res/flags/ug.png | Bin 1064 -> 1185 bytes
src/vidalia/res/flags/um.png | Bin 0 -> 1185 bytes
src/vidalia/res/flags/us.png | Bin 1064 -> 1185 bytes
src/vidalia/res/flags/uy.png | Bin 1064 -> 1182 bytes
src/vidalia/res/flags/uz.png | Bin 0 -> 1096 bytes
src/vidalia/res/flags/va.png | Bin 1063 -> 1130 bytes
src/vidalia/res/flags/vc.png | Bin 0 -> 1185 bytes
src/vidalia/res/flags/ve.png | Bin 1064 -> 1185 bytes
src/vidalia/res/flags/vg.png | Bin 1064 -> 1182 bytes
src/vidalia/res/flags/vi.png | Bin 1064 -> 1168 bytes
src/vidalia/res/flags/vn.png | Bin 1059 -> 1185 bytes
src/vidalia/res/flags/vu.png | Bin 0 -> 1185 bytes
src/vidalia/res/flags/wf.png | Bin 0 -> 1185 bytes
src/vidalia/res/flags/ws.png | Bin 1048 -> 1185 bytes
src/vidalia/res/flags/ye.png | Bin 1062 -> 1030 bytes
src/vidalia/res/flags/yt.png | Bin 0 -> 1079 bytes
src/vidalia/res/flags/za.png | Bin 1064 -> 1185 bytes
src/vidalia/res/flags/zm.png | Bin 0 -> 1185 bytes
src/vidalia/res/flags/zw.png | Bin 269 -> 1185 bytes
src/vidalia/res/vidalia.qrc | 1 +
995 files changed, 53031 insertions(+), 82457 deletions(-)
diff --git a/.gitignore b/.gitignore
index ae8ee64..6967504 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,6 @@
-
+*~
+*.po
+\#*\#
# /
/CMakeCache.txt
/CMakeFiles
diff --git a/CHANGELOG b/CHANGELOG
index 1e027e0..39abc08 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,55 +1,199 @@
-0.2.19 30-May-2012
+0.3.3 10-Jul-12
+ New features:
+ o Added plugin prototype for Torrc class. This allows plugins to
+ modify the .torrc configuration file.
+ o Display node fingerprint in the details panel in the Network Map.
+ Resolves ticket 2726.
+ o Adds Settings frame for Network Map with optional columns for
+ Relay panel. Resolves ticket 2731.
+ o Set what version of Vidalia wrote the configuration file. Resolves
+ ticket 5123.
+ o Hide window with Ctrl+W shortcut. Resolves ticket 5495.
+ o Use SafeCookie authentication method if available instead of the
+ regular cookie authentication. Resolves ticket 5855.
+ o Display how much traffic runs through each stream in the Network
+ Map. Resolves ticket 6249.
+ o Provide a way of hand picking entry and exit nodes from the router
+ list in the Network Map.
+
+ Bugfixes relative to Vidalia 0.2.x:
+ o Automatically add a bridge if it is in the lineEdit but the user
+ haven't pressed the plus button. Fixes bug 5107.
+ o Display paths with their native separators. Resolves ticket 4337.
o Disable "Run Vidalia when my system starts" if the
BrowserExecutable config option is set. This will avoid issues with
TBB users starting Vidalia the wrong way.
- o Automigrate TorExecutable, Torrc and DataDirectory config options
- to the new relative path handling.
- o Really get rid of the openssl dependency. The goal had been to
- achieve that for 0.2.18, but not everything was actually removed.
- o For static builds on windows, correctly link with zlib and
- ws32_2.lib.
-0.2.18 14-May-2012
+ Bugfixes relative to Vidalia 0.3.x:
+ o Don't write values that are default in torrc. Fixes bug 6178.
+ o Fix segmentation fault when trying to close an already closed
+ circuit in the Network Map. Fixes bug 6243.
+ o Show the "Why is my relay offline?" notification only if tor is
+ running one and it's marked as offline.
+
+ Internal cleanups and improvements:
+ o Fixed compile time warning when generating ui_AdvancedPage.h.
+ Fixes bug 5554.
+ o Enlarge countries' list and make CountryInfo.cpp,
+ country-coordinates.csv and geoip consistent.
+ o Improve Network Map router loading performance by disabling
+ sorting with every addition. Resolves ticket 6216.
+ o Created prototypemacros.h to store the preprocessor macros used by
+ TorControlPrototype
+ o Migrate from the hand made TorControl prototype for QtScript to an
+ automatically generated equivalent with qtscriptgenerator.
+ o Fix return value from VMessageBox::question.
+ o Make TorControl::getRouterDescriptorText() default to regular
+ descriptors in case the microdescriptor is not available.
+ o Improve handling of ControlPort and SocksPort settings.
+
+0.3.2 30-May-2012
+ New features:
+ o In the Network Map window, classify circuits based on their
+ purpose. This will help users understand that nothing is wrong
+ when Tor builds a one-hop circuit, for example. Fixes bug 2114.
+ o In the Message Log window, add an option to filter by search
+ query. Fixes ticket 2733.
+ o Add a new configured relay immediately to the list of relays in
+ the Network Map. Also document why a relay might be offline or not
+ in the consensus/router list. Fixes bug 2735.
+ o Add accounting options to the relay configuration panel. Fixes bug
+ 2944.
+ o Add a Panic button, for users who want to get rid of the Tor
+ Browser Bundle quickly in certain circumstances. Note that it uses
+ a simple erase, rather than a secure erase method. Resolves ticket
+ 4107.
+ o Add a way to handle default settings through a file instead of
+ just the hardcoded values. Vidalia will read a
+ vidalia.defaults.conf file from the same place as the vidalia.conf
+ file, and override the hardcoded default if a configuration option
+ and value are listed in this defaults file.
+ o Implement a torrc parser and editor and use that to take every tor
+ configuration option from the vidalia.conf file to the
+ torrc. Vidalia now just needs to know the minimal information to
+ connect to the tor process (ControlPort or ControlSocket and
+ authentication) and everything else would be handled through the
+ torrc file.
+ o In Network View, store layout of network map panes. Fixes ticket
+ 2727.
+ o Add a wizard for the special cases where the user starts Vidalia
+ while tor has DisableNetwork=1 or the Panic feature enabled. This
+ wizard is meant to warn the user about either the Panic feature or
+ that she might need to configure a proxy or a bridge before tor
+ connects to the outside world. Fixes ticket 2905.
+ o Automigrate TorExecutable, Torrc, DefaultsTorrc and DataDirectory
+ config options to the new relative path handling.
+ o Display the relay Nickname and ORPort in the window title when
+ Vidalia is running as a relay. Fixes bug 3634.
+
+ Bugfixes relative to Vidalia 0.2.x:
+ o Fix deadlock when the browser process fails to launch in OS X.
+ o Resume listing relays in the Network Map panel even when Tor
+ only offers microdescriptors (new in Tor 0.2.3.x). Fixes ticket 4203.
o Use consensus bandwidth for routers when microdescriptors is
enabled. Fixes bug 3287.
- o Notify users that a warning status event has appeared by flashing
- the Message Log button. Fixes bug 3957.
- o Fix a method that didn't return the specified type if another
- control method was selected. Fixes bug 4065.
- o Resume listing relays in the Network Map panel even when Tor only
- offers microdescriptors (new in Tor 0.2.3.x). Fixes ticket 4203.
o Handle unrecognized Tor bootstrap phases. (Tor tells us a summary
- description of each bootstrap phase as it occurs, so we can use
- that string if needed.) Fixes bug 5109.
- o Displays Korean, Catalan and Greek in their native scripts. Fix
- bug 5110.
- o Support adding comments in the same line as a config option inside
- the torrc dialog. Fixes bug 5475.
- o Remove Polipo and Torbutton from Vidalia's build scripts. Resolves
- ticket 5769.
- o Fix deadlock when the browser process failed to launch in OS X.
- o Add ProfileDirectory, DefaultProfileDirectory, PluginsDirectory,
- DefaultPluginsDirectory for better Browser configuration. Also set
- the Vidalia binary location as the starting point for relative
- paths.
- o Enable Burmese, Croatian, Basque and Serbian translation.
- o Remove the "Find bridges" button in order to avoid compromising
- users that need to hide behind tor at all times. Fixes bug 5371.
- o Add visual feedback from VClickLabel when in "pressed" state.
- Resolves ticket 5766.
-
-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
+ description of each bootstrap phase as it occurs, so we can use that
+ string if needed.) Fixes bug 5109.
+ o Change the wording from New Identity to New Circuit. For a proper
+ New Identity while browsing, TorButton's solution should be
+ used. Fixes bug 5277.
+ o Fix the bridge line parsing for requests to bridges.torproject.org
+ when the user clicks 'find bridges now'. Fixes bug 5730.
+ o In Advanced Settings tab, corrected radio buttons minimum sizes to
+ prevent hiding of socket controls on window resize. Fixes bug
+ 5518.
+
+ Bugfixes relative to Vidalia 0.3.x:
+ o Center detached tabs to avoid placing them out of reach. Fixes bug
+ 5326.
+ o Provide the MainWindow object to the plugins so they can provide
+ messages in the system tray. Fixes bug 5338.
+ o Do not ignore the "Show on Startup" checkbox. Fixes bug 5351.
+
+ Internal cleanups and improvements:
+ o Remove the ability to launch an http proxy (e.g. Polipo), since Tor
+ Browser Bundle does not use it anymore. In the future, perhaps
+ a plugin will allow users to launch external applications like
+ this. Fix bug 5386.
+ o Fix a method that didn't return the specified type if another control
+ method was selected. Fixes bug 4065.
+ o Remove the need for threads to handle interaction with the
+ ControlPort. Vidalia now uses asynchronous IO through Qt's event loop.
+ o Migrate the code that handles Marble to the new library
+ interface. It works as expected with the latest Marble from the
+ upstream git repo.
+ o Always create settings access object, with default section name
+ set to General. Fixes bug 5522.
+ o Do not send ControlCommands if Vidalia haven't authenticated yet.
+ o Document how to get started with Vidalia development in a tutorial
+ fashion. Fixes bug 2925.
+ o Fix possible infinite loop in ControlConnection object. Fixes bug
+ 5519.
+ o Wrapper class for socket access in ControlSocket class. Fixes
+ ticket 5519.
+ o Fix possible dangling pointer access in MessageLog at Vidalia
+ exit. Fixes bug 5690.
+ o Document how to write plugins in a tutorial fashion.
+ o Call QCoreApplication::processEvents() while waiting to read
+ port.conf so that Vidalia does not freeze.
+ o Make sure there is a ReceiveWaiter in the queue before issuing a
+ ControlCommand to avoid deadlocks in the event loop.
+ o Really get rid of the openssl dependency. The goal had been to achieve
+ that for 0.2.18, but not everything was actually removed.
+ o For static builds on windows, correctly link with zlib and
+ ws32_2.lib.
+
+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
@@ -58,6 +202,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
@@ -74,81 +223,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 915bc3d..021de50 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -12,9 +12,9 @@
set(VER_MAJOR "0")
-set(VER_MINOR "2")
-set(VER_PATCH "19")
-set(VERSION "${VER_MAJOR}.${VER_MINOR}.${VER_PATCH}")
+set(VER_MINOR "3")
+set(VER_PATCH "3")
+set(VERSION "${VER_MAJOR}.${VER_MINOR}.${VER_PATCH}-alpha")
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/FindGeoIP.cmake b/cmake/FindGeoIP.cmake
index 76986bf..9554082 100644
--- a/cmake/FindGeoIP.cmake
+++ b/cmake/FindGeoIP.cmake
@@ -16,18 +16,22 @@
message(STATUS "Looking for MaxMind GeoIP header files")
set(CMAKE_INCLUDE_PATH "${CMAKE_INCLUDE_PATH} ${GEOIP_INCLUDE_DIR}")
-check_include_file("GeoIP.h" HAVE_GEOIP_H)
-check_include_file("GeoIPCity.h" HAVE_GEOIPCITY_H)
-if (HAVE_GEOIP_H AND HAVE_GEOIPCITY_H)
+find_path(GEOIP_INCLUDE_DIR
+ NAMES GeoIP.h GeoIPCity.h
+ PATHS ${GEOIP_INCLUDE_DIR}
+)
+
+if (GEOIP_INCLUDE_DIR)
message(STATUS "Looking for MaxMind GeoIP header files - found")
-else(HAVE_GEOIP_H AND HAVE_GEOIPCITY_H)
+else(GEOIP_INCLUDE_DIR)
message(FATAL_ERROR "Could not find one or more MaxMind GeoIP header files. If the MaxMind GeoIP library is installed, you can run CMake again and specify its location with -DGEOIP_INCLUDE_DIR=<path>")
-endif(HAVE_GEOIP_H AND HAVE_GEOIPCITY_H)
+endif(GEOIP_INCLUDE_DIR)
message(STATUS "Looking for MaxMind GeoIP libraries")
-find_library(GEOIP_LIB
- NAMES GeoIP geoip
- PATHS ${GEOIP_LIBRARY_DIR}
+find_file(GEOIP_LIB
+ NAMES libGeoIP.a
+ PATHS ${GEOIP_LIBRARY_DIR}/.libs/
+ HINTS ${GEOIP_LIBRARY_DIR}/.libs/
)
if (GEOIP_LIB)
message(STATUS "Looking for MaxMind GeoIP libraries - found")
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/getting-started.txt b/doc/getting-started.txt
new file mode 100644
index 0000000..26889b8
--- /dev/null
+++ b/doc/getting-started.txt
@@ -0,0 +1,397 @@
+== Getting started with coding for Vidalia ==
+
+=== Sections ===
+ * Foreword
+ * Dependencies
+ * Building plain Vidalia
+ * How to build some of its optional features:
+ * Building with Marble
+ * Enabling plugin support
+ * Code structure
+ * Contributing workflow
+
+=== Foreword ===
+
+Vidalia has a stable and an alpha branch. The stable branch is
+actually called master in the source code repository. The stable
+branch will have bugfixes and new features when these demand being
+released as stable for the sake of the users. Most of the information
+in this document applies to all Vidalia branches and released
+versions, in case there is a specific issue that applies from a
+specific version or on a specific branch, it will be specified
+explicitly.
+
+This is not a Git tutorial, for that there are really good references
+already online. I particularly recommend the online (and paperback)
+book ProGit.
+
+Vidalia can be built for most flavors of BSDs too. They should be
+similar to the references to Linux, but we do not support actively any
+of them. That being said, if you find a bug. that does not mean we
+won't fix it. It means that we are not building Vidalia on, say,
+FreeBSD every day.
+
+=== Dependencies ===
+
+The most important (and the basic) dependencies to build Vidalia are:
+Qt >= 4.7.4 and CMake.
+CMake should be installed as a regular application for every OS. Qt on
+the other hand can be used in several ways, the most important thing
+to understand is that you need to let CMake know the path to the tool
+named qmake from the Qt toolkit, and based on that it should be able
+to figure out the rest of the paths. If that fails, we will explain
+how to solve it later on. We will use the terminal to build Vidalia
+and explain how to do the different things we are going to cover in
+this document.
+
+If you use Linux you will have easy access to a terminal. If you use
+Windows, on the other hand, what I use is msysGit[1] (especially since
+we will use Git for a lot of things explained later on this document).
+If you are an OSX user, you should use Terminal.app.
+
+To manage the source code, Vidalia (and all the Tor Project projects)
+use Git[2]. You should install it with your preferred package manager
+if on Linux, use msysGit on Windows, or use MacPort or Homebrew on
+OSX.
+
+Vidalia has a lot of optional features that can be enabled or disabled
+in the configure stage (see section Building plain Vidalia). Among
+these possibilities, Vidalia can use Marble widget[3], which is a map
+widget to display nodes around the world in the Network Map. You
+should clone Marble's repository (which also uses git) if you want to
+build with Marble support (see section Building with Marble), but it
+is not mandatory.
+
+Another optional feature is Google Breakpad, which we won't get into
+details here, but you should be able to enable it based on how you
+enabled Marble, and the README.breakpad guide.
+
+If you are running the alpha branch (or release >=0.3.1), another
+dependency will be qtscriptgenerator. We will get into details for
+this in the section Enabling plugin support.
+
+=== Building plain Vidalia ===
+
+Building Vidalia is quite simple if you know the few steps you should follow.
+Assuming you have installed Qt, locate the qmake binary. We will
+denote this path as $QMAKE_BIN.
+
+After that, you should clone Vidalia's source code repository:
+
+{{{
+$ git clone https://git.torproject.org/vidalia.git
+}}}
+
+This will create a directory called vidalia. If you want to use the
+alpha branch, you should do the following:
+
+{{{
+$ cd vidalia
+$ git fetch origin
+$ git checkout alpha
+}}}
+
+From this point we will start using CMake. This tool has the
+peculiarity that you can have a separate directory to build your code,
+so that all the object code and other auxiliary files do not get in
+the way of your implementation. So we will use a directory named
+"build" inside Vidalia's root:
+
+{{{
+$ mkdir build
+$ cd build
+$ cmake .. -DQT_QMAKE_EXECUTABLE="${QMAKE_BIN}"
+}}}
+
+The cmake .. command directs cmake to where the code repository is,
+and also sets the variable QT_QMAKE_EXECUTABLE. If CMake complains
+about other variables not being set, you should set them similarly to
+the one we are already setting.
+This last step is called the configuration step (or phase).
+
+After this, we start the actual building phase:
+
+{{{
+$ make -j4
+}}}
+
+The number you would use for the -j parameter should be number of
+cores +1 (unless you want to wait longer for the build, in which case
+you can just ignore the parameter completely).
+
+If everything goes alright, you should have the Vidalia binary inside
+the path: build/src/vidalia/. If you are on Linux it will be called
+vidalia, vidalia.exe on Windows, and Vidalia.app on OSX. You can run
+Vidalia with the following parameters (assuming you are on Linux, it
+will be similar in the rest of the OSs):
+
+{{{
+$ ./src/vidalia/vidalia --loglevel info --logfile /dev/stdout
+}}}
+
+=== How to build some of its optional features ===
+
+==== Building with Marble ====
+
+To build Vidalia with Marble support, you should clone and build
+Marble from git[5] with Qt-only support.
+
+We will assume that your marble clone is located in ~/marble, your
+build directory is located in ~/marble/build.
+
+Once we reach this point, we can configure Vidalia to use Marble with
+the following command (from Vidalia's root):
+
+{{{
+$ cmake -DUSE_MARBLE=1 \
+ -DMARBLE_INCLUDE_DIR=~/marble/src/lib \
+ -DMARBLE_DATA_DIR=~/marble/data \
+ -DMARBLE_LIBRARY_DIR=~/marble/build/src/lib \
+ -DMARBLE_PLUGIN_DIR=~/marble/build/src/plugins ..
+}}}
+
+When the configuration has finished, you can compile Vidalia as usual:
+
+{{{
+$ make -j4
+}}}
+
+Remember that the -j parameter is something you should figure out for
+your system or just leave it out completely if in doubt.
+
+==== Enabling plugin support ====
+
+Vidalia >= 0.3.1 has support for plugins. How plugins are structured
+and how they work will be covered on another document, but to actually
+work with plugins we need to be able to build qtscriptgenerator[4].
+
+To build it, you should follow its README, but the following hints
+might come handy if you get stuck:
+
+ * On Windows, you may need to execute the following to get the
+generator to locate Qt's headers:
+
+{{{
+ setx QTDIR /c/QtSDK/Desktop/Qt/4.7.4/mingw/
+}}}
+
+Note that the path may change depending on your Qt installation.
+
+ * On OSX we build this the following way:
+
+In the file qtbindings/qtscript_uitools/qtscript_uitools.pro, change this:
+
+{{{
+CONFIG += uitools
+}}}
+
+to this:
+
+{{{
+CONFIG += uitools plugin link_prl
+}}}
+
+And then follow these steps:
+
+{{{
+$ cd path/to/generator/
+$ qmake -spec macx-g++
+$ make
+$ ./generator
+$ cd ../qtbindings/
+$ qmake -spec macx-g++ -recursive
+$ make release
+}}}
+
+=== Code structure ===
+
+Vidalia is separated in several modules, here is a brief explanation
+of each directory:
+
+{{{
+src/
+ All the source code is located in this directory.
+
+src/vidalia/
+ Main module, this is where Vidalia's GUI files are located, the main
+window classes are right there, other parts of Vidalia that take
+several files are located in their own submodule inside this one.
+
+src/vidalia/about/
+ The About and the License dialogs are located here.
+
+src/vidalia/bwgraph/
+ The Bandwidth Graph classes are here.
+
+src/vidalia/config/
+ In this directory all the configuration classes are located.
+
+src/vidalia/help/
+ The help browser and the actual help content is located in here.
+
+src/vidalia/i18n/
+ Here we have all the files used for translations.
+
+src/vidalia/log/
+ The Message Log code is located in this directory.
+
+src/vidalia/network/
+ Here you can find the Network Map code. Here lives the code that
+also handles Marble.
+
+src/vidalia/res/
+ All the different resources like icons or certificates are in this directory.
+
+src/common/
+ The common module has somwhat generic classes and functions used in
+other modules.
+
+src/crashreporter/
+ Here you can find the code that interacts with Google BreakPad.
+
+src/miniupnpc/
+ Miniupnpc is a UPNPC library that Vidalia bundles in its code to
+build it with CMake, but it is not an code that is maintained by us.
+
+src/tools/
+ Inside this directory you can find self contained simple
+applications that are used for different purposes, like translating
+from different translation file types.
+
+src/torcontrol/
+ This is the most important module that handles the interaction
+between Tor and Vidalia.
+
+changes/
+ In this directory live the different changes introduced by a branch
+that has been merged, its contents will go to the CHANGELOG file. See
+the Contributing workflow section for more information.
+
+cmake/
+ This directory contains the CMake macros used by Vidalia's build scripts.
+
+contrib/
+ In here you can find some GeoIP scripts.
+
+debian/
+ This directory contains some Debian specific information.
+
+doc/
+ This one contains some documentation regarding Vidalia's design and
+Doxygen configuration.
+
+pkg/
+ This directory contains the scripts used for packaging on different
+formats, like app for OSX, rpm for Linux and a Windows installer.
+}}}
+
+=== Contributing workflow ===
+
+There are at least two different ways to contribute to Vidalia in
+terms of how you submit your changes. The first approach might be
+simpler than the second, but the one you choose depends on how you
+will get involved.
+
+NOTE: There are several ways of doing what is proposed, we will not
+get into details, each person should adopt the way suits them best.
+
+==== Submit a patch ====
+
+Vidalia uses git to manage its source code, as we explained before.
+Git has a nice feature called format-patch. Here's how it works:
+
+ * Update the repository to its latest version. You should replace
+master with the current branch you are working on
+
+{{{
+ $ git pull origin master
+}}}
+
+ * Edit the code as you see fit
+
+ * Add the files you want to be in the patch you will submit
+
+{{{
+ $ git add file1 file2
+}}}
+
+ * Create a commit
+
+{{{
+ $ git commit -m "Some commit message that represents the changes"
+}}}
+
+ * And then we create the patch:
+
+{{{
+ $ git format-patch HEAD..HEAD~1
+}}}
+
+Why not just create the patch with diff? This way you will be in
+charge of the actual commit (you will be the committer). Another added
+value is that you can make several commits, if it makes more sense for
+your code. Otherwise, the person that will push the new code has to
+handle all themselves, and it may not be what you'd have done (even
+though the final code will be the same).
+
+==== Create a branch ====
+
+The ideal way to contribute is to have a remote somewhere (github,
+gitorious, etc), and point us to a branch in that remote. The branch
+should be named bugXXXX_sometext, where XXXX is the ticket number, and
+sometext is a representative text for the code in that branch.
+
+When the branch is reviewed, it will be merged to its base branch and
+pushed to the official Vidalia repository.
+
+The review process varies with each fix or person that is involved,
+but there are some basic guidelines that you should follow to make the
+procedure as fast as possible.
+
+===== Changes file =====
+
+Each Vidalia release has its own portion of the CHANGELOG. This
+CHANGELOG is built from a series of changes files. These files are
+located in the "changes" directory. Their basic structure is the
+following:
+
+{{{
+ <Category>:
+ o <Text that describes the change>. [Fixes bug | Resolves ticket]
+<ticket number>.
+}}}
+
+The valid categories are:
+
+ * New features
+ * Bugfixes relative to Vidalia 0.2.x
+ * Bugfixes relative to Vidalia 0.3.x
+ * Internal cleanups and improvements
+
+The decision whether to use "Fixes bug" or "Resolves ticket" should be
+determined by the nature of the issue. If it was a bug, it should say
+"Fixes bug", and if it's a ticket for a new feature, it should say
+"Resolves ticket".
+
+Each branch must have their own changes file, this way when it is
+merged it will add the file to the changes directory in the base
+branch.
+
+===== Commit structure and code guidelines =====
+
+A fix branch (or format-patch) should separate a fix into several
+relevant commits, especially if the fix is a big one and can be
+devided (there are exceptions to this rule).
+
+In terms of coding guidelines, code that does not follow the
+guidelines specified in the HACKING document won't be merged. You can
+find this document in the root directory of your cloned Vidalia
+repository.
+
+--
+
+[1] http://msysgit.github.com/
+[2] http://git-scm.com
+[3] http://edu.kde.org/marble/
+[4] https://qt.gitorious.org/qt-labs/qtscriptgenerator
+[5] http://edu.kde.org/marble/obtain.php
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/doc/plugin-tutorial.txt b/doc/plugin-tutorial.txt
new file mode 100644
index 0000000..4d4fb11
--- /dev/null
+++ b/doc/plugin-tutorial.txt
@@ -0,0 +1,544 @@
+== How to write Vidalia Plugins ===
+
+=== Sections ==
+
+ * Foreword
+ * Directory structure for plugins
+ * How Vidalia executes the plugin
+ * GUI handling
+ * Settings handling
+ * Simple example
+ * I know Qt, how do I use signals and slots?
+ * I made a plugin, what now?
+
+=== Foreword ===
+
+This document intends to be a simple tutorial that will help you write
+Vidalia plugins. It is not intended to be an exhaustive plugin API
+reference, there will be another document for that. This is also not a
+Javascript reference nor a Qt one, although you will need knowledge of
+both in order to write a plugin.
+
+This is not also a complete plugin engine specification, for that
+there is already a doc named plugin-framework.txt inside Vidalia's doc
+directory.
+
+We assume in this document that you have basic Qt and Javascript
+knowledge, and that you have Vidalia with the qtscriptgenerator libs
+available.
+
+To check this last point, you can open Vidalia, go to Plugins->Debug
+output and you should be able to see the following:
+
+{{{
+
+Available extensions:
+ qt
+ qt.core
+ qt.dbus
+ qt.gui
+ qt.network
+ qt.uitools
+ qt.xml
+
+}}}
+
+The actual important extensions are: qt, qt.core, qt.gui and qt.uitool
+(only if it's a GUI plugin). Depending on the functionality you intend
+your plugin to have, you can ignore the rest.
+
+=== Directory structure for plugins ===
+
+If you open vidalia.conf for Vidalia >= 0.3.1, you will notice a
+variable named "PluginPath" in the [General] section. This variable
+points to the root of where all the plugins are placed. So, the plugin
+root will look something like this:
+
+{{{
+
+pluginRoot/
+ \_ plugin1/
+ |_ plugin2/
+ |_ plugin3/
+
+}}}
+
+Vidalia expects every installed plugin to be a directory inside the
+plugins root.
+
+For every plugin, the directory structure should have at least the
+following files:
+
+{{{
+
+plugin1/
+ \_ info.xml
+ |_ plugin1.js
+
+}}}
+
+You can distribute any files other than these, may be as a dependency
+for your plugin (icons, another complete application that is executed
+by your plugin, .ui files, etc).
+
+==== The info.xml file ====
+
+The most important file (besides the actual plugin code) is the
+info.xml one. This contains the basic information that Vidalia needs
+to understand what to do with this plugin, how to execute it, how to
+and if it should display it in the Plugins menu, and what files to
+load.
+
+Lets take a look at the info.xml file from the Tor Browser Bundle
+plugin:
+
+{{{
+
+<VidaliaPlugin>
+ <name>Browser Bundle Configuration</name>
+ <date>15/06/2011</date>
+ <author>chiiph</author>
+ <type persistent="true" gui="true" />
+ <files>
+ <file>tbb.js</file>
+ </files>
+ <namespace>tbb</namespace>
+</VidaliaPlugin>
+
+}}}
+
+For a complete description of each tag, please read secrion 2 of the
+plugin-framework.txt doc.
+
+In practise, the name tag will be used as the menu entry for this
+plugin if it is of type gui="true". Vidalia will load every file
+descripted in the files tag, so they should all be valid Javascript
+files. And the namespace should be unique (i.e. do not create a plugin
+with tbb as its namespace, unless you want to have one of the two
+overriden by the other). This namespace should be the same as the name
+of the main variable you will use inside the javascript files, as we
+will see later on.
+
+=== How Vidalia executes the plugin ===
+
+As a quick reference for how plugins are executed, there are three
+main functions: start(), stop(), and buildGUI(). The functions that
+must be implemented are start and stop, since they will always be
+executed one way or the other. buildGUI depends on whether your plugin
+is of type gui="true" or not.
+
+Here's a basic skeleton for a plugin's main Javascript file:
+
+{{{
+
+importExtension("qt");
+importExtension("qt.core");
+importExtension("qt.gui"); // optional
+importExtension("qt.uitools"); // optional
+
+var tbb = {
+ someStaticVariable: 1,
+ someOtherStaticVar: "Some string",
+
+ start: function() {
+ // Start code here...
+ },
+
+ buildGUI: function() {
+ // GUI creation here...
+ },
+
+ stop: function() {
+ // Stop function in here...
+ },
+};
+
+}}}
+
+The start function is executed when Vidalia starts if type
+persistent="true", or before the GUI is created when type gui="true".
+
+If a plugin is not of type persistent or gui, it will never be started
+in any way.
+
+The idea behind persistent is that you can run things in background,
+like a UNIX daemon (sort of). As an example, you could start a QTimer
+in your start() function and check something periodically. We use this
+in the Thandy plugin, if you want to read a "real world" example.
+
+=== GUI handling ===
+
+If you want your plugin to have a GUI, we have made kind of a template
+that you can follow:
+
+(This is a part of the Tor Browser Bundles complete buildGUI
+implementation, you can see it in tbb.js in the plugins official
+repository.)
+
+{{{
+ buildGUI: function() {
+ this.tab = new VidaliaTab("Browser Bundle Settings", "TBB");
+
+ var file = new QFile(pluginPath+"/tbb/tbb.ui");
+ var loader = new QUiLoader(this.tab);
+ file.open(QIODevice.ReadOnly);
+ this.widget = loader.load(file);
+ var layout = new QVBoxLayout();
+ layout.addWidget(this.widget, 0, Qt.AlignCenter);
+ this.tab.setLayout(layout);
+ file.close();
+
+ var portInfo = this.widget.children()[findWidget(this.widget, "portInfo")];
+ if(portInfo == null) {
+ return this.tab;
+ }
+
+ var groupBox = this.widget.children()[findWidget(this.widget, "browserBox")];
+ if(groupBox == null) {
+ return this.tab;
+ }
+
+ this.btnLaunch = groupBox.children()[findWidget(groupBox, "btnLaunch")];
+ if(this.btnLaunch != null) {
+ this.btnLaunch["clicked()"].connect(this, this.startSubProcess);
+ }
+
+ return this.tab;
+ },
+}}}
+
+If you read Qt's documentation, what this function does is quite
+straight forward, but I will give you a quick summarization:
+
+{{{
+ buildGUI: function() {
+ this.tab = new VidaliaTab("Browser Bundle Settings", "TBB");
+}}}
+
+First, we need to create a new VidaliaTab. The first parameter is its
+name, which can be an arbitrary string. The second one is important,
+because Vidalia will use it as its section inside the vidalia.conf
+file, if you want to store some kind of settings (we will get to this
+in the next section).
+
+{{{
+ var file = new QFile(pluginPath+"/tbb/tbb.ui");
+ var loader = new QUiLoader(this.tab);
+ file.open(QIODevice.ReadOnly);
+ this.widget = loader.load(file);
+}}}
+
+We encourage you to build your GUIs with Qt Designer, but you are free
+to craft them in the code. In this example we use a .ui Designer file.
+
+So we first load the file as a regular one. The pluginPath variable is
+a variable provided by Vidalia for you to know the location of the
+plugin's root directory. From that point, you should know where your
+files are supposed to be located, in this case it is
+pluginsPath+"/tbb/tbb.ui".
+
+We then create the QUiLoader object, open the file and ask the loader
+to do its magic.
+
+{{{
+ var layout = new QVBoxLayout();
+ layout.addWidget(this.widget, 0, Qt.AlignCenter);
+ this.tab.setLayout(layout);
+ file.close();
+}}}
+
+The QUiLoader creates a QWidget derived object in this.widget and now
+we need to put it somewhere the user can see. We could just display
+the widget, but we encourage you to try to integrate your plugin to
+Vidalia as much as possible, so we will add it to a vertical layout,
+and set it as the tab's main layout.
+
+{{{
+ var portInfo = this.widget.children()[findWidget(this.widget, "portInfo")];
+ if(portInfo == null) {
+ return this.tab;
+ }
+
+ var groupBox = this.widget.children()[findWidget(this.widget, "browserBox")];
+ if(groupBox == null) {
+ return this.tab;
+ }
+
+ this.btnLaunch = groupBox.children()[findWidget(groupBox, "btnLaunch")];
+ if(this.btnLaunch != null) {
+ this.btnLaunch["clicked()"].connect(this, this.startSubProcess);
+ }
+}}}
+
+We can access each widget from this.widget, but it is recommended to
+create variables for each component that you'd like to access.
+
+To make that job easier, Vidalia provides a findWidget function that
+takes a widget and finds the one with the provided name inside the
+first one's children.
+
+For example, in this.btnLaunch, we want to find the widget called
+btnLaunch inside the groupBox widget.
+
+{{{
+ return this.tab;
+ },
+}}}
+
+As the last step, we return the tab for Vidalia to display. Depending
+on how you code your buildGUI function, you may want to check if
+this.tab is already created and return it instead of executing the
+whole function every time Vidalia wants to display the plugins GUI.
+
+Keep in mind that Vidalia deletes the returned tab when the user
+closes it, that's why we create the tab every time buildGUI is
+executed..
+
+=== Settings handling ===
+
+For settings handling, Vidalia provides two methods that belong to the
+VidaliaTab class: saveSetting and getSetting. These methods will get
+and set values inside the plugin's section, in the case of the Tor
+Browser Bundle plugin, it will be the TBB section, as we described
+before.
+
+As an example, we will look at an extract of the saveSettings function
+from tbb.js:
+
+{{{
+this.tab.saveSetting(this.BrowserExecutable, this.lineExecutable.text);
+this.tab.saveSetting(this.BrowserDirectory, this.lineDirectory.text);
+}}}
+
+this.BrowserExecutable is a variable defined before, which is
+"BrowserExecutable". this.lineExecutable is a QLineEdit from the GUI.
+
+This first call, assuming the content of this.lineExecutable is
+"/some/path", will lead to the following text in vidalia.conf:
+
+{{{
+
+[TBB]
+BrowserExecutable=/some/path
+
+}}}
+
+Note that there might be other values before and after
+"BrowserExecutable".
+
+For retrieving settings from the plugins own section you can use the
+method getSetting, which receives the name of the setting and the
+default value as parameters.
+
+Here's an example from the buildGUI() method in tbb.js:
+
+{{{
+if(this.lineExecutable != null) {
+ this.lineExecutable.text = this.tab.getSetting(this.BrowserExecutable, "");
+}
+}}}
+
+=== I know Qt, how do I use signals and slots? ===
+
+Signals and slots are available inside the plugins environment. the
+only restriction is that you can't emit signals properly (there are
+some hacks to get around this though).
+
+As an example, lets look at a part of the start() function of tbb.js:
+
+{{{
+torControl["authenticated()"].connect(this, this.showWaitDialog);
+}}}
+
+The torControl variable is one that Vidalia provides to interact with
+the code that is able to talk to Tor inside Vidalia. This object emits
+a signal called "authenticated()" at some point.
+
+So the syntax to use for connecting a certain signal to a certain slot
+is the following:
+
+{{{
+<object that emits the signal>["<signal name>"].connect(<receiver>, <slot>);
+}}}
+
+It is not a complicated issue, but it may not be intuitive at first if
+you are familliar with Qt's way of doing this in C++.
+
+=== Simple example ===
+
+We have been through the most important parts of a plugin, you can
+always look at how the Tor Browser Bundle plugin works and learn from
+it, but if you are going to start a plugin from scratch, it may not be
+the best option since it a bit big. So in this section I will give you
+a really simple plugin that uses everything we've been talking about
+and it is still clear enough for you to have it as a quick reference
+for your own plugin.
+
+The plugin we are going to be implementing for this section is a
+simple bandwidth history recorder. This means that every certain
+amount of bytes tor sends or receives, it notifies the controllers
+through an event how many have been sent or received since the last
+time it notified.
+
+Looking at how Vidalia TorControl class works, we notice a signal
+called:
+
+{{{
+ /** Emitted when Tor sends a bandwidth usage update (roughly once every
+ * second). <b>bytesReceived</b> is the number of bytes read by Tor over
+ * the previous second and <b>bytesWritten</b> is the number of bytes
+ * sent over the same interval.
+ */
+ void bandwidthUpdate(quint64 bytesReceived, quint64 bytesSent);
+}}}
+
+(This is from src/vidalia/plugin/prototypes/TorControlPrototype.h)
+
+What we need to do is connect this signal with a slot that records
+these bytes, and we have half of our work done.
+
+Once we have that, we can create a simple GUI to display this as a tab
+inside Vidalia. For added fun, we added a button to reset the counter
+and the start date.
+
+Here's the complete Javascript source code for this:
+
+{{{
+importExtension("qt");
+importExtension("qt.core");
+importExtension("qt.gui");
+importExtension("qt.uitools");
+
+var tutorial = {
+ From: "From",
+ Sent: "Sent",
+ Recv: "Recv",
+
+ start: function() {
+ vdebug("Tutorial at start");
+ torControl["bandwidthUpdate(quint64, quint64)"].connect(this, this.saveBandwidth);
+ this.tab = new VidaliaTab("Display bandwidth history", "BandwidthHistory");
+
+ this.recv = parseInt(this.tab.getSetting(this.Sent, 0));
+ this.sent = parseInt(this.tab.getSetting(this.Recv, 0));
+ this.from = this.tab.getSetting(this.From, "");
+
+ if(this.from.length == 0)
+ this.from = QDateTime.currentDateTime().toString();
+
+ // null labels so that we don't update them until the GUI is created
+ this.lblFrom = null;
+ this.lblSent = null;
+ this.lblRecv = null;
+ },
+
+ saveBandwidth: function(recv, sent) {
+ vdebug("Tutorial::Recv", recv);
+ vdebug("Totorial::Sent", sent);
+
+ this.recv += recv;
+ this.sent += sent;
+ this.tab.saveSetting(this.Recv, this.recv);
+ this.tab.saveSetting(this.Sent, this.sent);
+ this.tab.saveSetting(this.From, this.from);
+
+ if(this.lblFrom)
+ this.lblFrom.text = this.from;
+ if(this.lblSent)
+ this.lblSent.text = this.sent.toString();
+ if(this.lblRecv)
+ this.lblRecv.text = this.recv.toString();
+ },
+
+ resetCounters: function() {
+ this.recv = 0;
+ this.sent = 0;
+ this.from = QDateTime.currentDateTime().toString();
+ this.saveBandwidth(0,0);
+ },
+
+ buildGUI: function() {
+ vdebug("Tutorial at buildGUI");
+ // Load the GUI file
+
+ if(this.tab)
+ delete this.tab;
+
+ this.tab = new VidaliaTab("Display bandwidth history", "BandwidthHistory");
+
+ var file = new QFile(pluginPath+"/tutorial/tutorial.ui");
+ var loader = new QUiLoader(this.tab);
+ file.open(QIODevice.ReadOnly);
+ this.widget = loader.load(file);
+ var layout = new QVBoxLayout();
+ layout.addWidget(this.widget, 0, Qt.AlignCenter);
+ this.tab.setLayout(layout);
+ file.close();
+
+ var grpBandwidth = this.widget.children()[findWidget(this.widget, "grpBandwidth")];
+ if(grpBandwidth == null)
+ return this.tab;
+
+ this.lblFrom = grpBandwidth.children()[findWidget(grpBandwidth, "lblFrom")];
+ if(this.lblFrom == null)
+ return this.tab;
+
+ this.lblSent = grpBandwidth.children()[findWidget(grpBandwidth, "lblSent")];
+ if(this.lblSent == null)
+ return this.tab;
+
+ this.lblRecv = grpBandwidth.children()[findWidget(grpBandwidth, "lblRecv")];
+ if(this.lblRecv == null)
+ return this.tab;
+
+ this.btnReset = grpBandwidth.children()[findWidget(grpBandwidth, "btnReset")];
+ if(this.btnReset == null)
+ return this.tab;
+
+ this.lblFrom.text = this.from;
+ this.lblSent.text = this.sent.toString();
+ this.lblRecv.text = this.recv.toString();
+
+ this.btnReset["clicked()"].connect(this, this.resetCounters);
+
+ return this.tab;
+ },
+
+ stop: function() {
+ vdebug("Tutorial at stop");
+ this.saveBandwidth(0,0);
+ },
+};
+}}}
+
+With just 105 lines we have a nice byte history recorder. You can find
+the tutorial.ui and info.xml files in our repository:
+
+https://gitweb.torproject.org/vidalia-plugins.git
+
+=== I made a plugin, what now? ===
+
+So you have your cool plugin with a crazy new idea and it works great,
+what is the next step? We have a repository for official plugins
+(official as in "some folk from Tor made it"), and you can give us
+your plugin to put it there and may be convince us why we should
+distribute your plugin along with the rest.
+
+The idea to have plugins though is to let people develop functionality
+in one of the main Tor controllers, and not depend on us to merge new
+stuff into the main line of distribution.
+
+In the (near) future, we will have a Vidalia Plugins web section where
+plugins that we think are good and won't compromise the users privacy
+will be listed.
+
+Right now the plugin distribution and installation is not something
+that any user might be able to do, so the other future plan is to
+create a distribution file format (probably just a zip file with
+certain internal structure) and a graphical way of installing plugins.
+
+If you are interested in helping with the infrastructure for plugins,
+please don't hesitate to join us on IRC at OFTC #vidalia.
+
+If you find any bugs, do not hesitate to report them in
+https://trac.torproject.org with Vidalia as the component.
diff --git a/pkg/build-geoip-cache.sh b/pkg/build-geoip-cache.sh
index 06939e5..31696b6 100755
--- a/pkg/build-geoip-cache.sh
+++ b/pkg/build-geoip-cache.sh
@@ -1,13 +1,13 @@
#!/bin/sh
##
## $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.
##
diff --git a/pkg/osx/CMakeLists.txt b/pkg/osx/CMakeLists.txt
index f5c25f3..6b61115 100644
--- a/pkg/osx/CMakeLists.txt
+++ b/pkg/osx/CMakeLists.txt
@@ -1,79 +1,37 @@
##
## $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.
##
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)
+add_custom_target(dist-osx-libraries DEPENDS Vidalia
+ COMMAND ${QT_BINARY_DIR}/macdeployqt ${VIDALIA_APP_BUNDLE_ROOT}
+)
+
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 +41,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)
@@ -100,7 +57,7 @@ add_custom_target(dist-osx
--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/
@@ -117,7 +74,7 @@ add_custom_target(dist-osx
)
add_dependencies(dist-osx dist-osx-libraries)
-if (TOR_SOURCE_DIR)
+if (TOR_SOURCE_DIR AND SCRIPT_DIR)
get_filename_component(TOR_SOURCE_DIR ${TOR_SOURCE_DIR} ABSOLUTE)
## Determine Tor's version string used to build the .dmg filename
@@ -130,11 +87,12 @@ if (TOR_SOURCE_DIR)
set(bundle_DMG "vidalia-bundle-${TOR_VERSION}-${VERSION}-${DMG_ARCH}.dmg")
add_custom_target(dist-osx-bundle
+ 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/
@@ -158,27 +116,27 @@ if (TOR_SOURCE_DIR)
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)
+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 CMake variable."
+ "!! 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 CMake variable."
+ "!! You must set the -DTOR_SOURCE_DIR and -DSCRIPT_DIR CMake variables."
COMMAND ${CMAKE_COMMAND} -E echo "!! Quitting."
)
-endif(TOR_SOURCE_DIR)
+endif(TOR_SOURCE_DIR AND SCRIPT_DIR)
diff --git a/pkg/osx/vidalia.conf.sample b/pkg/osx/vidalia.conf.sample
index ba2ed73..7dac486 100644
--- a/pkg/osx/vidalia.conf.sample
+++ b/pkg/osx/vidalia.conf.sample
@@ -1,4 +1,7 @@
[General]
+ProxyExecutable=/Applications/Vidalia.app/Contents/MacOS/polipo
+ProxyExecutableArguments=-c /Applications/Vidalia.app/Contents/Resources/polipo.conf
+RunProxyAtStart=true
InterfaceStyle=Macintosh (Aqua)
[Tor]
diff --git a/pkg/package.sh b/pkg/package.sh
index caf54e7..b5e628d 100755
--- a/pkg/package.sh
+++ b/pkg/package.sh
@@ -1,13 +1,13 @@
#!/bin/bash
##
## $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.
##
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/crypto.cpp b/src/common/crypto.cpp
index 223d202..70689a9 100644
--- a/src/common/crypto.cpp
+++ b/src/common/crypto.cpp
@@ -61,6 +61,11 @@
#include <wincrypt.h>
#endif
+#if defined(Q_OS_LINUX)
+#include <stdint.h>
+#include <arpa/inet.h>
+#endif
+
/** Returns up to <b>len</b> bytes of pseudorandom data on success, or an empty
* QByteArray on failure. The caller should verify that the returned
@@ -187,3 +192,90 @@ crypto_secret_to_key(const QString &secret, const QByteArray &salt, quint8 c)
return hash.result();
}
+/**
+ * Read a 32-bit value beginning at <b>cp</b>. Equivalent to
+ * *(uint32_t*)(cp), but will not cause segfaults on platforms that forbid
+ * unaligned memory access.
+ */
+uint32_t
+get_uint32(const void *cp)
+{
+ uint32_t v;
+ memcpy(&v,cp,4);
+ return v;
+}
+/**
+ * Set a 32-bit value beginning at <b>cp</b> to <b>v</b>. Equivalent to
+ * *(uint32_t*)(cp) = v, but will not cause segfaults on platforms that forbid
+ * unaligned memory access. */
+void
+set_uint32(void *cp, uint32_t v)
+{
+ memcpy(cp,&v,4);
+}
+
+#define STMT_BEGIN do {
+#define STMT_END } while(0)
+#define SHA256_CTX sha256_state
+#define SHA256_Init sha256_init
+#define SHA256_Update sha256_process
+#define LTC_ARGCHK(x) Q_ASSERT(x)
+#include "sha256.c"
+#define SHA256_Final(a,b) sha256_done(b,a)
+
+static unsigned char *
+SHA256(const unsigned char *m, size_t len, unsigned char *d)
+{
+ SHA256_CTX ctx;
+ SHA256_Init(&ctx);
+ SHA256_Update(&ctx, m, len);
+ SHA256_Final(d, &ctx);
+ return d;
+}
+
+/** Compute the HMAC-SHA-256 of the <b>msg_len</b> bytes in <b>msg</b>, using
+ * the <b>key</b> of length <b>key_len</b>. Store the DIGEST256_LEN-byte
+ * result in <b>hmac_out</b>.
+ */
+void
+crypto_hmac_sha256(char *hmac_out,
+ const char *key, size_t key_len,
+ const char *msg, size_t msg_len)
+{
+#define BLOCKSIZE 64
+#define DIGESTSIZE 32
+ uint8_t k[BLOCKSIZE];
+ uint8_t pad[BLOCKSIZE];
+ uint8_t d[DIGESTSIZE];
+ int i;
+ SHA256_CTX st;
+
+ if (key_len <= BLOCKSIZE) {
+ memset(k, 0, sizeof(k));
+ memcpy(k, key, key_len); /* not time invariant in key_len */
+ } else {
+ SHA256((const uint8_t *)key, key_len, k);
+ memset(k+DIGESTSIZE, 0, sizeof(k)-DIGESTSIZE);
+ }
+ for (i = 0; i < BLOCKSIZE; ++i)
+ pad[i] = k[i] ^ 0x36;
+ SHA256_Init(&st);
+ SHA256_Update(&st, pad, BLOCKSIZE);
+ SHA256_Update(&st, (uint8_t*)msg, msg_len);
+ SHA256_Final(d, &st);
+
+ for (i = 0; i < BLOCKSIZE; ++i)
+ pad[i] = k[i] ^ 0x5c;
+ SHA256_Init(&st);
+ SHA256_Update(&st, pad, BLOCKSIZE);
+ SHA256_Update(&st, d, DIGESTSIZE);
+ SHA256_Final((uint8_t*)hmac_out, &st);
+
+ /* Now clear everything. */
+ memset(k, 0, sizeof(k));
+ memset(pad, 0, sizeof(pad));
+ memset(d, 0, sizeof(d));
+ memset(&st, 0, sizeof(st));
+#undef BLOCKSIZE
+#undef DIGESTSIZE
+}
diff --git a/src/common/crypto.h b/src/common/crypto.h
index 65582ed..cbfde62 100644
--- a/src/common/crypto.h
+++ b/src/common/crypto.h
@@ -73,6 +73,13 @@ QString crypto_rand_string(int len);
* return a default-constructed QByteArray. */
QByteArray
crypto_secret_to_key(const QString &secret, const QByteArray &salt, quint8 c);
+/** Compute the HMAC-SHA-256 of the <b>msg_len</b> bytes in <b>msg</b>, using
+ * the <b>key</b> of length <b>key_len</b>. Store the DIGEST256_LEN-byte
+ * result in <b>hmac_out</b>.
+ */
+void
+crypto_hmac_sha256(char *hmac_out, const char *key, size_t key_len,
+ const char *msg, size_t msg_len);
#endif
diff --git a/src/common/file.cpp b/src/common/file.cpp
index 90589c5..e746267 100644
--- a/src/common/file.cpp
+++ b/src/common/file.cpp
@@ -123,3 +123,30 @@ expand_filename(const QString &filename)
return fname;
}
+/** Recursively remove the directory with all its contents. */
+bool
+remove_dir(const QString &path)
+{
+ bool res = true;
+ QDir dir(path);
+
+ if(not dir.exists(path))
+ return false;
+
+ foreach(QFileInfo info, dir.entryInfoList(QDir::NoDotAndDotDot |
+ QDir::System |
+ QDir::Hidden |
+ QDir::AllDirs |
+ QDir::Files)) {
+ if(info.isDir())
+ res = remove_dir(info.absoluteFilePath());
+ else
+ res = QFile::remove(info.absoluteFilePath());
+
+ if(!res)
+ return res;
+ }
+ res = dir.rmdir(path);
+
+ return res;
+}
diff --git a/src/common/file.h b/src/common/file.h
index 30d4477..c4f0873 100644
--- a/src/common/file.h
+++ b/src/common/file.h
@@ -38,5 +38,8 @@ QString expand_filename(const QString &filename);
* otherwise. */
bool copy_dir(const QString &source, const QString &dest);
+/** Recursively remove the directory with all its contents. */
+bool remove_dir(const QString &dir);
+
#endif
diff --git a/src/common/procutil.cpp b/src/common/procutil.cpp
index 12ff1ea..8774ecb 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 21fe11f..0a4a99e 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/common/sha256.c b/src/common/sha256.c
new file mode 100644
index 0000000..813c68d
--- /dev/null
+++ b/src/common/sha256.c
@@ -0,0 +1,331 @@
+/* Copyright (c) 2009-2012, The Tor Project, Inc. */
+/* See LICENSE for licensing information */
+/* This SHA256 implementation is adapted from the public domain one in
+ LibTomCrypt, version 1.6. Tor uses it on platforms where OpenSSL doesn't
+ have a SHA256. */
+
+
+typedef struct sha256_state {
+ uint64_t length;
+ uint32_t state[8], curlen;
+ unsigned char buf[64];
+} sha256_state;
+
+#define CRYPT_OK 0
+#define CRYPT_NOP -1
+#define CRYPT_INVALID_ARG -2
+
+#define LOAD32H(x,y) STMT_BEGIN x = ntohl(get_uint32((const char*)y)); STMT_END
+#define STORE32H(x,y) STMT_BEGIN set_uint32((char*)y, htonl(x)); STMT_END
+#define STORE64H(x,y) STMT_BEGIN \
+ set_uint32((char*)y, htonl((uint32_t)((x)>>32))); \
+ set_uint32(((char*)y)+4, htonl((uint32_t)((x)&0xffffffff))); \
+ STMT_END
+#define RORc(x, y) ( ((((unsigned long)(x)&0xFFFFFFFFUL)>>(unsigned long)((y)&31)) | ((unsigned long)(x)<<(unsigned long)(32-((y)&31)))) & 0xFFFFFFFFUL)
+#ifndef MIN
+ #define MIN(x, y) ( ((x)<(y))?(x):(y) )
+#endif
+
+
+/* LibTomCrypt, modular cryptographic library -- Tom St Denis
+ *
+ * LibTomCrypt is a library that provides various cryptographic
+ * algorithms in a highly modular and flexible manner.
+ *
+ * The library is free for all purposes without any express
+ * guarantee it works.
+ *
+ * Tom St Denis, tomstdenis at gmail.com, http://libtomcrypt.com
+ */
+
+/**
+ @file sha256.c
+ SHA256 by Tom St Denis
+*/
+
+
+#ifdef LTC_SMALL_CODE
+/* the K array */
+static const uint32_t K[64] = {
+ 0x428a2f98UL, 0x71374491UL, 0xb5c0fbcfUL, 0xe9b5dba5UL, 0x3956c25bUL,
+ 0x59f111f1UL, 0x923f82a4UL, 0xab1c5ed5UL, 0xd807aa98UL, 0x12835b01UL,
+ 0x243185beUL, 0x550c7dc3UL, 0x72be5d74UL, 0x80deb1feUL, 0x9bdc06a7UL,
+ 0xc19bf174UL, 0xe49b69c1UL, 0xefbe4786UL, 0x0fc19dc6UL, 0x240ca1ccUL,
+ 0x2de92c6fUL, 0x4a7484aaUL, 0x5cb0a9dcUL, 0x76f988daUL, 0x983e5152UL,
+ 0xa831c66dUL, 0xb00327c8UL, 0xbf597fc7UL, 0xc6e00bf3UL, 0xd5a79147UL,
+ 0x06ca6351UL, 0x14292967UL, 0x27b70a85UL, 0x2e1b2138UL, 0x4d2c6dfcUL,
+ 0x53380d13UL, 0x650a7354UL, 0x766a0abbUL, 0x81c2c92eUL, 0x92722c85UL,
+ 0xa2bfe8a1UL, 0xa81a664bUL, 0xc24b8b70UL, 0xc76c51a3UL, 0xd192e819UL,
+ 0xd6990624UL, 0xf40e3585UL, 0x106aa070UL, 0x19a4c116UL, 0x1e376c08UL,
+ 0x2748774cUL, 0x34b0bcb5UL, 0x391c0cb3UL, 0x4ed8aa4aUL, 0x5b9cca4fUL,
+ 0x682e6ff3UL, 0x748f82eeUL, 0x78a5636fUL, 0x84c87814UL, 0x8cc70208UL,
+ 0x90befffaUL, 0xa4506cebUL, 0xbef9a3f7UL, 0xc67178f2UL
+};
+#endif
+
+/* Various logical functions */
+#define Ch(x,y,z) (z ^ (x & (y ^ z)))
+#define Maj(x,y,z) (((x | y) & z) | (x & y))
+#define S(x, n) RORc((x),(n))
+#define R(x, n) (((x)&0xFFFFFFFFUL)>>(n))
+#define Sigma0(x) (S(x, 2) ^ S(x, 13) ^ S(x, 22))
+#define Sigma1(x) (S(x, 6) ^ S(x, 11) ^ S(x, 25))
+#define Gamma0(x) (S(x, 7) ^ S(x, 18) ^ R(x, 3))
+#define Gamma1(x) (S(x, 17) ^ S(x, 19) ^ R(x, 10))
+
+/* compress 512-bits */
+#ifdef LTC_CLEAN_STACK
+static int _sha256_compress(sha256_state * md, unsigned char *buf)
+#else
+static int sha256_compress(sha256_state * md, unsigned char *buf)
+#endif
+{
+ uint32_t S[8], W[64], t0, t1;
+#ifdef LTC_SMALL_CODE
+ uint32_t t;
+#endif
+ int i;
+
+ /* copy state into S */
+ for (i = 0; i < 8; i++) {
+ S[i] = md->state[i];
+ }
+
+ /* copy the state into 512-bits into W[0..15] */
+ for (i = 0; i < 16; i++) {
+ LOAD32H(W[i], buf + (4*i));
+ }
+
+ /* fill W[16..63] */
+ for (i = 16; i < 64; i++) {
+ W[i] = Gamma1(W[i - 2]) + W[i - 7] + Gamma0(W[i - 15]) + W[i - 16];
+ }
+
+ /* Compress */
+#ifdef LTC_SMALL_CODE
+#define RND(a,b,c,d,e,f,g,h,i) \
+ t0 = h + Sigma1(e) + Ch(e, f, g) + K[i] + W[i]; \
+ t1 = Sigma0(a) + Maj(a, b, c); \
+ d += t0; \
+ h = t0 + t1;
+
+ for (i = 0; i < 64; ++i) {
+ RND(S[0],S[1],S[2],S[3],S[4],S[5],S[6],S[7],i);
+ t = S[7]; S[7] = S[6]; S[6] = S[5]; S[5] = S[4];
+ S[4] = S[3]; S[3] = S[2]; S[2] = S[1]; S[1] = S[0]; S[0] = t;
+ }
+#else
+#define RND(a,b,c,d,e,f,g,h,i,ki) \
+ t0 = h + Sigma1(e) + Ch(e, f, g) + ki + W[i]; \
+ t1 = Sigma0(a) + Maj(a, b, c); \
+ d += t0; \
+ h = t0 + t1;
+
+ RND(S[0],S[1],S[2],S[3],S[4],S[5],S[6],S[7],0,0x428a2f98);
+ RND(S[7],S[0],S[1],S[2],S[3],S[4],S[5],S[6],1,0x71374491);
+ RND(S[6],S[7],S[0],S[1],S[2],S[3],S[4],S[5],2,0xb5c0fbcf);
+ RND(S[5],S[6],S[7],S[0],S[1],S[2],S[3],S[4],3,0xe9b5dba5);
+ RND(S[4],S[5],S[6],S[7],S[0],S[1],S[2],S[3],4,0x3956c25b);
+ RND(S[3],S[4],S[5],S[6],S[7],S[0],S[1],S[2],5,0x59f111f1);
+ RND(S[2],S[3],S[4],S[5],S[6],S[7],S[0],S[1],6,0x923f82a4);
+ RND(S[1],S[2],S[3],S[4],S[5],S[6],S[7],S[0],7,0xab1c5ed5);
+ RND(S[0],S[1],S[2],S[3],S[4],S[5],S[6],S[7],8,0xd807aa98);
+ RND(S[7],S[0],S[1],S[2],S[3],S[4],S[5],S[6],9,0x12835b01);
+ RND(S[6],S[7],S[0],S[1],S[2],S[3],S[4],S[5],10,0x243185be);
+ RND(S[5],S[6],S[7],S[0],S[1],S[2],S[3],S[4],11,0x550c7dc3);
+ RND(S[4],S[5],S[6],S[7],S[0],S[1],S[2],S[3],12,0x72be5d74);
+ RND(S[3],S[4],S[5],S[6],S[7],S[0],S[1],S[2],13,0x80deb1fe);
+ RND(S[2],S[3],S[4],S[5],S[6],S[7],S[0],S[1],14,0x9bdc06a7);
+ RND(S[1],S[2],S[3],S[4],S[5],S[6],S[7],S[0],15,0xc19bf174);
+ RND(S[0],S[1],S[2],S[3],S[4],S[5],S[6],S[7],16,0xe49b69c1);
+ RND(S[7],S[0],S[1],S[2],S[3],S[4],S[5],S[6],17,0xefbe4786);
+ RND(S[6],S[7],S[0],S[1],S[2],S[3],S[4],S[5],18,0x0fc19dc6);
+ RND(S[5],S[6],S[7],S[0],S[1],S[2],S[3],S[4],19,0x240ca1cc);
+ RND(S[4],S[5],S[6],S[7],S[0],S[1],S[2],S[3],20,0x2de92c6f);
+ RND(S[3],S[4],S[5],S[6],S[7],S[0],S[1],S[2],21,0x4a7484aa);
+ RND(S[2],S[3],S[4],S[5],S[6],S[7],S[0],S[1],22,0x5cb0a9dc);
+ RND(S[1],S[2],S[3],S[4],S[5],S[6],S[7],S[0],23,0x76f988da);
+ RND(S[0],S[1],S[2],S[3],S[4],S[5],S[6],S[7],24,0x983e5152);
+ RND(S[7],S[0],S[1],S[2],S[3],S[4],S[5],S[6],25,0xa831c66d);
+ RND(S[6],S[7],S[0],S[1],S[2],S[3],S[4],S[5],26,0xb00327c8);
+ RND(S[5],S[6],S[7],S[0],S[1],S[2],S[3],S[4],27,0xbf597fc7);
+ RND(S[4],S[5],S[6],S[7],S[0],S[1],S[2],S[3],28,0xc6e00bf3);
+ RND(S[3],S[4],S[5],S[6],S[7],S[0],S[1],S[2],29,0xd5a79147);
+ RND(S[2],S[3],S[4],S[5],S[6],S[7],S[0],S[1],30,0x06ca6351);
+ RND(S[1],S[2],S[3],S[4],S[5],S[6],S[7],S[0],31,0x14292967);
+ RND(S[0],S[1],S[2],S[3],S[4],S[5],S[6],S[7],32,0x27b70a85);
+ RND(S[7],S[0],S[1],S[2],S[3],S[4],S[5],S[6],33,0x2e1b2138);
+ RND(S[6],S[7],S[0],S[1],S[2],S[3],S[4],S[5],34,0x4d2c6dfc);
+ RND(S[5],S[6],S[7],S[0],S[1],S[2],S[3],S[4],35,0x53380d13);
+ RND(S[4],S[5],S[6],S[7],S[0],S[1],S[2],S[3],36,0x650a7354);
+ RND(S[3],S[4],S[5],S[6],S[7],S[0],S[1],S[2],37,0x766a0abb);
+ RND(S[2],S[3],S[4],S[5],S[6],S[7],S[0],S[1],38,0x81c2c92e);
+ RND(S[1],S[2],S[3],S[4],S[5],S[6],S[7],S[0],39,0x92722c85);
+ RND(S[0],S[1],S[2],S[3],S[4],S[5],S[6],S[7],40,0xa2bfe8a1);
+ RND(S[7],S[0],S[1],S[2],S[3],S[4],S[5],S[6],41,0xa81a664b);
+ RND(S[6],S[7],S[0],S[1],S[2],S[3],S[4],S[5],42,0xc24b8b70);
+ RND(S[5],S[6],S[7],S[0],S[1],S[2],S[3],S[4],43,0xc76c51a3);
+ RND(S[4],S[5],S[6],S[7],S[0],S[1],S[2],S[3],44,0xd192e819);
+ RND(S[3],S[4],S[5],S[6],S[7],S[0],S[1],S[2],45,0xd6990624);
+ RND(S[2],S[3],S[4],S[5],S[6],S[7],S[0],S[1],46,0xf40e3585);
+ RND(S[1],S[2],S[3],S[4],S[5],S[6],S[7],S[0],47,0x106aa070);
+ RND(S[0],S[1],S[2],S[3],S[4],S[5],S[6],S[7],48,0x19a4c116);
+ RND(S[7],S[0],S[1],S[2],S[3],S[4],S[5],S[6],49,0x1e376c08);
+ RND(S[6],S[7],S[0],S[1],S[2],S[3],S[4],S[5],50,0x2748774c);
+ RND(S[5],S[6],S[7],S[0],S[1],S[2],S[3],S[4],51,0x34b0bcb5);
+ RND(S[4],S[5],S[6],S[7],S[0],S[1],S[2],S[3],52,0x391c0cb3);
+ RND(S[3],S[4],S[5],S[6],S[7],S[0],S[1],S[2],53,0x4ed8aa4a);
+ RND(S[2],S[3],S[4],S[5],S[6],S[7],S[0],S[1],54,0x5b9cca4f);
+ RND(S[1],S[2],S[3],S[4],S[5],S[6],S[7],S[0],55,0x682e6ff3);
+ RND(S[0],S[1],S[2],S[3],S[4],S[5],S[6],S[7],56,0x748f82ee);
+ RND(S[7],S[0],S[1],S[2],S[3],S[4],S[5],S[6],57,0x78a5636f);
+ RND(S[6],S[7],S[0],S[1],S[2],S[3],S[4],S[5],58,0x84c87814);
+ RND(S[5],S[6],S[7],S[0],S[1],S[2],S[3],S[4],59,0x8cc70208);
+ RND(S[4],S[5],S[6],S[7],S[0],S[1],S[2],S[3],60,0x90befffa);
+ RND(S[3],S[4],S[5],S[6],S[7],S[0],S[1],S[2],61,0xa4506ceb);
+ RND(S[2],S[3],S[4],S[5],S[6],S[7],S[0],S[1],62,0xbef9a3f7);
+ RND(S[1],S[2],S[3],S[4],S[5],S[6],S[7],S[0],63,0xc67178f2);
+
+#undef RND
+
+#endif
+
+ /* feedback */
+ for (i = 0; i < 8; i++) {
+ md->state[i] = md->state[i] + S[i];
+ }
+ return CRYPT_OK;
+}
+
+#ifdef LTC_CLEAN_STACK
+static int sha256_compress(sha256_state * md, unsigned char *buf)
+{
+ int err;
+ err = _sha256_compress(md, buf);
+ burn_stack(sizeof(uint32_t) * 74);
+ return err;
+}
+#endif
+
+/**
+ Initialize the hash state
+ @param md The hash state you wish to initialize
+ @return CRYPT_OK if successful
+*/
+static int sha256_init(sha256_state * md)
+{
+ LTC_ARGCHK(md != NULL);
+
+ md->curlen = 0;
+ md->length = 0;
+ md->state[0] = 0x6A09E667UL;
+ md->state[1] = 0xBB67AE85UL;
+ md->state[2] = 0x3C6EF372UL;
+ md->state[3] = 0xA54FF53AUL;
+ md->state[4] = 0x510E527FUL;
+ md->state[5] = 0x9B05688CUL;
+ md->state[6] = 0x1F83D9ABUL;
+ md->state[7] = 0x5BE0CD19UL;
+ return CRYPT_OK;
+}
+
+/**
+ Process a block of memory though the hash
+ @param md The hash state
+ @param in The data to hash
+ @param inlen The length of the data (octets)
+ @return CRYPT_OK if successful
+*/
+static int sha256_process (sha256_state * md, const unsigned char *in, unsigned long inlen)
+{
+ unsigned long n;
+ int err;
+ LTC_ARGCHK(md != NULL);
+ LTC_ARGCHK(in != NULL);
+ if (md->curlen > sizeof(md->buf)) {
+ return CRYPT_INVALID_ARG;
+ }
+ while (inlen > 0) {
+ if (md->curlen == 0 && inlen >= 64) {
+ if ((err = sha256_compress (md, (unsigned char *)in)) != CRYPT_OK) {
+ return err;
+ }
+ md->length += 64 * 8;
+ in += 64;
+ inlen -= 64;
+ } else {
+ n = MIN(inlen, (64 - md->curlen));
+ memcpy(md->buf + md->curlen, in, (size_t)n);
+ md->curlen += n;
+ in += n;
+ inlen -= n;
+ if (md->curlen == 64) {
+ if ((err = sha256_compress (md, md->buf)) != CRYPT_OK) {
+ return err;
+ }
+ md->length += 8*64;
+ md->curlen = 0;
+ }
+ }
+ }
+ return CRYPT_OK;
+}
+
+/**
+ Terminate the hash to get the digest
+ @param md The hash state
+ @param out [out] The destination of the hash (32 bytes)
+ @return CRYPT_OK if successful
+*/
+static int sha256_done(sha256_state * md, unsigned char *out)
+{
+ int i;
+
+ LTC_ARGCHK(md != NULL);
+ LTC_ARGCHK(out != NULL);
+
+ if (md->curlen >= sizeof(md->buf)) {
+ return CRYPT_INVALID_ARG;
+ }
+
+
+ /* increase the length of the message */
+ md->length += md->curlen * 8;
+
+ /* append the '1' bit */
+ md->buf[md->curlen++] = (unsigned char)0x80;
+
+ /* if the length is currently above 56 bytes we append zeros
+ * then compress. Then we can fall back to padding zeros and length
+ * encoding like normal.
+ */
+ if (md->curlen > 56) {
+ while (md->curlen < 64) {
+ md->buf[md->curlen++] = (unsigned char)0;
+ }
+ sha256_compress(md, md->buf);
+ md->curlen = 0;
+ }
+
+ /* pad upto 56 bytes of zeroes */
+ while (md->curlen < 56) {
+ md->buf[md->curlen++] = (unsigned char)0;
+ }
+
+ /* store length */
+ STORE64H(md->length, md->buf+56);
+ sha256_compress(md, md->buf);
+
+ /* copy output */
+ for (i = 0; i < 8; i++) {
+ STORE32H(md->state[i], out+(4*i));
+ }
+#ifdef LTC_CLEAN_STACK
+ zeromem(md, sizeof(sha256_state));
+#endif
+ return CRYPT_OK;
+}
+
+/* $Source: /cvs/libtom/libtomcrypt/src/hashes/sha2/sha256.c,v $ */
+/* $Revision: 1.9 $ */
+/* $Date: 2006/11/01 09:28:17 $ */
diff --git a/src/common/stringutil.cpp b/src/common/stringutil.cpp
index 8b9b64d..9ce9dbd 100644
--- a/src/common/stringutil.cpp
+++ b/src/common/stringutil.cpp
@@ -122,6 +122,53 @@ base16_encode(const QByteArray &buf)
return hex;
}
+/** Helper: given a hex digit, return its value, or -1 if it isn't hex. */
+inline int
+_hex_decode_digit(char c)
+{
+ switch (c) {
+ case '0': return 0;
+ case '1': return 1;
+ case '2': return 2;
+ case '3': return 3;
+ case '4': return 4;
+ case '5': return 5;
+ case '6': return 6;
+ case '7': return 7;
+ case '8': return 8;
+ case '9': return 9;
+ case 'A': case 'a': return 10;
+ case 'B': case 'b': return 11;
+ case 'C': case 'c': return 12;
+ case 'D': case 'd': return 13;
+ case 'E': case 'e': return 14;
+ case 'F': case 'f': return 15;
+ default:
+ return -1;
+ }
+}
+
+/** Given a hexadecimal string of <b>srclen</b> bytes in <b>src</b>, decode it
+ * and store the result in the <b>destlen</b>-byte buffer at <b>dest</b>.
+ * Return 0 on success, -1 on failure. */
+QString
+base16_decode(const QByteArray &buf)
+{
+ int v1,v2;
+ QString dest;
+
+ if ((buf.size() % 2) != 0)
+ return QString();
+ for(int i = 0; i < buf.size(); i+=2) {
+ v1 = _hex_decode_digit(buf[i]);
+ v2 = _hex_decode_digit(buf[i+1]);
+ if (v1<0||v2<0)
+ return QString();
+ dest.append((v1<<4)|v2);
+ }
+ return dest;
+}
+
/** Given an ASCII string <b>str</b>, this function returns a quoted string
* with all escaped characters unescaped. Non-ASCII characters in the string
* will be converted to the local 8-bit character encoding and encoded using
diff --git a/src/common/stringutil.h b/src/common/stringutil.h
index 24cac74..0e2f9fe 100644
--- a/src/common/stringutil.h
+++ b/src/common/stringutil.h
@@ -47,6 +47,7 @@ QString string_wrap(const QString &str, int width,
* returns the result. This function is derived from base16_encode() in Tor's
* util.c. See LICENSE for details on Tor's license. */
QString base16_encode(const QByteArray &buf);
+QString base16_decode(const QByteArray &buf);
/** Given a string <b>str</b>, this function returns a quoted string with all
* '"' and '\' characters escaped with a single '\'. */
diff --git a/src/torcontrol/Circuit.cpp b/src/torcontrol/Circuit.cpp
index 5fd97bc..a15ddd6 100644
--- a/src/torcontrol/Circuit.cpp
+++ b/src/torcontrol/Circuit.cpp
@@ -15,22 +15,30 @@
#include "tcglobal.h"
#include "Circuit.h"
+#include "stringutil.h"
#include <QStringList>
#include <QRegExp>
+#include <QDebug>
/** Default constructor. */
Circuit::Circuit()
-{
- _status = Unknown;
- _isValid = false;
-}
+ : _status(Unknown),
+ _isValid(false),
+ _buildFlags(None),
+ _purpose(General)
+{}
/** Parses the string given in Tor control protocol format for a circuit. The
* format is:
*
- * CircuitID SP CircStatus [SP Path]
+ * CircuitID SP CircStatus [SP Path]
+ * [SP "BUILD_FLAGS=" BuildFlags] [SP "PURPOSE=" Purpose]
+ * [SP "HS_STATE=" HSState] [SP "REND_QUERY=" HSAddress]
+ * [SP "TIME_CREATED=" TimeCreated]
+ * [SP "REASON=" Reason [SP "REMOTE_REASON=" Reason]] CRLF
+ *
*
* If the status is "LAUNCHED", the Path is empty. Server names in the path
* must follow Tor's VERBOSE_NAMES format.
@@ -59,6 +67,24 @@ Circuit::Circuit(const QString &circuit)
}
}
+ if(parts.size() > 3) {
+ parts.removeFirst(); // remove id
+ parts.removeFirst(); // remove status
+ parts.removeFirst(); // remove path
+
+ bool ok;
+ QHash<QString,QString> rest = string_parse_keyvals(parts.join(" "), &ok);
+ foreach(const QString key, rest.keys()) {
+ if(key.compare("BUILD_FLAGS", Qt::CaseInsensitive) == 0) {
+ _buildFlags = None;
+ foreach(const QString flag, rest.value(key).split(","))
+ _buildFlags |= flagValue(flag);
+ } else if(key.compare("PURPOSE", Qt::CaseInsensitive) == 0) {
+ _purpose = purposeValue(rest.value(key));
+ }
+ }
+ }
+
_isValid = true;
}
return;
@@ -68,6 +94,38 @@ err:
_isValid = false;
}
+Circuit::BuildFlag
+Circuit::flagValue(const QString &flag) const
+{
+ if (!flag.compare("ONEHOP_TUNNEL", Qt::CaseInsensitive))
+ return OneHopTunnel;
+ if (!flag.compare("IS_INTERNAL", Qt::CaseInsensitive))
+ return IsInternal;
+ if (!flag.compare("NEED_CAPACITY", Qt::CaseInsensitive))
+ return NeedCapacity;
+ if (!flag.compare("NEED_UPTIME", Qt::CaseInsensitive))
+ return NeedUptime;
+ return None;
+}
+
+Circuit::Purpose
+Circuit::purposeValue(const QString &purpose) const
+{
+ if (!purpose.compare("CONTROLLER", Qt::CaseInsensitive))
+ return Controller;
+ if (!purpose.compare("HS_CLIENT_INTRO", Qt::CaseInsensitive))
+ return HsClientIntro;
+ if (!purpose.compare("HS_CLIENT_REND", Qt::CaseInsensitive))
+ return HsClientRend;
+ if (!purpose.compare("HS_SERVICE_INTRO", Qt::CaseInsensitive))
+ return HsServiceIntro;
+ if (!purpose.compare("HS_SERVICE_REND", Qt::CaseInsensitive))
+ return HsServiceRend;
+ if (!purpose.compare("TESTING", Qt::CaseInsensitive))
+ return Testing;
+ return General;
+}
+
/** Returns true iff <b>circId</b> consists of only between 1 and 16
* (inclusive) ASCII-encoded letters and numbers. */
bool
diff --git a/src/torcontrol/Circuit.h b/src/torcontrol/Circuit.h
index 406979b..831816a 100644
--- a/src/torcontrol/Circuit.h
+++ b/src/torcontrol/Circuit.h
@@ -39,6 +39,27 @@ public:
Closed /**< Circuit closed (was built) */
};
+ /** Build flags for circuits */
+ enum BuildFlag {
+ None = 0x0000,
+ OneHopTunnel = 0x0001,
+ IsInternal = 0x0002,
+ NeedCapacity = 0x0004,
+ NeedUptime = 0x0008,
+ };
+ Q_DECLARE_FLAGS(BuildFlags, BuildFlag)
+
+ /** Purpose for a circuit */
+ enum Purpose {
+ General = 0,
+ HsClientIntro,
+ HsClientRend,
+ HsServiceIntro,
+ HsServiceRend,
+ Testing,
+ Controller
+ };
+
/** Default constructor. */
Circuit();
/** Constructor. */
@@ -60,6 +81,11 @@ public:
/** Returns the circuit's path as an ordered list of router fingerprints. */
QStringList routerIDs() const { return _ids; }
+ /** Returns the circuit's build flags */
+ BuildFlags buildFlags() const { return _buildFlags; }
+ /** Returns the circuit's purpose */
+ Purpose purpose() const { return _purpose; }
+
/** Converts a string description of a circuit's status to an enum value */
static Status toStatus(const QString &strStatus);
@@ -73,6 +99,18 @@ private:
QStringList _names; /**< Nicknames of the routers in the circuit. */
QStringList _ids; /**< IDs of the routers in the circuit. */
bool _isValid;
+
+ BuildFlags _buildFlags;
+ Purpose _purpose;
+
+ /** Returns a BuildFlag enum value for the given router status
+ * <b>flag</b>. If <b>flag</b> is not recognized, then <i>None</i>
+ * is returned. */
+ BuildFlag flagValue(const QString &flag) const;
+ /** Returns a Purpose enum value for the given router status
+ * <b>purpose</b>. If <b>purpose</b> is not recognized, then
+ * <i>General</i> is returned. */
+ Purpose purposeValue(const QString &purpose) const;
};
Q_DECLARE_METATYPE(Circuit);
@@ -80,5 +118,7 @@ Q_DECLARE_METATYPE(Circuit);
/** A collection of circuits. */
typedef QList<Circuit> CircuitList;
+Q_DECLARE_OPERATORS_FOR_FLAGS(Circuit::BuildFlags)
+
#endif
diff --git a/src/torcontrol/ControlConnection.cpp b/src/torcontrol/ControlConnection.cpp
index 8ca998f..5f337c4 100644
--- a/src/torcontrol/ControlConnection.cpp
+++ b/src/torcontrol/ControlConnection.cpp
@@ -29,30 +29,31 @@
/** Default constructor. */
ControlConnection::ControlConnection(ControlMethod::Method method, TorEvents *events)
+ : QObject()
{
_events = events;
_status = Unset;
_sock = 0;
+ _connectTimer = 0;
_sendWaiter = new SendCommandEvent::SendWaiter();
_method = method;
+ _connected = false;
}
/** Destructor. */
ControlConnection::~ControlConnection()
{
- /* Exit the event loop */
- exit();
- /* Wait for the thread to finish */
- wait();
/* Clean up after the send waiter */
delete _sendWaiter;
+ if(_sock) delete _sock;
+ if(_connectTimer) delete _connectTimer;
}
/** Connect to the specified Tor control interface. */
void
ControlConnection::connect(const QHostAddress &addr, quint16 port)
{
- if (isRunning()) {
+ if (_connected) {
tc::error("Bug: Tried to call ControlConnection::connect() when the "
"control thread is already running.");
return;
@@ -65,15 +66,14 @@ ControlConnection::connect(const QHostAddress &addr, quint16 port)
_connectAttempt = 0;
setStatus(Connecting);
- /* Kick off the thread in which the control socket will live */
- QThread::start();
+ run();
}
/** Connect to the specified Tor control socket interface. */
void
ControlConnection::connect(const QString &addr)
{
- if (isRunning()) {
+ if (_connected) {
tc::error("Bug: Tried to call ControlConnection::connect() when the "
"control thread is already running.");
return;
@@ -83,8 +83,7 @@ ControlConnection::connect(const QString &addr)
_connectAttempt = 0;
setStatus(Connecting);
- /* Kick off the thread in which the control socket will live */
- QThread::start();
+ run();
}
/** Attempt to establish a connection to Tor's control interface. We will try
@@ -97,7 +96,6 @@ ControlConnection::connect()
tc::debug("Connecting to Tor (Attempt %1 of %2)").arg(_connectAttempt)
.arg(MAX_CONNECT_ATTEMPTS);
- _connMutex.lock();
switch(_method) {
case ControlMethod::Socket:
_sock->connectToServer(_path);
@@ -108,15 +106,16 @@ ControlConnection::connect()
_sock->connectToHost(_addr, _port);
break;
}
- _connMutex.unlock();
}
/** Disconnect from Tor's control interface. */
void
ControlConnection::disconnect()
{
+ clearCommandQueue();
+
setStatus(Disconnecting);
- _connMutex.lock();
+
switch(_method) {
case ControlMethod::Socket:
_sock->disconnectFromServer();
@@ -127,7 +126,25 @@ ControlConnection::disconnect()
_sock->disconnectFromHost();
break;
}
- _connMutex.unlock();
+
+ _sock->disconnect(this);
+}
+
+/** Clears all waiting commands. */
+void
+ControlConnection::clearCommandQueue()
+{
+ /** If there are any messages waiting for a response, clear them. */
+ if (_sendWaiter->status() == SendCommandEvent::SendWaiter::Waiting)
+ _sendWaiter->setResult(false, tr("Control socket is not connected."));
+
+ while (!_recvQueue.isEmpty()) {
+ ReceiveWaiter *w = _recvQueue.dequeue();
+ w->setResult(false, ControlReply(),
+ tr("Control socket is not connected."));
+
+ QCoreApplication::processEvents(QEventLoop::AllEvents, 1000);
+ }
}
/** Called when the control socket is connected. This method checks that the
@@ -136,6 +153,7 @@ void
ControlConnection::onConnected()
{
setStatus(Connected);
+ _connected = true;
emit connected();
}
@@ -145,8 +163,8 @@ void
ControlConnection::onDisconnected()
{
setStatus(Disconnected);
+ _connected = false;
emit disconnected();
- exit(0);
}
/** Called when the control socket encounters <b>error</b>. */
@@ -186,9 +204,9 @@ ControlConnection::onError(QAbstractSocket::SocketError error)
void
ControlConnection::cancelConnect()
{
+ _connected = false;
tc::warn("Control connection attempt cancelled.");
setStatus(Disconnected);
- exit(0);
}
/** Returns true if the control socket is connected to Tor. */
@@ -202,7 +220,6 @@ ControlConnection::isConnected()
ControlConnection::Status
ControlConnection::status()
{
- QMutexLocker locker(&_statusMutex);
return _status;
}
@@ -227,11 +244,12 @@ ControlConnection::statusString(Status status)
void
ControlConnection::setStatus(Status status)
{
- QMutexLocker locker(&_statusMutex);
tc::debug("Control connection status changed from '%1' to '%2'")
.arg(statusString(_status))
.arg(statusString(status));
_status = status;
+ if (_status == Disconnected)
+ clearCommandQueue();
}
/** Sends a control command to Tor and waits for the reply. */
@@ -242,24 +260,24 @@ ControlConnection::send(const ControlCommand &cmd,
bool result = false;
QString errstr;
- _recvMutex.lock();
- if (send(cmd, &errstr)) {
- /* Create and enqueue a new receive waiter */
- ReceiveWaiter *w = new ReceiveWaiter();
- _recvQueue.enqueue(w);
- _recvMutex.unlock();
+ /* Preentively create and enqueue a new receive waiter */
+ ReceiveWaiter *w = new ReceiveWaiter();
+ _recvQueue.enqueue(w);
+ if (send(cmd, &errstr)) {
/* Wait for and get the result, clean up, and return */
result = w->getResult(&reply, &errstr);
+
if (!result)
tc::error("Failed to receive control reply: %1").arg(errstr);
- delete w;
} else {
tc::error("Failed to send control command (%1): %2").arg(cmd.keyword())
.arg(errstr);
- _recvMutex.unlock();
+ _recvQueue.dequeue();
}
+ delete w;
+
if (!result && errmsg)
*errmsg = errstr;
return result;
@@ -271,13 +289,10 @@ ControlConnection::send(const ControlCommand &cmd,
bool
ControlConnection::send(const ControlCommand &cmd, QString *errmsg)
{
- _connMutex.lock();
if (!_sock || !_sock->isConnected()) {
- _connMutex.unlock();
return err(errmsg, tr("Control socket is not connected."));
}
QCoreApplication::postEvent(_sock, new SendCommandEvent(cmd, _sendWaiter));
- _connMutex.unlock();
return _sendWaiter->getResult(errmsg);
}
@@ -286,7 +301,6 @@ ControlConnection::send(const ControlCommand &cmd, QString *errmsg)
void
ControlConnection::onReadyRead()
{
- QMutexLocker locker(&_connMutex);
ReceiveWaiter *waiter;
QString errmsg;
@@ -304,15 +318,16 @@ ControlConnection::onReadyRead()
/* Response to a previous command */
tc::debug("Control Reply: %1").arg(reply.toString());
- _recvMutex.lock();
if (!_recvQueue.isEmpty()) {
waiter = _recvQueue.dequeue();
waiter->setResult(true, reply);
}
- _recvMutex.unlock();
}
} else {
tc::error("Unable to read control reply: %1").arg(errmsg);
+ if (!isConnected()) {
+ break;
+ }
}
}
}
@@ -323,7 +338,6 @@ void
ControlConnection::run()
{
/* Create a new control socket */
- _connMutex.lock();
_sock = new ControlSocket(_method);
_connectTimer = new QTimer();
@@ -341,33 +355,8 @@ ControlConnection::run()
QObject::connect(_connectTimer, SIGNAL(timeout()), this, SLOT(connect()),
Qt::DirectConnection);
- _connMutex.unlock();
-
/* Attempt to connect to Tor */
connect();
- tc::debug("Starting control connection event loop.");
- exec();
- tc::debug("Exited control connection event loop.");
-
- /* Clean up the socket */
- _connMutex.lock();
- _sock->disconnect(this);
- delete _sock;
- delete _connectTimer;
- _sock = 0;
- _connMutex.unlock();
-
- /* If there are any messages waiting for a response, clear them. */
- if (_sendWaiter->status() == SendCommandEvent::SendWaiter::Waiting)
- _sendWaiter->setResult(false, tr("Control socket is not connected."));
-
- _recvMutex.lock();
- while (!_recvQueue.isEmpty()) {
- ReceiveWaiter *w = _recvQueue.dequeue();
- w->setResult(false, ControlReply(),
- tr("Control socket is not connected."));
- }
- _recvMutex.unlock();
}
@@ -379,16 +368,9 @@ bool
ControlConnection::ReceiveWaiter::getResult(ControlReply *reply,
QString *errmsg)
{
- forever {
- _mutex.lock();
- if (_status == Waiting) {
- _waitCond.wait(&_mutex);
- _mutex.unlock();
- } else {
- _mutex.unlock();
- break;
- }
- }
+ while(_status == Waiting)
+ QCoreApplication::processEvents();
+
if (errmsg) {
*errmsg = _errmsg;
}
@@ -402,11 +384,8 @@ ControlConnection::ReceiveWaiter::setResult(bool success,
const ControlReply &reply,
const QString &errmsg)
{
- _mutex.lock();
_status = (success ? Success : Failed);
_reply = reply;
_errmsg = errmsg;
- _mutex.unlock();
- _waitCond.wakeAll();
}
diff --git a/src/torcontrol/ControlConnection.h b/src/torcontrol/ControlConnection.h
index a0e87a4..8bd9020 100644
--- a/src/torcontrol/ControlConnection.h
+++ b/src/torcontrol/ControlConnection.h
@@ -29,7 +29,7 @@
#include <QHostAddress>
-class ControlConnection : public QThread
+class ControlConnection : public QObject
{
Q_OBJECT
@@ -90,6 +90,8 @@ private:
void setStatus(Status status);
/** Returns the string description of <b>status</b>. */
QString statusString(Status status);
+ /** Clears all waiting commands. */
+ void clearCommandQueue();
/** Main thread implementation. */
void run();
@@ -127,6 +129,7 @@ private:
};
QQueue<ReceiveWaiter *> _recvQueue; /**< Objects waiting for a reply. */
SendCommandEvent::SendWaiter* _sendWaiter;
+ bool _connected;
};
#endif
diff --git a/src/torcontrol/ControlSocket.cpp b/src/torcontrol/ControlSocket.cpp
index fb5daa7..69dd2d8 100644
--- a/src/torcontrol/ControlSocket.cpp
+++ b/src/torcontrol/ControlSocket.cpp
@@ -19,26 +19,92 @@
#include "stringutil.h"
+#include <QLocalSocket>
+#include <QTcpSocket>
+
/** Timeout reads in 250ms. We can set this to a short value because if there
* isn't any data to read, we want to return anyway. */
#define READ_TIMEOUT 250
+/** A simple helper class to wrap the sockets access code. */
+class ControlSocket::SocketWrapper{
+
+public:
+ SocketWrapper(ControlMethod::Method method)
+ :_method(method)
+ {
+ _tcpSocket = new QTcpSocket();
+ _localSocket = new QLocalSocket();
+ }
+
+ ~SocketWrapper()
+ {
+ delete _localSocket;
+ delete _tcpSocket;
+ }
+
+ ControlMethod::Method getMethod() const
+ {
+ return _method;
+ }
+
+ QIODevice * socket() const
+ {
+ if (_method == ControlMethod::Socket)
+ return _localSocket;
+ else
+ return _tcpSocket;
+ }
+
+ bool isConnected() const
+ {
+ if (_method==ControlMethod::Socket)
+ return (_localSocket->isValid() && _localSocket->state() == QLocalSocket::ConnectedState);
+ else
+ return (_tcpSocket->isValid() && _tcpSocket->state() == QAbstractSocket::ConnectedState);
+ }
+
+ void flush()
+ {
+ if (_method==ControlMethod::Socket)
+ _localSocket->flush();
+ else
+ _tcpSocket->flush();
+ }
+
+ void connectToHost(const QHostAddress &address, quint16 port)
+ {
+ _tcpSocket->connectToHost(address, port);
+ }
+
+ void disconnectFromHost()
+ {
+ _tcpSocket->disconnectFromHost();
+ }
+
+ void connectToServer(const QString &name)
+ {
+ _localSocket->connectToServer(name);
+ }
+
+ void disconnectFromServer()
+ {
+ _localSocket->disconnectFromServer();
+ }
+
+private:
+ QTcpSocket *_tcpSocket; /**< Socket used in the connection */
+ QLocalSocket *_localSocket; /**< Socket used in the connection */
+ ControlMethod::Method _method; /**< Connection method. */
+};
+
+
/** Default constructor. */
ControlSocket::ControlSocket(ControlMethod::Method method)
{
- _tcpSocket = new QTcpSocket();
- _localSocket = new QLocalSocket();
- _method = method;
- switch(_method) {
- case ControlMethod::Port:
- _socket = _tcpSocket;
- break;
-
- case ControlMethod::Socket:
- _socket = _localSocket;
- break;
- }
+ _sock = new SocketWrapper(method);
+ _socket = _sock->socket();
QObject::connect(_socket, SIGNAL(readyRead()), this, SIGNAL(readyRead()));
QObject::connect(_socket, SIGNAL(disconnected()), this, SIGNAL(disconnected()));
@@ -47,54 +113,57 @@ ControlSocket::ControlSocket(ControlMethod::Method method)
this, SIGNAL(error(QAbstractSocket::SocketError)));
}
+/** Destructor. */
+ControlSocket::~ControlSocket()
+{
+ delete _sock;
+}
+
/** Returns true if the control socket is connected and ready to send or
* receive. */
bool
-ControlSocket::isConnected()
+ControlSocket::isConnected() const
{
- switch(_method) {
- case ControlMethod::Port:
- return (_tcpSocket->isValid() && _tcpSocket->state() == QAbstractSocket::ConnectedState);
- break;
+ return _sock->isConnected();
+}
- default:
- case ControlMethod::Socket:
- return (_localSocket->isValid() && _localSocket->state() == QLocalSocket::ConnectedState);
- break;
- }
+ControlMethod::Method
+ControlSocket::getMethod() const
+{
+ return _sock->getMethod();
}
/** Connects to address:port */
void
ControlSocket::connectToHost(const QHostAddress &address, quint16 port)
{
- _tcpSocket->connectToHost(address, port);
+ _sock->connectToHost(address, port);
}
/** Disconnects from host */
void
ControlSocket::disconnectFromHost()
{
- _tcpSocket->disconnectFromHost();
+ _sock->disconnectFromHost();
}
/** Connects to a unix socket file */
void
ControlSocket::connectToServer(const QString &name)
{
- _localSocket->connectToServer(name);
+ _sock->connectToServer(name);
}
/** Disconnects from the socket */
void
ControlSocket::disconnectFromServer()
{
- _localSocket->disconnectFromServer();
+ _sock->disconnectFromServer();
}
/** Interface to QTcpSocket::canReadLine */
bool
-ControlSocket::canReadLine()
+ControlSocket::canReadLine() const
{
return _socket->canReadLine();
}
@@ -174,15 +243,7 @@ ControlSocket::sendCommand(ControlCommand cmd, QString *errmsg)
return err(errmsg, tr("Error sending control command. [%1]")
.arg(_socket->errorString()));
}
- switch(_method) {
- case ControlMethod::Port:
- _tcpSocket->flush();
- break;
-
- case ControlMethod::Socket:
- _localSocket->flush();
- break;
- }
+ _sock->flush();
return true;
}
@@ -222,7 +283,14 @@ ControlSocket::readReply(ControlReply &reply, QString *errmsg)
}
/* Parse the status and message */
- ReplyLine replyLine(line.mid(0, 3), line.mid(4));
+ QString status = line.mid(0,3);
+ bool ok = false;
+ status.toInt(&ok);
+ if (!ok) {
+ return err(errmsg, QString("Malformed control reply: %1").arg(line));
+ }
+
+ ReplyLine replyLine(status, line.mid(4));
c = line.at(3);
/* If the reply line contains data, then parse out the data up until the
diff --git a/src/torcontrol/ControlSocket.h b/src/torcontrol/ControlSocket.h
index 27e65b7..77ed282 100644
--- a/src/torcontrol/ControlSocket.h
+++ b/src/torcontrol/ControlSocket.h
@@ -20,9 +20,8 @@
#include "ControlReply.h"
#include "ControlMethod.h"
-#include <QtCore>
-#include <QLocalSocket>
-#include <QTcpSocket>
+#include <QObject>
+#include <QAbstractSocket>
class ControlSocket : public QObject
{
@@ -31,6 +30,8 @@ class ControlSocket : public QObject
public:
/** Default constructor. */
ControlSocket(ControlMethod::Method method = ControlMethod::Port);
+ /** Destructor. */
+ ~ControlSocket();
/** Send a command to Tor */
bool sendCommand(ControlCommand cmd, QString *errmsg = 0);
@@ -39,9 +40,9 @@ public:
/** Returns true if the control socket is connected and ready to send or
* receive. */
- bool isConnected();
+ bool isConnected() const;
/** Interface to each socket's canReadLine implementation */
- bool canReadLine();
+ bool canReadLine() const;
void connectToHost(const QHostAddress &address, quint16 port);
/** Disconnects from host */
@@ -51,7 +52,7 @@ public:
/** Disconnects from the socket */
void disconnectFromServer();
- ControlMethod::Method getMethod() { return _method; }
+ ControlMethod::Method getMethod() const;
/** Returns the string description of <b>error</b>. */
static QString toString(const QAbstractSocket::SocketError error);
@@ -73,10 +74,10 @@ protected:
bool readLine(QString &line, QString *errmsg = 0);
private:
- QTcpSocket *_tcpSocket; /**< Socket used in the connection */
- QLocalSocket *_localSocket; /**< Socket used in the connection */
+ class SocketWrapper;
+
+ SocketWrapper * _sock; /**< Helper object to convenient use both sockets */
QIODevice *_socket; /**< Abstract pointer to transparently use both sockets */
- ControlMethod::Method _method;
};
#endif
diff --git a/src/torcontrol/RouterDescriptor.cpp b/src/torcontrol/RouterDescriptor.cpp
index 26051c1..0fead9c 100644
--- a/src/torcontrol/RouterDescriptor.cpp
+++ b/src/torcontrol/RouterDescriptor.cpp
@@ -14,6 +14,7 @@
*/
#include "RouterDescriptor.h"
+#include "TorControl.h"
#include <QtGlobal>
@@ -110,3 +111,24 @@ RouterDescriptor::appendRouterStatusInfo(const RouterStatus &rs)
_burstBandwidth = rs.bandwidth();
_observedBandwidth = rs.bandwidth();
}
+
+RouterDescriptor *
+RouterDescriptor::fromTorControl(TorControl *tc)
+{
+ RouterDescriptor *rd = new RouterDescriptor(QStringList(), true);
+
+ if(tc->isConnected()) {
+ rd->_id = tc->getInfo("fingerprint").toString();
+ rd->_name = tc->getConf("Nickname").toString();
+ rd->_ip = QHostAddress(tc->getInfo("address").toString());
+ rd->_orPort = (quint16)tc->getConf("ORPort").toUInt();
+ rd->_dirPort = (quint16)tc->getConf("DirPort").toUInt();
+ rd->_avgBandwidth = (quint64)tc->getConf("BandwidthRate").toLongLong();
+ rd->_burstBandwidth = (quint64)tc->getConf("BandwidthBurst").toLongLong();
+ rd->_observedBandwidth = rd->_avgBandwidth;
+
+ rd->_status = Offline;
+ }
+
+ return rd;
+}
diff --git a/src/torcontrol/RouterDescriptor.h b/src/torcontrol/RouterDescriptor.h
index fdedae4..a43821b 100644
--- a/src/torcontrol/RouterDescriptor.h
+++ b/src/torcontrol/RouterDescriptor.h
@@ -24,6 +24,8 @@
#include "RouterStatus.h"
+class TorControl;
+
class RouterDescriptor
{
Q_DECLARE_TR_FUNCTIONS(RouterDescriptor)
@@ -99,6 +101,9 @@ public:
* descriptor */
void appendRouterStatusInfo(const RouterStatus &rs);
+ /** Creates a RouterDescriptor from the control port information */
+ static RouterDescriptor *fromTorControl(TorControl *tc);
+
private:
/** Parses this router's descriptor for relevant information. */
void parseDescriptor(QStringList descriptor);
diff --git a/src/torcontrol/SendCommandEvent.cpp b/src/torcontrol/SendCommandEvent.cpp
index 71c05df..8ee6c30 100644
--- a/src/torcontrol/SendCommandEvent.cpp
+++ b/src/torcontrol/SendCommandEvent.cpp
@@ -16,8 +16,7 @@
#include "SendCommandEvent.h"
-#include <QMutexLocker>
-
+#include <QCoreApplication>
SendCommandEvent::SendCommandEvent(const ControlCommand &cmd, SendWaiter *w)
: QEvent(QEvent::User)
@@ -30,26 +29,16 @@ SendCommandEvent::SendCommandEvent(const ControlCommand &cmd, SendWaiter *w)
void
SendCommandEvent::SendWaiter::setResult(bool success, const QString &errmsg)
{
- _mutex.lock();
_status = (success ? Success : Failed);
_errmsg = errmsg;
- _mutex.unlock();
- _waitCond.wakeAll();
}
/** Waits for and gets the result of the send operation. */
bool
SendCommandEvent::SendWaiter::getResult(QString *errmsg)
{
- forever {
- _mutex.lock();
- if (_status == Waiting) {
- _waitCond.wait(&_mutex);
- _mutex.unlock();
- } else {
- _mutex.unlock();
- break;
- }
+ while(_status == Waiting) {
+ QCoreApplication::processEvents();
}
if (errmsg) {
*errmsg = _errmsg;
@@ -61,6 +50,5 @@ SendCommandEvent::SendWaiter::getResult(QString *errmsg)
SendCommandEvent::SendWaiter::SenderStatus
SendCommandEvent::SendWaiter::status()
{
- QMutexLocker locker(&_mutex);
return _status;
}
diff --git a/src/torcontrol/Stream.cpp b/src/torcontrol/Stream.cpp
index 7322d48..6f75bc0 100644
--- a/src/torcontrol/Stream.cpp
+++ b/src/torcontrol/Stream.cpp
@@ -88,8 +88,8 @@ Stream::isValidStreamId(const StreamId &streamId)
return false;
for (int i = 0; i < length; i++) {
- char c = streamId[i].toAscii();
- if (c < '0' && c > '9' && c < 'A' && c > 'Z' && c < 'a' && c > 'z')
+ QChar c = streamId[i];
+ if (!c.isLower() and !c.isUpper() and !c.isNumber())
return false;
}
return true;
diff --git a/src/torcontrol/Stream.h b/src/torcontrol/Stream.h
index f688391..8f1dfb0 100644
--- a/src/torcontrol/Stream.h
+++ b/src/torcontrol/Stream.h
@@ -26,6 +26,7 @@
/** Stream IDs contains 1-16 alphanumeric ASCII characters. */
typedef QString StreamId;
+Q_DECLARE_METATYPE(StreamId)
class Stream
diff --git a/src/torcontrol/TorControl.cpp b/src/torcontrol/TorControl.cpp
index dffd7cc..c7bf85d 100644
--- a/src/torcontrol/TorControl.cpp
+++ b/src/torcontrol/TorControl.cpp
@@ -19,14 +19,22 @@
#include "RouterStatus.h"
#include "file.h"
#include "stringutil.h"
+#include "crypto.h"
#include <QHostAddress>
#include <QVariantMap>
+#define SAFECOOKIE_SERVER_TO_CONTROLLER_CONSTANT \
+ "Tor safe cookie authentication server-to-controller hash"
+#define SAFECOOKIE_CONTROLLER_TO_SERVER_CONSTANT \
+ "Tor safe cookie authentication controller-to-server hash"
+#define AUTHENTICATION_COOKIE_LEN 32
+#define DIGEST256_LEN 32
+#define SAFECOOKIE_SERVER_NONCE_LEN DIGEST256_LEN
/** Default constructor */
TorControl::TorControl(ControlMethod::Method method)
-{
+ : QObject(), _shouldContinue(true), _reason(""), _authenticated(false) {
#define RELAY_SIGNAL(src, sig) \
QObject::connect((src), (sig), this, (sig))
@@ -41,7 +49,10 @@ TorControl::TorControl(ControlMethod::Method method)
RELAY_SIGNAL(_eventHandler, SIGNAL(bandwidthUpdate(quint64, quint64)));
RELAY_SIGNAL(_eventHandler, SIGNAL(circuitStatusChanged(Circuit)));
RELAY_SIGNAL(_eventHandler, SIGNAL(streamStatusChanged(Stream)));
+ RELAY_SIGNAL(_eventHandler,
+ SIGNAL(streamBandwidthUpdate(StreamId, quint64, quint64)));
RELAY_SIGNAL(_eventHandler, SIGNAL(newDescriptors(QStringList)));
+ RELAY_SIGNAL(_eventHandler, SIGNAL(newConsensus()));
RELAY_SIGNAL(_eventHandler, SIGNAL(logMessage(tc::Severity, QString)));
RELAY_SIGNAL(_eventHandler, SIGNAL(dangerousPort(quint16, bool)));
RELAY_SIGNAL(_eventHandler, SIGNAL(socksError(tc::SocksError, QString)));
@@ -83,6 +94,12 @@ TorControl::TorControl(ControlMethod::Method method)
QObject::connect(_torProcess, SIGNAL(log(QString, QString)),
this, SLOT(onLogStdout(QString, QString)));
+ QObject::connect(_torProcess, SIGNAL(startFailed(QString)),
+ this, SLOT(torStartFailed(QString)));
+ QObject::connect(_controlConn, SIGNAL(connectFailed(QString)),
+ this, SLOT(torConnectFailed(QString)));
+
+
#if defined(Q_OS_WIN32)
_torService = new TorService(this);
RELAY_SIGNAL(_torService, SIGNAL(started()));
@@ -97,14 +114,11 @@ 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();
}
+ disconnect();
delete _controlConn;
}
@@ -130,15 +144,46 @@ TorControl::start(const QString &tor, const QStringList &args)
}
}
+/** Called when starting the tor process failed */
+void
+TorControl::torStartFailed(QString errmsg)
+{
+ _shouldContinue = false;
+ _reason = tr("Start failed: %1").arg(errmsg);
+}
+
+/** Returns true if the bootstrap should continue. If it returns
+ * false, it also sets the errmsg to the last error */
+bool
+TorControl::shouldContinue(QString *errmsg)
+{
+ if(not errmsg)
+ errmsg = new QString();
+
+ *errmsg = _reason;
+ return _shouldContinue;
+}
+
/** Stop the Tor process. */
bool
TorControl::stop(QString *errmsg)
{
bool rc = false;
- if (_controlConn->isConnected())
- rc = signal(TorSignal::Halt, errmsg);
- if (!rc)
- rc = _torProcess->stop(errmsg);
+
+ if(!errmsg)
+ errmsg = new QString();
+
+ 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;
}
@@ -149,10 +194,26 @@ TorControl::onStopped(int exitCode, QProcess::ExitStatus exitStatus)
if (_controlConn->status() == ControlConnection::Connecting)
_controlConn->cancelConnect();
+ if (exitStatus == QProcess::CrashExit || exitCode != 0) {
+ _shouldContinue = false;
+ _reason = tr("Process finished: ExitCode=%1").arg(exitCode);
+ }
+
emit stopped();
+ disconnect();
emit stopped(exitCode, exitStatus);
}
+/** Returns true if the tor process has finished, along with its exit
+ * code and status */
+bool
+TorControl::finished(int *exitCode, QProcess::ExitStatus *exitStatus)
+{
+ *exitCode = _torProcess->exitCode();
+ *exitStatus = _torProcess->exitStatus();
+ return _torProcess->state() == QProcess::NotRunning;
+}
+
/** Detects if the Tor process is running under Vidalia. Returns true if
* Vidalia owns the Tor process, or false if it was an independent Tor. */
bool
@@ -201,14 +262,24 @@ TorControl::connect(const QString &path)
_controlConn->connect(path);
}
+/** Called when the connection to tor has failed */
+void
+TorControl::torConnectFailed(QString errmsg)
+{
+ _shouldContinue = false;
+ _reason = tr("Connection failed: %1").arg(errmsg);
+}
+
/** Disconnect from Tor's control port */
void
TorControl::disconnect()
{
if (isConnected())
_controlConn->disconnect();
+ _authenticated = false;
}
+/** Emits the proper bootstrapStatusChanged */
void
TorControl::getBootstrapPhase()
{
@@ -249,6 +320,9 @@ TorControl::onDisconnected()
/* Tor isn't running, so it has no version */
_torVersion = QString();
+ _shouldContinue = false;
+ _reason = tr("Disconnected");
+
/* Let interested parties know we lost our control connection */
emit disconnected();
}
@@ -267,6 +341,16 @@ TorControl::isConnected()
bool
TorControl::send(ControlCommand cmd, ControlReply &reply, QString *errmsg)
{
+ if (!_authenticated and (cmd.keyword() != "AUTHCHALLENGE") and
+ (cmd.keyword() != "AUTHENTICATE") and
+ (cmd.keyword() != "PROTOCOLINFO") and
+ (cmd.keyword() != "QUIT")) {
+ if (errmsg)
+ *errmsg = "TorControl not authenticated";
+
+ return false;
+ }
+
if (_controlConn->send(cmd, reply, errmsg)) {
if (reply.getStatus() == "250") {
return true;
@@ -291,15 +375,67 @@ TorControl::send(ControlCommand cmd, QString *errmsg)
* "AUTHENTICATE" SP 1*HEXDIG CRLF
*/
bool
-TorControl::authenticate(const QByteArray cookie, QString *errmsg)
+TorControl::authenticate(const QByteArray cookie, bool safe, QString *errmsg)
{
- ControlCommand cmd("AUTHENTICATE", base16_encode(cookie));
ControlReply reply;
QString str;
+ if (safe) {
+ QByteArray client_nonce = crypto_rand_bytes(DIGEST256_LEN);
+ ControlCommand cmdChallenge("AUTHCHALLENGE", QString("SAFECOOKIE %1").arg(base16_encode(client_nonce)));
- if (!send(cmd, reply, &str)) {
- emit authenticationFailed(str);
- return err(errmsg, str);
+ if (!send(cmdChallenge, reply, &str)) {
+ emit authenticationFailed(str);
+ _shouldContinue = false;
+ _reason = str;
+
+ return err(errmsg, str);
+ }
+
+ QHash<QString, QString> response = string_parse_keyvals(reply.getMessage());
+ QString tmp;
+ tmp.append(cookie);
+ tmp.append(client_nonce);
+ tmp.append(base16_decode(response.value("SERVERNONCE").toAscii()));
+
+ char *client_hash = (char*)malloc(DIGEST256_LEN);
+ char *server_hash = (char*)malloc(DIGEST256_LEN);
+
+ crypto_hmac_sha256(server_hash,
+ SAFECOOKIE_SERVER_TO_CONTROLLER_CONSTANT,
+ strlen(SAFECOOKIE_SERVER_TO_CONTROLLER_CONSTANT),
+ tmp.toAscii().data(),
+ tmp.size());
+
+ if (!QString(server_hash).compare(response.value("SERVERHASH"))) {
+ str = "Server hash was wrong in SAFECOOKIE auth";
+ return err(errmsg, str);
+ }
+
+ crypto_hmac_sha256(client_hash,
+ SAFECOOKIE_CONTROLLER_TO_SERVER_CONSTANT,
+ strlen(SAFECOOKIE_CONTROLLER_TO_SERVER_CONSTANT),
+ tmp.toAscii().data(),
+ tmp.size());
+
+ ControlCommand cmd("AUTHENTICATE", base16_encode(QByteArray(client_hash, DIGEST256_LEN)));
+
+ if (!send(cmd, reply, &str)) {
+ emit authenticationFailed(str);
+ _shouldContinue = false;
+ _reason = str;
+
+ return err(errmsg, str);
+ }
+ } else {
+ ControlCommand cmd("AUTHENTICATE", base16_encode(cookie));
+
+ if (!send(cmd, reply, &str)) {
+ emit authenticationFailed(str);
+ _shouldContinue = false;
+ _reason = str;
+
+ return err(errmsg, str);
+ }
}
onAuthenticated();
return true;
@@ -318,6 +454,9 @@ TorControl::authenticate(const QString &password, QString *errmsg)
if (!send(cmd, reply, &str)) {
emit authenticationFailed(str);
+ _shouldContinue = false;
+ _reason = str;
+
return err(errmsg, str);
}
onAuthenticated();
@@ -328,6 +467,8 @@ TorControl::authenticate(const QString &password, QString *errmsg)
void
TorControl::onAuthenticated()
{
+ _authenticated = true;
+
/* The version of Tor isn't going to change while we're connected to it, so
* save it for later. */
getInfo("version", _torVersion);
@@ -341,6 +482,13 @@ TorControl::onAuthenticated()
emit authenticated();
}
+/** Returns true if the process has passed through auth successfully */
+bool
+TorControl::isAuthenticated()
+{
+ return _authenticated;
+}
+
/** Sends a PROTOCOLINFO command to Tor and parses the response. */
ProtocolInfo
TorControl::protocolInfo(QString *errmsg)
@@ -395,6 +543,7 @@ TorControl::useFeature(const QString &feature, QString *errmsg)
return send(cmd, errmsg);
}
+/** Returns the current BootstrapStatus */
BootstrapStatus
TorControl::bootstrapStatus(QString *errmsg)
{
@@ -715,7 +864,7 @@ TorControl::setEvents(QString *errmsg)
/** Sets each configuration key in <b>map</b> to the value associated
* with its key. */
bool
-TorControl::setConf(QHash<QString,QString> map, QString *errmsg)
+TorControl::setConf(QHash<QString,QString> map, QString *errmsg, ControlReply *reply)
{
ControlCommand cmd("SETCONF");
@@ -735,25 +884,28 @@ TorControl::setConf(QHash<QString,QString> map, QString *errmsg)
cmd.addArgument(key);
}
}
- return send(cmd, errmsg);
+
+ if(not reply)
+ reply = new ControlReply();
+ return send(cmd, *reply, errmsg);
}
/** Sets a single configuration key to the given value. */
bool
-TorControl::setConf(QString key, QString value, QString *errmsg)
+TorControl::setConf(QString key, QString value, QString *errmsg, ControlReply *reply)
{
QHash<QString,QString> map;
map.insert(key, value);
- return setConf(map, errmsg);
+ return setConf(map, errmsg, reply);
}
/** Sets a single configuration string that is formatted <key=escaped value>.*/
bool
-TorControl::setConf(QString keyAndValue, QString *errmsg)
+TorControl::setConf(QString keyAndValue, QString *errmsg, ControlReply *reply)
{
QHash<QString,QString> map;
map.insert(keyAndValue, "");
- return setConf(map, errmsg);
+ return setConf(map, errmsg, reply);
}
/** Gets values for a set of configuration keys, each of which has a single
@@ -889,6 +1041,17 @@ TorControl::getConf(const QString &key, QString *errmsg)
return map.value(key);
}
+/** Loads the contents as if they were read from disk as the torrc */
+bool
+TorControl::loadConf(const QString &contents, QString *errmsg)
+{
+ ControlCommand cmd("+LOADCONF");
+ ControlReply reply;
+
+ cmd.addArgument(contents + ".");
+ return send(cmd, reply, errmsg);
+}
+
/** Sends a GETCONF message to Tor with the single key and returns a QString
* containing the value returned by Tor */
QString
@@ -941,6 +1104,7 @@ TorControl::resetConf(QString key, QString *errmsg)
return resetConf(QStringList() << key, errmsg);
}
+/** Returns true if microdescriptors are used */
bool
TorControl::useMicrodescriptors(QString *errmsg)
{
@@ -962,8 +1126,11 @@ TorControl::useMicrodescriptors(QString *errmsg)
QStringList
TorControl::getRouterDescriptorText(const QString &id, QString *errmsg)
{
- if(useMicrodescriptors(errmsg))
- return getInfo("md/id/" + id, errmsg).toStringList();
+ if(useMicrodescriptors(errmsg)) {
+ QStringList res = getInfo("md/id/" + id, errmsg).toStringList();
+ if(!res.isEmpty())
+ return res;
+ }
return getInfo("desc/id/" + id, errmsg).toStringList();
}
@@ -1109,8 +1276,8 @@ TorControl::closeStream(const StreamId &streamId, QString *errmsg)
return send(cmd, errmsg);
}
- /** Gets a list of address mappings of the type specified by <b>type</b>
- * (defaults to <i>AddressMapAll</i>. */
+/** Gets a list of address mappings of the type specified by <b>type</b>
+ * (defaults to <i>AddressMapAll</i>. */
AddressMap
TorControl::getAddressMap(AddressMap::AddressMapType type, QString *errmsg)
{
@@ -1158,3 +1325,11 @@ TorControl::takeOwnership(QString *errmsg)
ControlCommand cmd("TAKEOWNERSHIP");
return send(cmd, errmsg);
}
+
+/** Clear the error state for shouldContinue(errmsg) */
+void
+TorControl::clearErrState()
+{
+ _shouldContinue = true;
+ _reason = "";
+}
diff --git a/src/torcontrol/TorControl.h b/src/torcontrol/TorControl.h
index 85dcf86..1158bbd 100644
--- a/src/torcontrol/TorControl.h
+++ b/src/torcontrol/TorControl.h
@@ -58,6 +58,7 @@ public:
/** Start the Tor process */
void start(const QString &tor, const QStringList &args);
+
/** Stop the Tor process */
bool stop(QString *errmsg = 0);
/** Detect if the Tor process is running */
@@ -71,14 +72,17 @@ public:
/** Connect to Tor's control socket */
void connect(const QHostAddress &address, quint16 port);
void connect(const QString &path);
+
/** Disconnect from Tor's control socket */
void disconnect();
/** Check if we're connected to Tor's control socket */
bool isConnected();
/** Sends an authentication cookie to Tor. */
- bool authenticate(const QByteArray cookie, QString *errmsg = 0);
+ bool authenticate(const QByteArray cookie, bool safe = true, QString *errmsg = 0);
/** Sends an authentication password to Tor. */
bool authenticate(const QString &password = QString(), QString *errmsg = 0);
+ /** Returns true if the process has passed through auth successfully */
+ bool isAuthenticated();
/** Sends a PROTOCOLINFO command to Tor and parses the response. */
ProtocolInfo protocolInfo(QString *errmsg = 0);
@@ -134,11 +138,11 @@ public:
bool setEvents(QString *errmsg = 0);
/** Sets each configuration key in <b>map</b> to the value associated with its key. */
- bool setConf(QHash<QString,QString> map, QString *errmsg = 0);
+ bool setConf(QHash<QString,QString> map, QString *errmsg = 0, ControlReply *reply = 0);
/** Sets a single configuration key to the given value. */
- bool setConf(QString key, QString value, QString *errmsg = 0);
+ bool setConf(QString key, QString value, QString *errmsg = 0, ControlReply *reply = 0);
/** Sets a single configuration string that is formatted <key=escaped value>. */
- bool setConf(QString keyAndValue, QString *errmsg = 0);
+ bool setConf(QString keyAndValue, QString *errmsg = 0, ControlReply *reply = 0);
/** Gets values for a set of configuration keys, each of which has a single
* value. */
bool getConf(QHash<QString,QString> &map, QString *errmsg = 0);
@@ -157,6 +161,8 @@ public:
* QVariant containing the value returned by Tor. Returns a default
* constructed QVariant on failure. */
QVariant getConf(const QString &key, QString *errmsg = 0);
+ /** Loads the contents as if they were read from disk as the torrc */
+ bool loadConf(const QString &contents, 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);
@@ -214,6 +220,15 @@ public:
/** Takes ownership of the tor process it's communicating to */
bool takeOwnership(QString *errmsg);
+ /** Clear the error state for shouldContinue(errmsg) */
+ void clearErrState();
+ /** Returns true if the bootstrap should continue. If it returns
+ * false, it also sets the errmsg to the last error */
+ bool shouldContinue(QString *errmsg = 0);
+ /** Returns true if the tor process has finished, along with its exit
+ * code and status */
+ bool finished(int *exitCode, QProcess::ExitStatus *exitStatus);
+
public slots:
/** Closes the circuit specified by <b>circId</b>. If <b>ifUnused</b> is
* true, then the circuit will not be closed unless it is unused. */
@@ -262,6 +277,14 @@ signals:
*/
void circuitStatusChanged(const Circuit &circuit);
+ /** Emitted when Tor sends a bandwidth usage update for a stream.
+ * <b>bytesReceived</b> is the number of bytes read on the stream over
+ * the previous second and <b>bytesWritten</b> is the number of bytes
+ * sent over the same interval.
+ */
+ void streamBandwidthUpdate(const StreamId &streamId,
+ quint64 bytesReceived, quint64 bytesSent);
+
/** Emitted when Tor has mapped the address <b>from</b> to the address
* <b>to</b>. <b>expires</b> indicates the time at which when the address
* mapping will no longer be considered valid.
@@ -274,6 +297,9 @@ signals:
*/
void newDescriptors(const QStringList &ids);
+ /** Emitted when Tor has received a new consensus. */
+ void newConsensus();
+
/** Indicates Tor has been able to successfully establish one or more
* circuits.
*/
@@ -394,6 +420,12 @@ private:
TorService* _torService;
#endif
+ bool _shouldContinue;
+ QString _reason;
+
+ /** True when the process has passed through the auth successfully */
+ bool _authenticated;
+
/** 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 */
@@ -410,6 +442,9 @@ private slots:
void onDisconnected();
void onLogStdout(const QString &severity, const QString &message);
void onAuthenticated();
+
+ void torStartFailed(QString errmsg);
+ void torConnectFailed(QString errmsg);
};
#endif
diff --git a/src/torcontrol/TorEvents.cpp b/src/torcontrol/TorEvents.cpp
index fba9c52..8b7c401 100644
--- a/src/torcontrol/TorEvents.cpp
+++ b/src/torcontrol/TorEvents.cpp
@@ -41,6 +41,7 @@ TorEvents::TorEvents(QObject *parent)
qRegisterMetaType<BootstrapStatus>("BootstrapStatus");
qRegisterMetaType<Circuit>("Circuit");
qRegisterMetaType<Stream>("Stream");
+ qRegisterMetaType<StreamId>("StreamId");
qRegisterMetaType<QHostAddress>("QHostAddress");
qRegisterMetaType<QDateTime>("QDateTime");
@@ -65,6 +66,8 @@ TorEvents::toString(Event e)
case GeneralStatus: event = "STATUS_GENERAL"; break;
case ClientStatus: event = "STATUS_CLIENT"; break;
case ServerStatus: event = "STATUS_SERVER"; break;
+ case NewConsensus: event = "NEWCONSENSUS"; break;
+ case StreamBandwidth: event = "STREAM_BW"; break;
default: event = "UNKNOWN"; break;
}
return event;
@@ -101,6 +104,10 @@ TorEvents::toTorEvent(const QString &event)
e = ClientStatus;
} else if (event == "STATUS_SERVER") {
e = ServerStatus;
+ } else if (event == "NEWCONSENSUS") {
+ e = NewConsensus;
+ } else if (event == "STREAM_BW") {
+ e = StreamBandwidth;
} else {
e = Unknown;
}
@@ -128,7 +135,9 @@ TorEvents::handleEvent(const ControlReply &reply)
case Bandwidth: handleBandwidthUpdate(line); break;
case CircuitStatus: handleCircuitStatus(line); break;
case StreamStatus: handleStreamStatus(line); break;
+ case StreamBandwidth:handleStreamBandwidthUpdate(line); break;
case NewDescriptor: handleNewDescriptor(line); break;
+ case NewConsensus: handleNewConsensus(line); break;
case AddressMap: handleAddressMap(line); break;
case GeneralStatus:
@@ -221,6 +230,27 @@ TorEvents::handleStreamStatus(const ReplyLine &line)
}
}
+/** Handle a stream bandwidth update event. The format of this message is:
+ *
+ * "650" SP "STREAM_BW" SP StreamID SP BytesWritten SP BytesRead
+ * BytesWritten = 1*DIGIT
+ * BytesRead = 1*DIGIT
+ */
+void
+TorEvents::handleStreamBandwidthUpdate(const ReplyLine &line)
+{
+ QStringList msg = line.getMessage().split(" ");
+ if (msg.size() >= 4) {
+ StreamId streamId = msg.at(1);
+ quint64 bytesSent = (quint64)msg.at(2).toULongLong();
+ quint64 bytesReceived = (quint64)msg.at(3).toULongLong();
+
+ /* Post the event to each of the interested targets */
+ if (Stream::isValidStreamId(streamId))
+ emit streamBandwidthUpdate(streamId, bytesReceived, bytesSent);
+ }
+}
+
/** Handle a log message event. The format of this message is:
* The syntax is:
*
@@ -254,6 +284,18 @@ TorEvents::handleNewDescriptor(const ReplyLine &line)
emit newDescriptors(descList);
}
+/** Handles a new consensus event. The format for event messages of this type
+ * is:
+ *
+ * "650" SP "NEWCONSENSUS" CRLF (...)
+ */
+void
+TorEvents::handleNewConsensus(const ReplyLine &line)
+{
+ Q_UNUSED(line);
+ emit newConsensus();
+}
+
/** Handles a new or updated address mapping event. The format for event
* messages of this type is:
*
diff --git a/src/torcontrol/TorEvents.h b/src/torcontrol/TorEvents.h
index ccc01e0..4642a7e 100644
--- a/src/torcontrol/TorEvents.h
+++ b/src/torcontrol/TorEvents.h
@@ -25,6 +25,7 @@
class Circuit;
class Stream;
+typedef QString StreamId;
class BootstrapStatus;
class ControlReply;
class ReplyLine;
@@ -41,24 +42,26 @@ class TorEvents : public QObject
public:
/** Asynchronous events sent from Tor to the controller */
enum Event {
- Unknown = 0,
- Bandwidth = (1u << 0),
- LogDebug = (1u << 1),
- LogInfo = (1u << 2),
- LogNotice = (1u << 3),
- LogWarn = (1u << 4),
- LogError = (1u << 5),
- CircuitStatus = (1u << 6),
- StreamStatus = (1u << 7),
- OrConnStatus = (1u << 8),
- NewDescriptor = (1u << 9),
- AddressMap = (1u << 10),
- GeneralStatus = (1u << 11),
- ClientStatus = (1u << 12),
- ServerStatus = (1u << 13)
+ Unknown = 0,
+ Bandwidth = (1u << 0),
+ LogDebug = (1u << 1),
+ LogInfo = (1u << 2),
+ LogNotice = (1u << 3),
+ LogWarn = (1u << 4),
+ LogError = (1u << 5),
+ CircuitStatus = (1u << 6),
+ StreamStatus = (1u << 7),
+ OrConnStatus = (1u << 8),
+ NewDescriptor = (1u << 9),
+ AddressMap = (1u << 10),
+ GeneralStatus = (1u << 11),
+ ClientStatus = (1u << 12),
+ ServerStatus = (1u << 13),
+ NewConsensus = (1u << 14),
+ StreamBandwidth = (1u << 15),
};
static const Event EVENT_MIN = TorEvents::Bandwidth;
- static const Event EVENT_MAX = TorEvents::ServerStatus;
+ static const Event EVENT_MAX = TorEvents::StreamBandwidth;
Q_DECLARE_FLAGS(Events, Event);
/** Default Constructor */
@@ -91,6 +94,14 @@ signals:
*/
void circuitStatusChanged(const Circuit &circuit);
+ /** Emitted when Tor sends a bandwidth usage update for a stream.
+ * <b>bytesReceived</b> is the number of bytes read on the stream over
+ * the previous second and <b>bytesWritten</b> is the number of bytes
+ * sent over the same interval.
+ */
+ void streamBandwidthUpdate(const StreamId &streamId,
+ quint64 bytesReceived, quint64 bytesSent);
+
/** Emitted when Tor has mapped the address <b>from</b> to the address
* <b>to</b>. <b>expires</b> indicates the time at which when the address
* mapping will no longer be considered valid.
@@ -103,6 +114,9 @@ signals:
*/
void newDescriptors(const QStringList &ids);
+ /** Emitted when Tor has received a new consensus. */
+ void newConsensus();
+
/** Indicates Tor has been able to successfully establish one or more
* circuits.
*/
@@ -223,12 +237,16 @@ private:
void handleCircuitStatus(const ReplyLine &line);
/** Handle a stream status event */
void handleStreamStatus(const ReplyLine &line);
+ /** Handle a stream bandwidth event */
+ void handleStreamBandwidthUpdate(const ReplyLine &line);
/** Handle a log message event */
void handleLogMessage(const ReplyLine &line);
/** Handle an OR connection status event. */
void handleOrConnStatus(const ReplyLine &line);
/** Handles a new list of descriptors event. */
void handleNewDescriptor(const ReplyLine &line);
+ /** Handles a new consensus event. */
+ void handleNewConsensus(const ReplyLine &line);
/** Handles a new or updated address map event. */
void handleAddressMap(const ReplyLine &line);
diff --git a/src/torcontrol/TorProcess.cpp b/src/torcontrol/TorProcess.cpp
index 5db0c8a..84dfcb3 100644
--- a/src/torcontrol/TorProcess.cpp
+++ b/src/torcontrol/TorProcess.cpp
@@ -171,11 +171,11 @@ TorProcess::onError(QProcess::ProcessError error)
{
if (error == QProcess::FailedToStart) {
tc::error("The Tor process failed to start: %1").arg(errorString());
- /* Tor didn't start, so let everyone know why. */
- emit startFailed(errorString());
} else {
tc::error("Tor process error: %1").arg(errorString());
}
+ /* Tor didn't start, so let everyone know why. */
+ emit startFailed(errorString());
}
/** Returns the version reported by the Tor executable specified in
diff --git a/src/torcontrol/TorSignal.h b/src/torcontrol/TorSignal.h
index 1ab8978..2858a91 100644
--- a/src/torcontrol/TorSignal.h
+++ b/src/torcontrol/TorSignal.h
@@ -14,7 +14,7 @@
*/
#ifndef _TORSIGNAL_H
-#define _TORSGINAL_H
+#define _TORSIGNAL_H
#include <QString>
diff --git a/src/vidalia/CMakeLists.txt b/src/vidalia/CMakeLists.txt
index 7cc1d20..312191d 100644
--- a/src/vidalia/CMakeLists.txt
+++ b/src/vidalia/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.
##
@@ -17,9 +17,13 @@ include_directories(
${CMAKE_CURRENT_SOURCE_DIR}/about
${CMAKE_CURRENT_SOURCE_DIR}/bwgraph
${CMAKE_CURRENT_SOURCE_DIR}/config
+ ${CMAKE_CURRENT_SOURCE_DIR}/config/torrc
${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
+ ${CMAKE_CURRENT_SOURCE_DIR}/plugin/extensions
${MARBLE_INCLUDE_DIR}
)
@@ -62,7 +66,7 @@ configure_file(
add_subdirectory(i18n)
## About dialog sources
-set(vidalia_SRCS
+set(vidalia_SRCS
about/AboutDialog.cpp
about/LicenseDialog.cpp
)
@@ -80,6 +84,26 @@ 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/TorrcPrototype.cpp
+ plugin/extensions/VidaliaExtensions.cpp
+ plugin/extensions/VidaliaExtensionsInit.cpp
+ plugin/extensions/qtscript_TorControl.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/TorrcPrototype.h
+)
## Configuration dialog sources
set(vidalia_SRCS ${vidalia_SRCS}
@@ -101,14 +125,12 @@ set(vidalia_SRCS ${vidalia_SRCS}
config/PortValidator.cpp
config/ServerPage.cpp
config/ServerSettings.cpp
- config/Service.cpp
- config/ServiceList.cpp
- config/ServicePage.cpp
config/TorrcDialog.cpp
- config/ServiceSettings.cpp
config/TorSettings.cpp
config/VidaliaSettings.cpp
config/VSettings.cpp
+ config/torrc/TorrcParser.cpp
+ config/torrc/Torrc.cpp
)
qt4_wrap_cpp(vidalia_SRCS
config/AbstractTorSettings.h
@@ -127,11 +149,11 @@ qt4_wrap_cpp(vidalia_SRCS
config/PortValidator.h
config/ServerPage.h
config/ServerSettings.h
- config/ServicePage.h
config/TorrcDialog.h
config/TorSettings.h
config/VidaliaSettings.h
config/VSettings.h
+ config/torrc/Torrc.h
)
if (USE_MINIUPNPC)
include_directories(${MINIUPNPC_INCLUDE_DIR})
@@ -147,35 +169,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
+ FirstRunWizard.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
+ FirstRunWizard.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/BridgeUsageDialog.ui
+ config/ConfigDialog.ui
+ config/GeneralPage.ui
+ config/NetworkPage.ui
+ config/ServerPage.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
@@ -204,12 +259,10 @@ qt4_wrap_cpp(vidalia_SRCS
if (USE_MARBLE)
set(vidalia_SRCS ${vidalia_SRCS}
network/TorMapWidget.cpp
- network/TorMapWidgetInputHandler.cpp
network/TorMapWidgetPopupMenu.cpp
)
qt4_wrap_cpp(vidalia_SRCS
network/TorMapWidget.h
- network/TorMapWidgetInputHandler.h
network/TorMapWidgetPopupMenu.h
)
else(USE_MARBLE)
@@ -231,118 +284,43 @@ 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/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
+ log/LogFilter.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
if (APPLE)
## Set the output file name (make it uppercase on OS X)
set(vidalia_BIN Vidalia)
-
+
## Create an OS X application bundle
set(MACOSX_BUNDLE_BUNDLE_NAME Vidalia)
set(MACOSX_BUNDLE_BUNDLE_VERSION ${VERSION})
@@ -356,10 +334,10 @@ if (APPLE)
set(CMAKE_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX}/)
add_executable(${vidalia_BIN} MACOSX_BUNDLE ${vidalia_SRCS})
- ## Specify location of custom Info.plist file
+ ## Specify location of custom Info.plist file
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/MacOSXBundleInfo.plist.in
${CMAKE_CURRENT_BINARY_DIR}/MacOSXBundleInfo.plist)
- set_target_properties(${vidalia_BIN} PROPERTIES MACOSX_BUNDLE_INFO_PLIST
+ set_target_properties(${vidalia_BIN} PROPERTIES MACOSX_BUNDLE_INFO_PLIST
${CMAKE_CURRENT_BINARY_DIR}/MacOSXBundleInfo.plist)
## Get the location of the app bundle for the current configuration
@@ -374,7 +352,7 @@ if (APPLE)
COMMAND ${CMAKE_COMMAND}
ARGS -E make_directory ${MACOSX_BUNDLE_DIRECTORY}/share/tor
COMMAND cp
- ARGS ${CMAKE_CURRENT_SOURCE_DIR}/res/icons/*.icns
+ ARGS ${CMAKE_CURRENT_SOURCE_DIR}/res/icons/*.icns
${MACOSX_BUNDLE_DIRECTORY}/Contents/Resources/
)
@@ -389,7 +367,7 @@ if (APPLE)
COMMAND ${CMAKE_COMMAND}
ARGS -E make_directory ${outdir}
COMMAND ${CMAKE_COMMAND}
- ARGS -E copy_if_different
+ ARGS -E copy_if_different
${MARBLE_DATA_DIR}/${it} ${outdir}/${outfile}
)
endforeach(it)
@@ -398,7 +376,7 @@ if (APPLE)
if (MARBLE_PLUGINS)
add_custom_command(TARGET ${vidalia_BIN} POST_BUILD
COMMAND ${CMAKE_COMMAND}
- ARGS -E make_directory
+ ARGS -E make_directory
${MACOSX_BUNDLE_DIRECTORY}/Contents/Resources/plugins
)
foreach(it ${MARBLE_PLUGINS})
@@ -429,7 +407,7 @@ else(APPLE)
COMMAND ${CMAKE_COMMAND}
ARGS -E make_directory ${CMAKE_CURRENT_BINARY_DIR}/${outdir}
COMMAND ${CMAKE_COMMAND}
- ARGS -E copy_if_different ${MARBLE_DATA_DIR}/${it}
+ ARGS -E copy_if_different ${MARBLE_DATA_DIR}/${it}
${CMAKE_CURRENT_BINARY_DIR}/data/${it}
)
endforeach(it)
@@ -443,7 +421,7 @@ else(APPLE)
foreach(it ${MARBLE_PLUGINS})
add_custom_command(TARGET ${vidalia_BIN} POST_BUILD
COMMAND ${CMAKE_COMMAND}
- ARGS -E copy_if_different ${it}
+ ARGS -E copy_if_different ${it}
${CMAKE_CURRENT_BINARY_DIR}/plugins/marble/
)
endforeach(it)
diff --git a/src/vidalia/ControlPasswordInputDialog.cpp b/src/vidalia/ControlPasswordInputDialog.cpp
index fdce4b7..efa4934 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 00aa9c8..584806a 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/FirstRunWizard.cpp b/src/vidalia/FirstRunWizard.cpp
new file mode 100644
index 0000000..5e59d7a
--- /dev/null
+++ b/src/vidalia/FirstRunWizard.cpp
@@ -0,0 +1,151 @@
+/*
+** 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 FirstRunWizard.cpp
+** \brief Wizard for the first time Vidalia is executed under certain circumstances
+*/
+
+#include "FirstRunWizard.h"
+#include "MainWindow.h"
+#include "AdvancedPage.h"
+#include "NetworkPage.h"
+#include "VMessageBox.h"
+
+#include <QtGui>
+
+FirstRunWizard::FirstRunWizard(QWidget *parent, bool withPanic, bool withNetwork)
+ : _withPanic(withPanic), _withNetwork(withNetwork), QWizard(parent),
+ _panicPage(0), _ap(0), _networkPage(0), _np(0)
+{
+ createPages();
+}
+
+FirstRunWizard::~FirstRunWizard()
+{
+ if(_ap) delete _ap;
+ if(_np) delete _np;
+}
+
+void
+FirstRunWizard::handleNext()
+{
+ QString errmsg;
+
+ switch(currentId()) {
+ case IntroPageID:
+ case PanicPageID:
+ next();
+ break;
+ case NetworkPageID:
+ if(_ap->save(errmsg)) {
+ next();
+ } else {
+ VMessageBox::warning(0, tr("There was a problem saving your Panic settings"),
+ tr("Error: %1").arg(errmsg),
+ VMessageBox::Ok|VMessageBox::Default);
+ }
+ case DonePageID:
+ if(_np->save(errmsg) and _np->apply(errmsg)) {
+ next();
+ } else {
+ back();
+ VMessageBox::warning(0, tr("There was a problem saving your network settings"),
+ tr("Error: %1").arg(errmsg),
+ VMessageBox::Ok|VMessageBox::Default);
+ }
+ }
+}
+
+void
+FirstRunWizard::createPages()
+{
+ QPushButton *bt = new QPushButton("Continue");
+ setButton(QWizard::NextButton, bt);
+ disconnect(bt, 0, 0, 0);
+ connect(bt, SIGNAL(clicked()),
+ this, SLOT(handleNext()));
+
+ _introPage = new QWizardPage;
+ _introPage->setTitle(tr("Welcome to Vidalia"));
+
+ QLabel *label = new QLabel(tr("Welcome to Vidalia, the Tor Controller. "
+ "This wizard will guide you through the first "
+ "run configuration, please <b>read the directions "
+ "carefully.</b>"));
+ label->setWordWrap(true);
+
+ QVBoxLayout *layout = new QVBoxLayout;
+ layout->addWidget(label);
+ _introPage->setLayout(layout);
+
+ setPage(IntroPageID, _introPage);
+
+ _panicPage = new QWizardPage;
+ _panicPage->setTitle(tr("Panic! configuration"));
+ label = new QLabel(tr("You have the Panic! button enabled. This "
+ "means that you will have a button on the "
+ "main toolbar that will allow you to remove "
+ "Vidalia and all its components quickly.\n"
+ "<b>WARNING:</b> This will also remove your "
+ "bookmarks and everything you save inside "
+ "the configured path.\n\n"
+ "If you would like to disable this feature, "
+ "please uncheck where it says \"Enable panic\" and "
+ "click \"%1\"").arg(buttonText(QWizard::NextButton)));
+ label->setWordWrap(true);
+
+ _ap = new AdvancedPage();
+ _ap->hideGroup(AdvancedPage::Control);
+ _ap->hideGroup(AdvancedPage::ConfigurationFile);
+ _ap->hideGroup(AdvancedPage::DataDirectory);
+ _ap->load();
+
+ layout = new QVBoxLayout;
+ layout->addWidget(label);
+ layout->addWidget(_ap);
+ _panicPage->setLayout(layout);
+
+ if(_withPanic)
+ setPage(PanicPageID, _panicPage);
+
+ _networkPage = new QWizardPage;
+ _networkPage->setTitle(tr("Network configuration"));
+ label = new QLabel(tr("You should configure your network now. Please "
+ "provide the bridges to use or uncheck the option.\n\n"
+ "If you would like to change these settings, "
+ "please edit the values and click \"%1\"")
+ .arg(buttonText(QWizard::NextButton)));
+ label->setWordWrap(true);
+
+ _np = new NetworkPage();
+ _np->load();
+
+ layout = new QVBoxLayout;
+ layout->addWidget(label);
+ layout->addWidget(_np);
+ _networkPage->setLayout(layout);
+
+ if(_withNetwork)
+ setPage(NetworkPageID, _networkPage);
+
+ _donePage = new QWizardPage;
+ _donePage->setTitle(tr("That's it!"));
+
+ label = new QLabel(tr("We hope you enjoy using Tor! Consider becoming a Relay, "
+ "read more here: https://torproject.org/relay"));
+ label->setWordWrap(true);
+
+ layout = new QVBoxLayout;
+ layout->addWidget(label);
+ _donePage->setLayout(layout);
+
+ setPage(DonePageID, _donePage);
+}
diff --git a/src/vidalia/FirstRunWizard.h b/src/vidalia/FirstRunWizard.h
new file mode 100644
index 0000000..437fff8
--- /dev/null
+++ b/src/vidalia/FirstRunWizard.h
@@ -0,0 +1,66 @@
+/*
+** 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 FirstRunWizard.cpp
+** \brief Wizard for the first time Vidalia is executed under certain circumstances
+*/
+
+#ifndef FIRSTRUNWIZARD_H
+#define FIRSTRUNWIZARD_H
+
+class QWizardPage;
+class MainWindow;
+class AdvancedPage;
+class NetworkPage;
+
+#include <QWizard>
+
+class FirstRunWizard : public QWizard
+{
+ Q_OBJECT
+
+ public:
+ /** Default constructor */
+ FirstRunWizard(QWidget *parent = 0,
+ bool withPanic = false,
+ bool withNetwork = false);
+ /** Default destructor */
+ virtual ~FirstRunWizard();
+
+ public slots:
+ /** Slot that handles the transition between pages */
+ void handleNext();
+
+ private:
+ /** Ids for the pages */
+ enum IDs {
+ IntroPageID = 0,
+ PanicPageID,
+ NetworkPageID,
+ DonePageID
+ };
+
+ /** Wizard pages */
+ QWizardPage *_introPage, *_panicPage;
+ QWizardPage *_networkPage, *_donePage;
+ QPushButton *_btnNext;
+ /** Boolean values that identify the pages to display */
+ bool _withPanic, _withNetwork;
+
+ /** Configuration pages that will be used in the wizard */
+ AdvancedPage *_ap;
+ NetworkPage *_np;
+
+ /** Called at the beginning. It creates the whole wizard */
+ void createPages();
+};
+
+#endif
diff --git a/src/vidalia/LanguageSupport.cpp b/src/vidalia/LanguageSupport.cpp
index 64cb9c7..08b814f 100644
--- a/src/vidalia/LanguageSupport.cpp
+++ b/src/vidalia/LanguageSupport.cpp
@@ -29,61 +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("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",
- QString::fromUtf8("catal\303\240"));
+// 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",
- QString::fromUtf8("\316\225\316\273\316\273\316\267\316\275\316\271\316\272\316\254"));
- languages.insert("eu", "Basque");
- // 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("hr_HR", "Croatian");
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",
- QString::fromUtf8("\355\225\234\352\265\255\354\226\264"));
+ 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", "Serbian");
- // 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 85bc62e..e3cacb0 100644
--- a/src/vidalia/MainWindow.cpp
+++ b/src/vidalia/MainWindow.cpp
@@ -19,10 +19,14 @@
#include "MainWindow.h"
#include "Vidalia.h"
-#include "VMessageBox.h"
#include "ControlPasswordInputDialog.h"
+#include "VMessageBox.h"
#include "TorSettings.h"
#include "ServerSettings.h"
+#include "NetworkSettings.h"
+#include "AboutDialog.h"
+#include "HelpBrowser.h"
+#include "VAttachButton.h"
#ifdef USE_AUTOUPDATE
#include "UpdatesAvailableDialog.h"
#endif
@@ -35,9 +39,12 @@
#include "stringutil.h"
#include "procutil.h"
-#include <QMenuBar>
-#include <QTimer>
-#include <QTextStream>
+#include "PluginWrapper.h"
+#include "DebugDialog.h"
+
+#include "FirstRunWizard.h"
+
+#include <QtGui>
#ifdef Q_WS_MAC
#include <Carbon/Carbon.h>
@@ -101,414 +108,183 @@ void qt_mac_set_dock_menu(QMenu *menu);
MainWindow::MainWindow()
: VidaliaWindow("MainWindow")
{
- VidaliaSettings settings;
+ _pressedStop = false;
- ui.setupUi(this);
+ _startedWithPrevious = false;
+
+ /* Create a new TorControl object, used to communicate with Tor */
+ _torControl = Vidalia::torControl();
- _warnTimer = new QTimer();
+ _engine = new PluginEngine();
+ _engine->provide("VidaliaMainWindow", this);
+ _engine->loadAllPlugins();
- /* 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()));
+ _dummy = new QAction(tr("No dettached tabs"), this);
- /* 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()));
+ 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();
- connect(_torControl, SIGNAL(started()), this, SLOT(started()));
- connect(_torControl, SIGNAL(startFailed(QString)),
- this, SLOT(startFailed(QString)));
- connect(_torControl, SIGNAL(stopped(int, QProcess::ExitStatus)),
- this, SLOT(stopped(int, QProcess::ExitStatus)));
- connect(_torControl, SIGNAL(connected()), this, SLOT(connected()));
- connect(_torControl, SIGNAL(disconnected()), this, SLOT(disconnected()));
- connect(_torControl, SIGNAL(connectFailed(QString)),
- this, SLOT(connectFailed(QString)));
- connect(_torControl, SIGNAL(authenticated()), this, SLOT(authenticated()));
- connect(_torControl, SIGNAL(authenticationFailed(QString)),
- this, SLOT(authenticationFailed(QString)));
-
- _torControl->setEvent(TorEvents::GeneralStatus);
- connect(_torControl, SIGNAL(dangerousTorVersion(tc::TorVersionStatus,
- QString, QStringList)),
- this, SLOT(dangerousTorVersion(tc::TorVersionStatus,
- QString, QStringList)));
-
- _torControl->setEvent(TorEvents::ClientStatus);
- connect(_torControl, SIGNAL(bootstrapStatusChanged(BootstrapStatus)),
- this, SLOT(bootstrapStatusChanged(BootstrapStatus)));
- connect(_torControl, SIGNAL(circuitEstablished()),
- this, SLOT(circuitEstablished()));
- connect(_torControl, SIGNAL(dangerousPort(quint16, bool)),
- this, SLOT(warnDangerousPort(quint16, bool)));
- connect(_torControl, SIGNAL(logMessage(tc::Severity, QString)),
- this, SLOT(log(tc::Severity, QString)));
-
- /* 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(_warnTimer, SIGNAL(timeout()), this, SLOT(warnButton()));
-
-#if defined(USE_AUTOUPDATE)
- /* Create a timer used to remind us to check for software updates */
- connect(&_updateTimer, SIGNAL(timeout()), this, SLOT(checkForUpdates()));
-
- /* Also check for updates in the foreground when the user clicks the
- * "Check Now" button in the config dialog. */
- connect(_configDialog, SIGNAL(checkForUpdates()),
- this, SLOT(checkForUpdatesWithUi()));
-
- /* The rest of these slots are called as the update process executes. */
- connect(&_updateProcess, SIGNAL(downloadProgress(QString,int,int)),
- &_updateProgressDialog, SLOT(setDownloadProgress(QString,int,int)));
- connect(&_updateProcess, SIGNAL(updatesAvailable(UpdateProcess::BundleInfo,PackageList)),
- this, SLOT(updatesAvailable(UpdateProcess::BundleInfo,PackageList)));
- connect(&_updateProcess, SIGNAL(updatesInstalled(int)),
- this, SLOT(updatesInstalled(int)));
- connect(&_updateProcess, SIGNAL(installUpdatesFailed(QString)),
- this, SLOT(installUpdatesFailed(QString)));
- connect(&_updateProgressDialog, SIGNAL(cancelUpdate()),
- &_updateProcess, SLOT(cancel()));
-#endif
-
-#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();
+ VidaliaSettings settings;
#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);
+ ProcessSerialNumber psn = { 0, kCurrentProcess };
+ TransformProcessType(&psn, kProcessTransformToForegroundApplication);
}
/* Vidalia launched in background (LSUIElement=true). Bring to foreground. */
- VidaliaWindow::setVisible(true);
+ VidaliaWindow::setVisible(settings.showMainWindowAtStart());
#endif
- _flashToggle = false;
-}
+ TorSettings tor_settings(_torControl);
-/** Destructor. */
-MainWindow::~MainWindow()
-{
- _trayIcon.hide();
- delete _messageLog;
- delete _bandwidthGraph;
- delete _netViewer;
- delete _configDialog;
-}
+ if(settings.firstRun()) {
+ if(tor_settings.getDisableNetwork() or settings.allowPanic()) {
+ _wizard = new FirstRunWizard(this, settings.allowPanic(), tor_settings.getDisableNetwork());
+ _wizard->show();
+ connect(_wizard, SIGNAL(accepted()),
+ this, SLOT(enableNetwork()));
-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. */
- ui.chkShowOnStartup->hide();
- ui.btnHide->hide();
- /* Causes window to not appear in Enlightenment. */
- //setMinimumHeight(height()-ui.btnHide->height());
- //setMaximumHeight(height()-ui.btnHide->height());
+ settings.setFirstRun(false);
}
}
- VidaliaWindow::setVisible(visible);
}
-void
-MainWindow::retranslateUi()
+/** Destructor */
+MainWindow::~MainWindow()
{
- 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
+ delete _engine;
}
-/** Called when the application has started and the main event loop is
- * running. */
+/** Called when the user has finished the first run wizard */
void
-MainWindow::running()
+MainWindow::enableNetwork()
{
- VidaliaSettings settings;
-
- if (vApp->readPasswordFromStdin()) {
- QTextStream in(stdin);
- in >> _controlPassword;
- _useSavedPassword = false;
- } else {
- /* Initialize _useSavedPassword to true. If Tor is already running when
- * Vidalia starts, then there is no point in generating a random password.
- * If Tor is not already running, then this will be set according to the
- * current configuration in the start() method.
- */
- _useSavedPassword = true;
- }
-
- if (settings.runTorAtStart()) {
- /* If we're supposed to start Tor when Vidalia starts, then do it now */
- start();
- }
-
- /* Start the proxy server, if configured */
- if (settings.runProxyAtStart())
- startProxy();
-
-#if defined(USE_AUTOUPDATE)
- if (settings.isAutoUpdateEnabled()) {
- QDateTime lastCheckedAt = settings.lastCheckedForUpdates();
- if (UpdateProcess::shouldCheckForUpdates(lastCheckedAt)) {
- if (settings.runTorAtStart() && ! _torControl->isCircuitEstablished()) {
- /* We started Tor but it hasn't bootstrapped yet, so give it a bit
- * before we decide to check for updates. If Tor manages to build a
- * circuit before this timer times out, we will stop the timer and
- * launch a check for updates immediately. (see circuitEstablished()).
- */
- _updateTimer.start(5*60*1000);
- } else {
- /* Initiate a background check for updates now */
- checkForUpdates();
- }
- } else {
- /* Schedule the next time to check for updates */
- QDateTime nextCheckAt = UpdateProcess::nextCheckForUpdates(lastCheckedAt);
- QDateTime now = QDateTime::currentDateTime().toUTC();
-
- vInfo("Last checked for software updates at %1. Will check again at %2.")
- .arg(lastCheckedAt.toLocalTime().toString("dd-MM-yyyy hh:mm:ss"))
- .arg(nextCheckAt.toLocalTime().toString("dd-MM-yyyy hh:mm:ss"));
- _updateTimer.start((nextCheckAt.toTime_t() - now.toTime_t()) * 1000);
- }
- }
-#endif
+ quint32 torVersion = Vidalia::torControl()->getTorVersion();
+ if (torVersion < 0x00020309)
+ return;
+ TorSettings tor_settings(_torControl);
+ tor_settings.setDisableNetwork(false);
+ QString errmsg;
+ if(not tor_settings.apply(&errmsg))
+ VMessageBox::warning(this, tr("Error finishing apply of first run settings"),
+ tr("Error: %1").arg(errmsg),
+ VMessageBox::Ok|VMessageBox::Default);
}
-/** Terminate the Tor process if it is being run under Vidalia, disconnect all
- * TorControl signals, and exit Vidalia. */
+
+/** Calls the different methods that will handle the GUI "creation".
+ * It's called once at the MainWindow creation. */
void
-MainWindow::aboutToQuit()
+MainWindow::createGUI()
{
- vNotice("Cleaning up before exiting.");
-
- if (_torControl->isVidaliaRunningTor()) {
- /* Kill our Tor process now */
- _torControl->stop();
- }
-
- /* Disable port forwarding */
- 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);
-
- /* 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
+ ui.setupUi(this);
+ createActions();
+ createMenuBar();
+ createToolBar();
+ createTrayIcon();
- if (_imProcess->state() == QProcess::Running)
- _imProcess->terminate();
- }
+ // 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());
- /* Disconnect all of the TorControl object's signals */
- QObject::disconnect(_torControl, 0, 0, 0);
+ addTab(&_statusTab);
+ ui.tabWidget->pinTab(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. */
+/** Creates the actions used in toolbars and menu */
void
-MainWindow::close()
+MainWindow::createActions()
{
- 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. */
+ _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 Circuit"), 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);
+ _actionPanic = new QAction(QIcon(IMG_EXIT), tr("Panic!"), this);
+ _actionHide = new QAction(tr("Hide"), this);
+ if (QSystemTrayIcon::isSystemTrayAvailable()) {
+ _actionHide->setShortcut(QKeySequence(tr("Ctrl+W")));
+ }
+}
+
+/** Creates the menu bar */
void
-MainWindow::createActions()
+MainWindow::createMenuBar()
{
- _actionStartStopTor = new QAction(tr("Start Tor"), this);
- connect(_actionStartStopTor, SIGNAL(triggered()), this, SLOT(start()));
+ _reattachMenu.setTitle(tr("Reattach tabs"));
- _actionExit = new QAction(tr("Exit"), this);
- connect(_actionExit, SIGNAL(triggered()), this, SLOT(close()));
+ QMenuBar *menu = menuBar();
+ menu->clear();
- _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()));
- connect(ui.lblMessageLog, SIGNAL(clicked()),
- _warnTimer, SLOT(stop()));
- connect(ui.lblMessageLog, SIGNAL(clicked()),
- ui.lblMessageLog, SLOT(disableFlashing()));
-
- _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()));
+ 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(_actionHide);
+ torMenu->addAction(_actionExit);
- _actionShowConfig = new QAction(tr("Settings"), this);
- connect(_actionShowConfig, SIGNAL(triggered()), this, SLOT(showConfigDialog()));
+ QMenu *actionsMenu = menu->addMenu(tr("Actions"));
+ actionsMenu->addAction(_actionNewIdentity);
- _actionShowAbout = new QAction(tr("About"), this);
- connect(_actionShowAbout, SIGNAL(triggered()), this, SLOT(showAboutDialog()));
+ QMenu *viewMenu = menu->addMenu(tr("View"));
+ viewMenu->addAction(_actionStatus);
+ viewMenu->addAction(_actionNetworkMap);
+ viewMenu->addAction(_actionMessageLog);
+ viewMenu->addAction(_actionBandwidthGraph);
+ viewMenu->addSeparator();
+ viewMenu->addAction(_actionConfigure);
- _actionShowHelp = new QAction(tr("Help"), this);
- connect(_actionShowHelp, SIGNAL(triggered()), this, SLOT(showHelpDialog()));
- connect(ui.lblHelpBrowser, SIGNAL(clicked()), this, SLOT(showHelpDialog()));
+ QMenu *pluginsMenu = menu->addMenu(tr("Plugins"));
+ foreach(QAction *action, _engine->getAllActions()) {
+ pluginsMenu->addAction(action);
+ }
+ pluginsMenu->addSeparator();
+ pluginsMenu->addAction(_actionDebugDialog);
- _actionNewIdentity = new QAction(tr("New Identity"), this);
- _actionNewIdentity->setEnabled(false);
- connect(_actionNewIdentity, SIGNAL(triggered()), this, SLOT(newIdentity()));
+ menu->addMenu(&_reattachMenu);
+ _reattachMenu.addAction(_dummy);
+ _dummy->setEnabled(false);
-#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
+ QMenu *helpMenu = menu->addMenu(tr("Help"));
+ helpMenu->addAction(_actionVidaliaHelp);
+ helpMenu->addSeparator();
+ helpMenu->addAction(_actionAbout);
}
-/** 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. */
+/** Creates the main toolbar */
void
-MainWindow::createTrayIcon()
+MainWindow::createToolBar()
{
- QMenu *menu = createTrayMenu();
+ QToolBar *tool = ui.toolBar;
- /* Add the menu it to the tray icon */
- _trayIcon.setContextMenu(menu);
+ tool->addAction(_actionStartStopTor);
+ tool->addAction(_actionNewIdentity);
+ tool->addAction(_actionConfigure);
- connect(&_trayIcon, SIGNAL(activated(QSystemTrayIcon::ActivationReason)),
- this, SLOT(trayIconActivated(QSystemTrayIcon::ActivationReason)));
+ VidaliaSettings settings;
+ if(settings.allowPanic())
+ tool->addAction(_actionPanic);
-#if defined(Q_WS_MAC)
- createMenuBar();
- qt_mac_set_dock_menu(menu);
-#endif
+ tool->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
}
/** Creates a QMenu object that contains QActions which compose the system
@@ -519,94 +295,93 @@ MainWindow::createTrayMenu()
QMenu *menu = new QMenu(this);
menu->addAction(_actionStartStopTor);
menu->addSeparator();
- menu->addAction(_actionShowBandwidth);
- menu->addAction(_actionShowMessageLog);
- menu->addAction(_actionShowNetworkMap);
+ menu->addAction(_actionBandwidthGraph);
+ menu->addAction(_actionMessageLog);
+ menu->addAction(_actionNetworkMap);
menu->addAction(_actionNewIdentity);
menu->addSeparator();
menu->addAction(_actionShowControlPanel);
+ VidaliaSettings settings;
+ if(settings.allowPanic()) {
+ menu->addSeparator();
+ menu->addAction(_actionPanic);
+ }
+
+ 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(_actionShowConfig);
- menu->addAction(_actionShowHelp);
- menu->addAction(_actionShowAbout);
+ menu->addAction(_actionConfigure);
+ menu->addAction(_actionVidaliaHelp);
+ menu->addAction(_actionAbout);
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. */
+/** Called when tor detects a problem with the system clock */
void
-MainWindow::createMenuBar()
+MainWindow::clockSkewed(int skew, const QString &source)
{
-#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);
+ 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;
+ }
- 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
+ _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."));
}
-/** Sets the current tray or dock icon image to <b>iconFile</b>. */
+
+/** 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::setTrayIcon(const QString &iconFile)
+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)
- 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));
+ 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
@@ -615,452 +390,268 @@ void
MainWindow::trayIconActivated(QSystemTrayIcon::ActivationReason reason)
{
if (reason == QSystemTrayIcon::DoubleClick)
- setVisible(true);
+ setVisible(!isVisible());
}
-/** Start a web browser when given the directory containing the executable and profile */
void
-MainWindow::launchBrowserFromDirectory()
+MainWindow::retranslateUi()
{
- VidaliaSettings settings;
+ updateTorStatus(_status);
- /** Directory for the browser */
- QString browserDirectory = settings.getBrowserDirectory();
- if(QDir(browserDirectory).isRelative())
- browserDirectory = QDir(QDir::toNativeSeparators(QCoreApplication::applicationDirPath()
- + "/" + browserDirectory)).canonicalPath();
+ _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 Circuit"));
+ _actionPanic->setText(tr("Panic!"));
+
+#if !defined(Q_WS_MAC)
+ _actionAbout->setText(tr("About"));
+ _actionConfigure->setText(tr("Settings"));
+ _actionExit->setText(tr("Exit"));
+#endif
+
+ createMenuBar();
+ ui.retranslateUi(this);
+}
- /** Relative path to the browser executable from the browserDirectory */
- QString browserExecutable = QDir::toNativeSeparators(browserDirectory + "/" + settings.getBrowserExecutable());
+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()));
- /** Relative path to profile from the browserDirectory */
- QString profileDirectory = QDir::toNativeSeparators(settings.getProfileDirectory());
- /** Default profile to copy from */
- QString defaultProfileDirectory = QDir::toNativeSeparators(settings.getDefaultProfileDirectory());
+ 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()));
- /** Relative path to the plugins directory from the browserDirectory */
- QString pluginsDirectory = QDir::toNativeSeparators(settings.getPluginsDirectory());
- /** Relative path to the default plugins directory from the browserDirectory */
- QString defaultPluginsDirectory = QDir::toNativeSeparators(settings.getDefaultPluginsDirectory());
+ connect(_actionDebugDialog, SIGNAL(triggered()), this, SLOT(showDebugDialog()));
- QString profileDir = QDir(browserDirectory + "/" + profileDirectory).canonicalPath();
+ connect(_actionPanic, SIGNAL(triggered()), this, SLOT(panic()));
- _browserProcess->setEnvironment(updateBrowserEnv());
+ connect(_actionHide, SIGNAL(triggered()), this, SLOT(hide()));
- QDir browserDirObj = QDir(browserDirectory);
+ /* Catch signals when the application is running or shutting down */
+ connect(vApp, SIGNAL(running()), this, SLOT(running()));
+ connect(vApp, SIGNAL(aboutToQuit()), this, SLOT(aboutToQuit()));
- /* Copy the profile directory if it's not already there */
- if (!browserDirObj.exists(profileDirectory)) {
- browserDirObj.mkdir(profileDirectory);
- copy_dir(QDir(browserDirectory + "/" + defaultProfileDirectory).canonicalPath(),
- QDir(browserDirectory + "/" + profileDirectory).canonicalPath());
- }
+ connect(_torControl, SIGNAL(clockSkewed(int, QString)),
+ this, SLOT(clockSkewed(int, QString)));
- /* Copy the pluginss directory if it's not already there */
- if (!browserDirObj.exists(pluginsDirectory)) {
- browserDirObj.mkdir(pluginsDirectory);
- copy_dir(QDir(browserDirectory + "/" + defaultPluginsDirectory).canonicalPath(),
- QDir(browserDirectory + "/" + pluginsDirectory).canonicalPath());
- }
+ _torControl->setEvent(TorEvents::GeneralStatus);
+ connect(_torControl, SIGNAL(dangerousTorVersion(tc::TorVersionStatus,
+ QString, QStringList)),
+ this, SLOT(dangerousTorVersion(tc::TorVersionStatus,
+ QString, QStringList)));
+
+ _torControl->setEvent(TorEvents::ClientStatus);
+ connect(_torControl, SIGNAL(bootstrapStatusChanged(BootstrapStatus)),
+ this, SLOT(bootstrapStatusChanged(BootstrapStatus)));
+ connect(_torControl, SIGNAL(dangerousPort(quint16, bool)),
+ this, SLOT(warnDangerousPort(quint16, bool)));
+
+ 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 */
+ connect(&_updateTimer, SIGNAL(timeout()), this, SLOT(checkForUpdates()));
+
+ /* Also check for updates in the foreground when the user clicks the
+ * "check Now" button in the config dialog. */
+ connect(_configDialog, SIGNAL(checkForUpdates()),
+ this, SLOT(checkForUpdatesWithUi()));
+
+ /* The rest of these slots are called as the update process executes. */
+ connect(&_updateProcess, SIGNAL(downloadProgress(QString,int,int)),
+ &_updateProgressDialog, SLOT(setDownloadProgress(QString,int,int)));
+ connect(&_updateProcess, SIGNAL(updatesAvailable(UpdateProcess::BundleInfo,PackageList)),
+ this, SLOT(updatesAvailable(UpdateProcess::BundleInfo,PackageList)));
+ connect(&_updateProcess, SIGNAL(updatesInstalled(int)),
+ this, SLOT(updatesInstalled(int)));
+ connect(&_updateProcess, SIGNAL(installUpdatesFailed(QString)),
+ this, SLOT(installUpdatesFailed(QString)));
+ connect(&_updateProgressDialog, SIGNAL(cancelUpdate()),
+ &_updateProcess, SLOT(cancel()));
+#endif
- /* Build the command line arguments */
- QStringList commandLine;
- // Is this better or worse than MOZ_NO_REMOTE?
- commandLine << "-no-remote";
- commandLine << "-profile";
- commandLine << profileDir;
+#if defined(USE_MINIUPNPC)
+ /* Catch UPnP-related signals */
+ connect(UPNPControl::instance(), SIGNAL(error(UPNPControl::UPNPError)),
+ this, SLOT(upnpError(UPNPControl::UPNPError)));
+#endif
- /* Launch the browser */
- if(!_browserProcess->state() != QProcess::NotRunning)
- _browserProcess->start(browserExecutable, commandLine);
- _browserProcess->toForeground();
+ connect(_engine, SIGNAL(pluginTab(VidaliaTab *)),
+ this, SLOT(addTab(VidaliaTab *)));
}
-/** Starts the web browser and IM client, if appropriately configured */
+/* Sets window title to "Nickname ORPort" if running as relay */
void
-MainWindow::startSubprocesses()
+MainWindow::updateTitle()
{
- 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();
- }
+ ServerSettings settings(_torControl);
- /* Launch the IM client */
- subprocess = settings.getIMExecutable();
+ QString baseTitle = tr("Vidalia Control Panel");
- if (!subprocess.isEmpty())
- _imProcess->start(subprocess, QStringList());
+ if (settings.isServerEnabled()) {
+ QString Nickname = settings.getNickname();
+ QString ORPort = QString::number(settings.getORPort());
+ setWindowTitle(QString("%1 - %2 %3").arg(baseTitle)
+ .arg(Nickname)
+ .arg(ORPort));
+ } else {
+ setWindowTitle(baseTitle);
+ }
}
-/** Called when browser or IM client have exited */
+/** 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::onSubprocessFinished(int exitCode, QProcess::ExitStatus exitStatus)
+MainWindow::close()
{
- Q_UNUSED(exitCode)
- Q_UNUSED(exitStatus)
+ _pressedStop = true;
+ QCoreApplication::processEvents();
- /* 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);
+ 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()) {
+ if(!stop())
+ return;
}
}
+ vApp->quit();
}
-/** Called periodically to check if the browser is running. If it is not,
- * exit Vidalia cleanly */
+/** Called when the application has started and the main event loop is
+ * running. */
void
-MainWindow::onCheckForBrowser()
+MainWindow::running()
{
-/* 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();
+ if (vApp->readPasswordFromStdin()) {
+ QTextStream in(stdin);
+ in >> _controlPassword;
+ _useSavedPassword = false;
+ } else {
+ /* Initialize _useSavedPassword to true. If Tor is already running when
+ * Vidalia starts, then there is no point in generating a random password.
+ * If Tor is not already running, then this will be set according to the
+ * current configuration in the start() method.
+ */
+ _useSavedPassword = true;
+ }
- /* On old versions of Windows win32_process_list() will return
- an empty list. In this case, just keep Vidalia open */
- if (procList.isEmpty()) {
- return;
+ if (settings.runTorAtStart()) {
+ /* If we're supposed to start Tor when Vidalia starts, then do it now */
+ start();
}
- /* 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;
+#if defined(USE_AUTOUPDATE)
+ if (settings.isAutoUpdateEnabled()) {
+ QDateTime lastCheckedAt = settings.lastCheckedForUpdates();
+ if (UpdateProcess::shouldCheckForUpdates(lastCheckedAt)) {
+ if (settings.runTorAtStart() && ! _torControl->isCircuitEstablished()) {
+ /* We started Tor but it hasn't bootstrapped yet, so give it a bit
+ * before we decide to check for updates. If Tor manages to build a
+ * circuit before this timer times out, we will stop the timer and
+ * launch a check for updates immediately. (see circuitEstablished()).
+ */
+ _updateTimer.start(5*60*1000);
+ } else {
+ /* Initiate a background check for updates now */
+ checkForUpdates();
+ }
+ } else {
+ /* Schedule the next time to check for updates */
+ QDateTime nextCheckAt = UpdateProcess::nextCheckForUpdates(lastCheckedAt);
+ QDateTime now = QDateTime::currentDateTime().toUTC();
+
+ vInfo("Last checked for software updates at %1. Will check again at %2.")
+ .arg(lastCheckedAt.toLocalTime().toString("dd-MM-yyyy hh:mm:ss"))
+ .arg(nextCheckAt.toLocalTime().toString("dd-MM-yyyy hh:mm:ss"));
+ _updateTimer.start((nextCheckAt.toTime_t() - now.toTime_t()) * 1000);
}
}
-
- /* 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. */
+/** Terminate the Tor process if it is being run under Vidalia, disconnect all
+ * TorControl signals, and exit Vidalia. */
void
-MainWindow::onBrowserFailed(QString errmsg)
+MainWindow::aboutToQuit()
{
- 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);
-}
+ vNotice("Cleaning up before exiting.");
-/** 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);
+ if (_torControl->isVidaliaRunningTor()) {
+ /* Kill our Tor process now */
+ _torControl->stop();
+ }
- /* 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);
-}
+ /* Disable port forwarding */
+ ServerSettings settings(_torControl);
+ settings.cleanupPortForwarding();
-/** Starts the proxy server, if appropriately configured */
-void
-MainWindow::startProxy()
-{
- VidaliaSettings settings;
- QString executable = settings.getProxyExecutable();
- _proxyProcess->start(executable, settings.getProxyExecutableArguments());
+ /* Disconnect all of the TorControl object's signals */
+ QObject::disconnect(_torControl, 0, 0, 0);
}
-/** Called when the proxy server fails to start, for example, because
- * the path specified didn't lead to an executable. */
+/** Attempts to start Tor. If Tor fails to start, then startFailed() will be
+ * called with an error message containing the reason. */
void
-MainWindow::onProxyFailed(QString errmsg)
+MainWindow::start()
{
- Q_UNUSED(errmsg);
+ TorSettings settings;
+ QStringList args;
- /* 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);
-}
+ _torControl->clearErrState();
-/** 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);
+ updateTorStatus(Starting);
- 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 = bs.description();
- }
- 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. */
-void
-MainWindow::start()
-{
- TorSettings settings;
- QStringList args;
-
- updateTorStatus(Starting);
-
- // Disable autoconfiguration if there are missing config data
- if(settings.autoControlPort()) {
- if(settings.getDataDirectory().isEmpty()) {
- vWarn("Disabling ControlPort autoconfiguration. DataDirectory is empty!");
- settings.setAutoControlPort(false);
- }
+ // Disable autoconfiguration if there are missing config data
+ if(settings.autoControlPort()) {
+ if(settings.getDataDirectory().isEmpty()) {
+ vWarn("Disabling ControlPort autoconfiguration. DataDirectory is empty!");
+ settings.setAutoControlPort(false);
+ }
}
/* Check if Tor is already running separately */
if(settings.getControlMethod() == ControlMethod::Port) {
if(!settings.autoControlPort() && net_test_connect(settings.getControlAddress(),
settings.getControlPort())) {
- started();
+ connectToTor();
return;
}
} else {
if (socket_test_connect(settings.getSocketPath())) {
- started();
+ connectToTor();
return;
}
}
@@ -1082,6 +673,23 @@ MainWindow::start()
}
}
+ QString torrc_defaults = settings.getDefaultsTorrc();
+ QFileInfo torrc_defaultsInfo(torrc_defaults);
+
+ if(QDir(torrc_defaultsInfo.filePath()).isRelative()) {
+ torrc_defaults = QCoreApplication::applicationDirPath() + "/" + torrc_defaults;
+
+ QFileInfo newTorrc_DefaultsInfo(torrc_defaults);
+ if(!newTorrc_DefaultsInfo.exists() and torrc_defaultsInfo.exists()) {
+ torrc_defaults = QDir(QCoreApplication::applicationDirPath()).relativeFilePath(torrc_defaultsInfo.absoluteFilePath());
+ vWarn("Automigrating configuration for DefaultsTorrc:\nOld path: %1\nNew path: %2")
+ .arg(newTorrc_DefaultsInfo.filePath())
+ .arg(torrc_defaults);
+ settings.setDefaultsTorrc(torrc_defaults);
+ torrc_defaults = QCoreApplication::applicationDirPath() + "/" + torrc_defaults;
+ }
+ }
+
if(settings.bootstrap()) {
QString boottorrc = settings.bootstrapFrom();
vNotice(tr("Bootstrapping torrc from %1 to %2")
@@ -1093,6 +701,12 @@ MainWindow::start()
}
}
+ if(_torControl->getTorVersion() >= 0x020309) {
+ if (!torrc_defaults.isEmpty()) {
+ args << "--defaults-torrc" << torrc_defaults;
+ }
+ }
+
/* Make sure the torrc we want to use really exists. */
if (!torrc.isEmpty()) {
if (!QFileInfo(torrc).exists())
@@ -1106,7 +720,6 @@ MainWindow::start()
if(QDir(dataDirectory).isRelative()) {
dataDirectory = QCoreApplication::applicationDirPath() + "/" + dataDirectory;
-
QFileInfo newDataDirectoryInfo(dataDirectory);
if(!newDataDirectoryInfo.exists() and dataDirectoryInfo.exists()) {
dataDirectory = QDir(QCoreApplication::applicationDirPath()).relativeFilePath(dataDirectoryInfo.absoluteFilePath());
@@ -1118,9 +731,7 @@ MainWindow::start()
}
}
- QString expDataDirectory = QDir(expand_filename(dataDirectory)).canonicalPath();
- if (!dataDirectory.isEmpty())
- args << "DataDirectory" << expDataDirectory;
+ QString expDataDirectory = expand_filename(dataDirectory);
if(settings.getControlMethod() == ControlMethod::Port) {
if(settings.autoControlPort()) {
@@ -1128,21 +739,19 @@ MainWindow::start()
if(!QFile::remove(portconf))
vWarn(QString("Unable to remove %1, may be it didn't existed.").arg(portconf));
- args << "ControlPort" << "auto";
- args << "SocksPort" << "auto";
- args << "ControlPortWriteToFile" << portconf;
- } else {
- /* Add the intended control port value */
- quint16 controlPort = settings.getControlPort();
- if (controlPort)
- args << "ControlPort" << QString::number(controlPort);
+ if(!_previousControlPort.isEmpty()) {
+ Vidalia::torrc()->setValue("ControlPort", _previousControlPort);
+ _startedWithPrevious = true;
+ }
+ if(!_previousSocksPort.isEmpty()) {
+ Vidalia::torrc()->setValue("ControlPort", _previousSocksPort);
+ _startedWithPrevious = true;
+ }
}
- } else {
- QString path = settings.getSocketPath();
- args << "ControlSocket" << path;
}
- args << "__OwningControllerProcess" << QString::number(QCoreApplication::applicationPid());
+ if (_torControl->getTorVersion() < 0x02021c)
+ args << "__OwningControllerProcess" << QString::number(QCoreApplication::applicationPid());
/* Add the control port authentication arguments */
switch (settings.getAuthenticationMethod()) {
@@ -1151,19 +760,15 @@ MainWindow::start()
if (settings.useRandomPassword()) {
_controlPassword = TorSettings::randomPassword();
_useSavedPassword = false;
- } else {
- _controlPassword = settings.getControlPassword();
+ Vidalia::torrc()->setValue("HashedControlPassword",
+ TorSettings::hashPassword(_controlPassword));
+ Vidalia::torrc()->apply(Vidalia::torControl(), new QString());
+ } else
_useSavedPassword = true;
- }
}
- args << "HashedControlPassword"
- << TorSettings::hashPassword(_controlPassword);
- break;
- case TorSettings::CookieAuth:
- args << "CookieAuthentication" << "1";
break;
default:
- args << "CookieAuthentication" << "0";
+ break;
}
/* This doesn't get set to false until Tor is actually up and running, so we
@@ -1190,55 +795,36 @@ MainWindow::start()
}
_torControl->start(torExecutable, 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);
+ QString errmsg;
+ while(not _torControl->isRunning()) {
+ QCoreApplication::processEvents();
+ if(not _torControl->shouldContinue(&errmsg) and not _pressedStop) {
+ startFailed(errmsg);
- updateTorStatus(Stopped);
+ int exitCode;
+ QProcess::ExitStatus exitStatus;
- /* 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(_torControl->finished(&exitCode, &exitStatus))
+ stopped(exitCode, exitStatus);
- 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");
+ return;
+ } else if(_pressedStop) {
+ return;
+ }
}
+ connectToTor();
}
/** Slot: Called when the Tor process is started. It will connect the control
* socket and set the icons and tooltips accordingly. */
void
-MainWindow::started()
+MainWindow::connectToTor()
{
TorSettings settings;
+ _torControl->clearErrState();
+
updateTorStatus(Started);
/* Now that Tor is running, we want to know if it dies when we didn't want
@@ -1248,13 +834,10 @@ 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();
- if(QDir(dataDirectory).isRelative())
- dataDirectory = QCoreApplication::applicationDirPath() + "/" + dataDirectory;
-
- QFile file(QString("%1/port.conf").arg(QDir(expand_filename(dataDirectory)).canonicalPath()));
+ 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)) {
@@ -1264,19 +847,19 @@ MainWindow::started()
#else
sleep(1);
#endif
+ QCoreApplication::processEvents();
}
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;
}
@@ -1291,47 +874,46 @@ MainWindow::started()
if(addrPort.size() != 2) return;
QHostAddress addr(addrPort.at(0));
- _autoControlPort = addrPort.at(1).toInt();
- _torControl->connect(addr, _autoControlPort);
+ 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) {
+ if(settings.getControlMethod() == ControlMethod::Port)
_torControl->connect(settings.getControlAddress(),
- settings.getControlPort());
- _autoControlPort = settings.getControlPort();
- } else
+ settings.getControlPort());
+ else
_torControl->connect(settings.getSocketPath());
}
+ // If we used the previous ports, set the *Port to auto again
+ if(_startedWithPrevious) {
+ Vidalia::torrc()->setValue("ControlPort", "auto");
+ Vidalia::torrc()->setValue("SocksPort", "auto");
+ Vidalia::torrc()->apply(Vidalia::torControl());
+ }
setStartupProgress(STARTUP_PROGRESS_CONNECTING, tr("Connecting to Tor"));
-}
-/** Called when the connection to the control socket fails. The reason will be
- * given in the errmsg parameter. */
-void
-MainWindow::connectFailed(QString errmsg)
-{
- /* Ok, ok. It really isn't going to connect. I give up. */
- int response = VMessageBox::warning(this,
- tr("Connection Error"), p(errmsg),
- VMessageBox::Ok|VMessageBox::Default|VMessageBox::Escape,
- VMessageBox::Retry, VMessageBox::Help);
+ QString errmsg;
+ while(not _torControl->isConnected()) {
+ QCoreApplication::processEvents();
+ if(not _torControl->shouldContinue(&errmsg) and not _pressedStop) {
+ connectFailed(errmsg);
+ int exitCode;
+ QProcess::ExitStatus exitStatus;
- if (response == VMessageBox::Retry) {
- /* Let's give it another try. */
- TorSettings settings;
- _torControl->connect(settings.getControlAddress(),
- settings.getControlPort());
- } else {
- /* Show the help browser (if requested) */
- if (response == VMessageBox::Help)
- showHelpDialog("troubleshooting.connect");
- /* Since Vidalia can't connect, we can't really do much, so stop Tor. */
- _torControl->stop();
+ if(_torControl->finished(&exitCode, &exitStatus))
+ stopped(exitCode, exitStatus);
+
+ return;
+ } else if(_pressedStop) {
+ return;
+ }
}
+
+ authenticate();
}
/** Disconnects the control socket and stops the Tor process. */
@@ -1342,12 +924,18 @@ MainWindow::stop()
QString errmsg;
TorStatus prevStatus;
bool rc;
+ VidaliaSettings settings;
+
+ _pressedStop = true;
+ QCoreApplication::processEvents();
/* 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"),
+ 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"
@@ -1355,7 +943,9 @@ MainWindow::stop()
"give clients time to find a new relay?"),
VMessageBox::Yes|VMessageBox::Default,
VMessageBox::No,
- VMessageBox::Cancel|VMessageBox::Escape);
+ VMessageBox::Cancel|VMessageBox::Escape,
+ "Remember this answer", &settings, SETTING_REMEMBER_SHUTDOWN);
+ }
if (response == VMessageBox::Yes)
_delayedShutdownStarted = true;
else if (response == VMessageBox::Cancel)
@@ -1372,6 +962,13 @@ MainWindow::stop()
rc = _torControl->stop(&errmsg);
}
+ int exitCode;
+ QProcess::ExitStatus exitStatus;
+
+ while(not _torControl->finished(&exitCode, &exitStatus)) {
+ QCoreApplication::processEvents();
+ }
+
if (!rc) {
/* We couldn't tell Tor to stop, for some reason. */
int response = VMessageBox::warning(this, tr("Error Shutting Down"),
@@ -1389,6 +986,11 @@ MainWindow::stop()
_delayedShutdownStarted = false;
updateTorStatus(prevStatus);
}
+
+ stopped(exitCode, exitStatus);
+
+ _pressedStop = false;
+
return rc;
}
@@ -1415,133 +1017,118 @@ MainWindow::stopped(int exitCode, QProcess::ExitStatus exitStatus)
VMessageBox::ShowLog|VMessageBox::Default,
VMessageBox::Help);
if (ret == VMessageBox::ShowLog)
- _messageLog->showWindow();
+ showMessageLogTab();
else if (ret == VMessageBox::Help)
showHelpDialog("troubleshooting.torexited");
}
}
+ QObject::disconnect(_torControl, SIGNAL(stopped(int, QProcess::ExitStatus)),
+ this, SLOT(stopped(int, QProcess::ExitStatus)));
+ QObject::disconnect(_torControl, SIGNAL(disconnected()), this, SLOT(disconnected()));
}
-/** Called when the control socket has successfully connected to Tor. */
+/** 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::connected()
+MainWindow::startFailed(QString errmsg)
{
- authenticate();
- if(_torControl->isVidaliaRunningTor()) {
- QString err;
- if(!_torControl->takeOwnership(&err))
- vWarn(err);
+ /* 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 = "";
+ Vidalia::torrc()->setValue("ControlPort", "auto");
+ Vidalia::torrc()->setValue("SocksPort", "auto");
+ Vidalia::torrc()->apply(Vidalia::torControl());
+ vWarn("Retrying with new ports");
+ start();
+ return;
}
-}
-/** Called when Vidalia wants to disconnect from a Tor it did not start. */
-void
-MainWindow::disconnect()
-{
- _torControl->disconnect();
+ 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");
+ }
}
-/** Called when the control socket has been disconnected. */
+/** Called when the connection to the control socket fails. The reason will be
+ * given in the errmsg parameter. */
void
-MainWindow::disconnected()
+MainWindow::connectFailed(QString errmsg)
{
- if (!_isVidaliaRunningTor) {
- /* If we didn't start our own Tor process, interpret losing the control
- * connection as "Tor is stopped". */
- updateTorStatus(Stopped);
- }
+ /* Ok, ok. It really isn't going to connect. I give up. */
+ int response = VMessageBox::warning(this,
+ tr("Connection Error"), p(errmsg),
+ VMessageBox::Ok|VMessageBox::Default|VMessageBox::Escape,
+ VMessageBox::Retry, VMessageBox::Help);
- /*XXX We should warn here if we get disconnected when we didn't intend to */
- _actionNewIdentity->setEnabled(false);
- ui.lblNewIdentity->setEnabled(false);
- _isVidaliaRunningTor = false;
+
+ if (response == VMessageBox::Retry) {
+ /* Let's give it another try. */
+ TorSettings settings;
+ _torControl->connect(settings.getControlAddress(),
+ settings.getControlPort());
+ } else {
+ /* Show the help browser (if requested) */
+ if (response == VMessageBox::Help)
+ showHelpDialog("troubleshooting.connect");
+ /* Since Vidalia can't connect, we can't really do much, so stop Tor. */
+ _torControl->stop();
+ }
}
-/** Attempts to authenticate to Tor's control port, depending on the
- * authentication method specified in TorSettings::getAuthenticationMethod().
- */
-bool
-MainWindow::authenticate()
+/** Called when Vidalia has successfully authenticated to Tor. */
+void
+MainWindow::authenticated()
{
- TorSettings::AuthenticationMethod authMethod;
- TorSettings settings;
- ProtocolInfo pi;
+ // We update the title once we are authenticated
+ updateTitle();
- updateTorStatus(Authenticating);
- setStartupProgress(STARTUP_PROGRESS_AUTHENTICATING,
- tr("Authenticating to Tor"));
+ TorSettings settings;
- authMethod = settings.getAuthenticationMethod();
- pi = _torControl->protocolInfo();
- if (!pi.isEmpty()) {
- QStringList authMethods = pi.authMethods();
- if (authMethods.contains("COOKIE"))
- authMethod = TorSettings::CookieAuth;
- else if (authMethods.contains("HASHEDPASSWORD"))
- authMethod = TorSettings::PasswordAuth;
- else if (authMethods.contains("NULL"))
- authMethod = TorSettings::NullAuth;
- }
+ _torControl->clearErrState();
- 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())
- 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 %1 bytes")
- .arg(cookie.size()));
- goto cancel;
+ 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];
}
- 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();
+ if(_torControl->getInfo("net/listeners/socks", socks_str)) {
+ QStringList socks_parts = socks_str.split(":");
+ if(socks_parts.size() > 1)
+ socks_str = socks_parts[1];
}
- 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;
-}
+ _previousControlPort = control_str;
+ _previousSocksPort = socks_str;
+ } else {
+ // Otherwise we want to clear the remembered ports
+ _previousControlPort = "";
+ _previousSocksPort = "";
+ }
-/** Called when Vidalia has successfully authenticated to Tor. */
-void
-MainWindow::authenticated()
-{
ServerSettings serverSettings(_torControl);
QString errmsg;
@@ -1554,9 +1141,8 @@ MainWindow::authenticated()
tr("Connecting to the Tor network"));
}
- /* Let people click on their beloved "New Identity" button */
+ /* Let people click on their beloved "New Circuit" button */
_actionNewIdentity->setEnabled(true);
- ui.lblNewIdentity->setEnabled(true);
/* Register for any pertinent asynchronous events. */
if (!_torControl->setEvents(&errmsg)) {
@@ -1574,9 +1160,6 @@ MainWindow::authenticated()
/* 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();
@@ -1585,6 +1168,25 @@ MainWindow::authenticated()
if (status.isValid())
bootstrapStatusChanged(status);
}
+
+ /* Check if Tor has a circuit established */
+ while(not _torControl->isCircuitEstablished()) {
+ QCoreApplication::processEvents();
+ if(not _torControl->shouldContinue(&errmsg) and not _pressedStop) {
+ startFailed(errmsg);
+
+ int exitCode;
+ QProcess::ExitStatus exitStatus;
+
+ if(_torControl->finished(&exitCode, &exitStatus))
+ stopped(exitCode, exitStatus);
+ return;
+ } else if(_pressedStop) {
+ return;
+ }
+ }
+
+ circuitEstablished();
}
/** Called when Vidalia fails to authenticate to Tor. The failure reason is
@@ -1604,57 +1206,30 @@ MainWindow::authenticationFailed(QString errmsg)
qint64 torPid = 0;
-#if defined(Q_OS_WIN32)
- QHash<qint64, QString> procs = process_list();
+ TorSettings settings;
+ QHash<qint64, QString> procs = process_list(settings.getControlPort());
foreach (qint64 pid, procs.keys()) {
- if (! procs.value(pid).compare("tor.exe", Qt::CaseInsensitive)) {
+ if (! procs.value(pid).compare("tor", Qt::CaseInsensitive)) {
torPid = pid;
break;
}
}
+
dlg.setResetEnabled(torPid > 0);
-#else
- dlg.setResetEnabled(false);
-#endif
int ret = dlg.exec();
- if (ret == QDialogButtonBox::Ok) {
- if (dlg.isSavePasswordChecked()) {
- TorSettings settings;
- settings.setAuthenticationMethod(TorSettings::PasswordAuth);
- settings.setUseRandomPassword(false);
- settings.setControlPassword(dlg.password());
- _useSavedPassword = true;
- } else {
- _controlPassword = dlg.password();
- _useSavedPassword = false;
- }
- retry = true;
- } else if (ret == QDialogButtonBox::Reset) {
+ 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.")),
+ 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;
}
}
- } 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())
@@ -1666,232 +1241,852 @@ MainWindow::authenticationFailed(QString errmsg)
start();
}
-/** Searches for and attempts to load the control authentication cookie. This
- * assumes the cookie is named 'control_auth_cookie'. If <b>cookiePath</b> is
- * empty, this method will search some default locations depending on the
- * current platform. <b>cookiePath</b> can point to either a cookie file or a
- * directory containing the cookie file. */
-QByteArray
-MainWindow::loadControlCookie(QString cookiePath)
+/** 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)
{
- QFile authCookie;
- QStringList pathList;
+ Q_UNUSED(current);
+ Q_UNUSED(recommended);
- if (!cookiePath.isEmpty()) {
- pathList << cookiePath;
- } else {
- /* Try some default locations */
- TorSettings settings;
- QString dataDir = settings.getDataDirectory();
- if (!dataDir.isEmpty())
- pathList << dataDir;
+ if (reason == tc::ObsoleteTorVersion
+ || reason == tc::UnrecommendedTorVersion)
+ displayTorVersionWarning();
+}
-#if defined(Q_WS_WIN)
- pathList << expand_filename("%APPDATA%\\Tor");
+/** 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
- pathList << expand_filename("~/.tor");
+ 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;
}
+}
- /* Search for the cookie file */
- foreach (QString path, pathList) {
- QString cookieFile = QFileInfo(path).isFile() ?
- path : path + "/control_auth_cookie";
- vDebug("Checking for authentication cookie in '%1'").arg(cookieFile);
- if (!QFileInfo(cookieFile).exists())
- continue;
+/** 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);
- authCookie.setFileName(cookieFile);
- if (authCookie.open(QIODevice::ReadOnly)) {
- vInfo("Reading authentication cookie from '%1'").arg(cookieFile);
- return authCookie.readAll();
- } else {
- vWarn("Couldn't open cookie file '%1': %2")
- .arg(cookieFile).arg(authCookie.errorString());
- }
+ 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!");
+ updateTorStatus(CircuitEstablished);
+ warn = false; /* probably false anyway */
+ break;
+ default:
+ description = bs.description();
+ }
+ 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);
+}
+
+/** Called when Tor has successfully established a circuit. */
+void
+MainWindow::circuitEstablished()
+{
+ updateTorStatus(CircuitEstablished);
+ // TODO: fix hardcoded total length
+ setStartupProgress(130,
+ tr("Connected to the Tor network!"));
+
+#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
+ connect(_torControl, SIGNAL(stopped(int, QProcess::ExitStatus)),
+ this, SLOT(stopped(int, QProcess::ExitStatus)));
+ connect(_torControl, SIGNAL(disconnected()), this, SLOT(disconnected()));
+}
+
+/** 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::warnDangerousPort(quint16 port, bool rejected)
+{
+ static QMessageBox *dlg = 0;
+
+ /* Don't display another message box until the first one is dismissed */
+ if (dlg)
+ return;
+
+ QString application;
+ switch (port) {
+ case 23:
+ application = tr("(probably Telnet)");
+ break;
+
+ case 109:
+ case 110:
+ case 143:
+ application = tr("(probably an email client)");
+ break;
+
+ default:
+ application = "";
+ }
+
+ QString text = tr("One of your applications %1 appears to be making a "
+ "potentially unencrypted and unsafe connection to port %2.")
+ .arg(application).arg(port);
+
+ QString extraText = p(tr("Anything sent over this connection could be "
+ "monitored. Please check your application's "
+ "configuration and use only encrypted protocols, "
+ "such as SSL, if possible."));
+ if (rejected) {
+ extraText.append(p(tr("Tor has automatically closed your connection in "
+ "order to protect your anonymity.")));
+ }
+
+ dlg = new QMessageBox(QMessageBox::Warning,
+ tr("Potentially Unsafe Connection"), text,
+ QMessageBox::Ok | QMessageBox::Ignore);
+ dlg->setInformativeText(extraText);
+ dlg->setDefaultButton(QMessageBox::Ok);
+ dlg->setEscapeButton(QMessageBox::Ok);
+
+ int ret = dlg->exec();
+ if (ret == QMessageBox::Ignore) {
+ TorControl *tc = Vidalia::torControl();
+ TorSettings settings;
+ QStringList portList;
+ QList<quint16> ports;
+ int idx;
+
+ ports = settings.getWarnPlaintextPorts();
+ idx = ports.indexOf(port);
+ if (idx >= 0) {
+ ports.removeAt(idx);
+ settings.setWarnPlaintextPorts(ports);
+
+ foreach (quint16 port, ports) {
+ portList << QString::number(port);
+ }
+ tc->setConf("WarnPlaintextPorts", portList.join(","));
+ portList.clear();
+ }
+
+ ports = settings.getRejectPlaintextPorts();
+ idx = ports.indexOf(port);
+ if (idx >= 0) {
+ ports.removeAt(idx);
+ settings.setRejectPlaintextPorts(ports);
+
+ foreach (quint16 port, ports) {
+ portList << QString::number(port);
+ }
+ tc->setConf("RejectPlaintextPorts", portList.join(","));
+ }
+ }
+ delete dlg;
+ dlg = 0;
+}
+
+/** Attempts to authenticate to Tor's control port, depending on the
+ * authentication method specified in TorSettings::getAuthenticationMethod().
+ */
+void
+MainWindow::authenticate()
+{
+ TorSettings::AuthenticationMethod authMethod;
+ TorSettings settings;
+ ProtocolInfo pi;
+
+ _torControl->clearErrState();
+
+ updateTorStatus(Authenticating);
+ setStartupProgress(STARTUP_PROGRESS_AUTHENTICATING,
+ tr("Authenticating to Tor"));
+
+ authMethod = settings.getAuthenticationMethod();
+ pi = _torControl->protocolInfo();
+ QStringList authMethods;
+ if (!pi.isEmpty()) {
+ authMethods = pi.authMethods();
+ if (authMethods.contains("COOKIE"))
+ authMethod = TorSettings::CookieAuth;
+ else if (authMethods.contains("HASHEDPASSWORD"))
+ authMethod = TorSettings::PasswordAuth;
+ else if (authMethods.contains("NULL"))
+ authMethod = TorSettings::NullAuth;
+ }
+
+ QString errmsg;
+
+ if (authMethod == TorSettings::CookieAuth) {
+ if(tryCookie(pi, authMethods.contains("SAFECOOKIE"))) {
+ authenticated();
+ return;
+ } else {
+ if(authMethods.contains("HASHEDPASSWORD")) {
+ if(tryHashed()) {
+ authenticated();
+ return;
+ }
+ }
+ _torControl->shouldContinue(&errmsg);
+ authenticationFailed(errmsg);
+ return;
+ }
+ } else if (authMethod == TorSettings::PasswordAuth) {
+ if(tryHashed()) {
+ authenticated();
+ return;
+ }
+ _torControl->shouldContinue(&errmsg);
+ authenticationFailed(errmsg);
+ return;
+ }
+ /* No authentication. Send an empty password. */
+ vNotice("Authenticating using 'null' authentication.");
+ if(_torControl->authenticate(QString("")))
+ authenticated();
+ else {
+ _torControl->shouldContinue(&errmsg);
+ authenticationFailed(errmsg);
+ }
+}
+
+bool
+MainWindow::tryCookie(const ProtocolInfo &pi, bool safe)
+{
+ 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;
+ }
+ if (safe) {
+ vNotice("Authenticating using 'safecookie' authentication.");
+ } else {
+ vNotice("Authenticating using 'cookie' authentication.");
+ }
+ return _torControl->authenticate(cookie, safe);
+}
+
+bool
+MainWindow::tryHashed()
+{
+ /* Get the control password and send it to Tor */
+ vNotice("Authenticating using 'hashed password' authentication.");
+ if (_useSavedPassword) {
+ TorSettings settings;
+ _controlPassword = settings.getControlPassword();
+ }
+
+ qputenv("TOR_CONTROL_PASSWD",
+ _controlPassword.toAscii().toHex());
+
+ return _torControl->authenticate(_controlPassword);
+}
+
+/** 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();
+ }
+ }
+}
+
+/** Searches for and attempts to load the control authentication cookie. This
+ * assumes the cookie is named 'control_auth_cookie'. If <b>cookiePath</b> is
+ * empty, this method will search some default locations depending on the
+ * current platform. <b>cookiePath</b> can point to either a cookie file or a
+ * directory containing the cookie file. */
+QByteArray
+MainWindow::loadControlCookie(QString cookiePath)
+{
+ QFile authCookie;
+ QStringList pathList;
+
+ if (!cookiePath.isEmpty()) {
+ pathList << cookiePath;
+ } else {
+ /* Try some default locations */
+ TorSettings settings;
+ QString dataDir = settings.getDataDirectory();
+ if (!dataDir.isEmpty())
+ pathList << dataDir;
+
+#if defined(Q_WS_WIN)
+ pathList << expand_filename("%APPDATA%\\Tor");
+#else
+ pathList << expand_filename("~/.tor");
+#endif
+ }
+
+ /* Search for the cookie file */
+ foreach (QString path, pathList) {
+ QString cookieFile = QFileInfo(path).isFile() ?
+ path : path + "/control_auth_cookie";
+ vDebug("Checking for authentication cookie in '%1'").arg(cookieFile);
+ if (!QFileInfo(cookieFile).exists())
+ continue;
+
+ authCookie.setFileName(cookieFile);
+ if (authCookie.open(QIODevice::ReadOnly)) {
+ vInfo("Reading authentication cookie from '%1'").arg(cookieFile);
+ return authCookie.readAll();
+ } else {
+ vWarn("Couldn't open cookie file '%1': %2")
+ .arg(cookieFile).arg(authCookie.errorString());
+ }
+ }
+ vWarn("Couldn't find a readable authentication cookie.");
+ return QByteArray();
+}
+
+/** Updates the UI to reflect Tor's current <b>status</b>. Returns the
+ * previously set TorStatus value.*/
+MainWindow::TorStatus
+MainWindow::updateTorStatus(TorStatus status)
+{
+ 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;
+ _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);
+ }
+
+ /* 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;
+}
+
+/** 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
+}
+
+/** Converts a TorStatus enum value to a string for debug logging purposes. */
+QString
+MainWindow::toString(TorStatus status)
+{
+ 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 the user changes a setting that needs Tor restarting */
+void
+MainWindow::restart()
+{
+ if(stop()) {
+ start();
+ }
+}
+
+/** Sends a sighup signal to Tor on platforms other than Windows */
+void
+MainWindow::sighup()
+{
+ bool rc;
+ QString errmsg;
+ rc = _torControl->signal(TorSignal::Reload, &errmsg);
+
+ 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);
+ }
+}
+
+/** Sets the visibility of the startup status description and progress bar to
+ * <b>visible</b>. */
+void
+MainWindow::setStartupProgressVisible(bool visible)
+{
+ _statusTab.setTorStatusVisible(!visible);
+ _statusTab.setProgressVisible(visible);
+}
+
+/** 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)
+{
+ _statusTab.setProgress(progressValue, description);
+ _trayIcon.setToolTip(description);
+}
+
+/** Called when Vidalia wants to disconnect from a Tor it did not start. */
+void
+MainWindow::disconnect()
+{
+ _torControl->disconnect();
+}
+
+/** Called when the control socket has been disconnected. */
+void
+MainWindow::disconnected()
+{
+ if (!_isVidaliaRunningTor) {
+ /* If we didn't start our own Tor process, interpret losing the control
+ * connection as "Tor is stopped". */
+ updateTorStatus(Stopped);
+ }
+
+ /*XXX We should warn here if we get disconnected when we didn't intend to */
+ _actionNewIdentity->setEnabled(false);
+ _isVidaliaRunningTor = false;
+}
+
+void
+MainWindow::showConfigDialog(ConfigDialog::Page page)
+{
+ ConfigDialog *configDialog = new ConfigDialog();
+ connect(configDialog, SIGNAL(helpRequested(QString)),
+ this, SLOT(showHelpDialog(QString)));
+ connect(configDialog, SIGNAL(restartTor()),
+ this, SLOT(restart()));
+ connect(configDialog, SIGNAL(configChanged()),
+ this, SLOT(updateTitle()));
+ configDialog->showWindow(page);
+}
+
+/** Called when the user selects the "New Circuit" action from the menu. */
+void
+MainWindow::newIdentity()
+{
+ QString errmsg;
+
+ /* Send the NEWNYM signal. If message balloons are supported and the NEWNYM
+ * is successful, we will show the result as a balloon. Otherwise, we'll
+ * just use a message box. */
+ if (_torControl->signal(TorSignal::NewNym, &errmsg)) {
+ /* NEWNYM signal was successful */
+ QString title = tr("New Circuit");
+ QString message = tr("All subsequent connections will "
+ "appear to be different than your "
+ "old connections.");
+
+ /* Disable the New Identity button for MIN_NEWIDENTITY_INTERVAL */
+ _actionNewIdentity->setEnabled(false);
+ QTimer::singleShot(MIN_NEWIDENTITY_INTERVAL,
+ this, SLOT(enableNewIdentity()));
+
+ if (QSystemTrayIcon::supportsMessages())
+ _trayIcon.showMessage(title, message, QSystemTrayIcon::Information);
+ else
+ VMessageBox::information(this, title, message, VMessageBox::Ok);
+ } else {
+ /* NEWNYM signal failed */
+ VMessageBox::warning(this,
+ tr("Failed to Create New Identity"), errmsg, VMessageBox::Ok);
+ }
+}
+
+/** Re-enables the 'New Identity' button after a delay from the previous time
+ * 'New Identity' was used. */
+void
+MainWindow::enableNewIdentity()
+{
+ if (_torControl->isConnected()) {
+ _actionNewIdentity->setEnabled(true);
}
- vWarn("Couldn't find a readable authentication cookie.");
- return QByteArray();
}
-/** Called when Tor has successfully established a circuit. */
void
-MainWindow::circuitEstablished()
+MainWindow::handleCloseTab(int index)
{
- updateTorStatus(CircuitEstablished);
- setStartupProgress(ui.progressBar->maximum(),
- tr("Connected to the Tor network!"));
- startSubprocesses();
+ /* If the tab that's going to be closed is the status one
+ * don't do it */
+ if(index == 0)
+ return;
-#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
+ delTab(index);
}
-/** Checks the status of the current version of Tor to see if it's old,
- * unrecommended, or obsolete. */
void
-MainWindow::checkTorVersion()
+MainWindow::attachTab()
{
- 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();
- }
+ 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);
}
}
-/** 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)
+MainWindow::detachTab()
{
- Q_UNUSED(current);
- Q_UNUSED(recommended);
+ VAttachButton *but = qobject_cast<VAttachButton *>(sender());
+ VidaliaTab *tab = but->getTab();
+ int index = ui.tabWidget->indexOf(tab);
- if (reason == tc::ObsoleteTorVersion
- || reason == tc::UnrecommendedTorVersion)
- displayTorVersionWarning();
+ ui.tabWidget->removeTab(index);
+ tab->setParent(0);
+ QRect desk = QApplication::desktop()->screenGeometry(0);
+ tab->move(desk.center() - tab->rect().center());
+ 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);
}
-/** Called when Tor thinks its version is old or unrecommended, and displays a
- * message notifying the user. */
void
-MainWindow::displayTorVersionWarning()
+MainWindow::handleAttachedClose()
{
- static bool alreadyWarned = false;
+ 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 (!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
+ if(act != 0)
+ _reattachMenu.removeAction(act);
- 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);
+ _detachedTabMap.removeAll(tab->getTitle());
- if (ret == VMessageBox::Yes)
- checkForUpdatesWithUi();
-#endif
- alreadyWarned = true;
+ tab->setParent(ui.tabWidget);
+ addTab(tab);
+
+ if(_reattachMenu.actions().size() < 1) {
+ _reattachMenu.addAction(_dummy);
+ _dummy->setEnabled(false);
+ }
+
+ delTab(ui.tabWidget->currentIndex());
}
}
-/** 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::warnDangerousPort(quint16 port, bool rejected)
+MainWindow::addTab(VidaliaTab *tab)
{
- static QMessageBox *dlg = 0;
+ /** 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;
- /* Don't display another message box until the first one is dismissed */
- if (dlg)
+ /** Exception for tabs that need to be always created */
+ if (tab != _messageLog &&
+ tab != &_statusTab &&
+ tab != &_netViewer &&
+ tab != _graph)
+ tab->deleteLater();
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;
+ VAttachButton *atb = new VAttachButton();
- default:
- application = "";
- }
+ ui.tabWidget->addTab(tab, tab->getTitle());
+ int pos = ui.tabWidget->count() - 1;
+ ui.tabWidget->setCurrentIndex(pos);
- 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);
+ atb->setTab(tab);
+#if defined(Q_WS_MAC)
+ ui.tabWidget->setTabButton(pos, QTabBar::RightSide, atb);
+#else
+ ui.tabWidget->setTabButton(pos, QTabBar::LeftSide, atb);
+#endif
- 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.")));
- }
+ connect(tab, SIGNAL(closeTab()),
+ this, SLOT(handleAttachedClose()));
- 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);
+ 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() and (tab != &_statusTab))
+ setVisible(true);
+}
- int ret = dlg->exec();
- if (ret == QMessageBox::Ignore) {
- TorControl *tc = Vidalia::torControl();
- TorSettings settings;
- QStringList portList;
- QList<quint16> ports;
- int idx;
+void
+MainWindow::delTab(int index)
+{
+ if(index == -1)
+ index = ui.tabWidget->currentIndex();
- ports = settings.getWarnPlaintextPorts();
- idx = ports.indexOf(port);
- if (idx >= 0) {
- ports.removeAt(idx);
- settings.setWarnPlaintextPorts(ports);
+ 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);
+}
- foreach (quint16 port, ports) {
- portList << QString::number(port);
- }
- tc->setConf("WarnPlaintextPorts", portList.join(","));
- portList.clear();
- }
+void
+MainWindow::showStatusTab()
+{
+ addTab(&_statusTab);
+}
- ports = settings.getRejectPlaintextPorts();
- idx = ports.indexOf(port);
- if (idx >= 0) {
- ports.removeAt(idx);
- settings.setRejectPlaintextPorts(ports);
+void
+MainWindow::showMessageLogTab()
+{
+ addTab(_messageLog);
+}
- foreach (quint16 port, ports) {
- portList << QString::number(port);
- }
- tc->setConf("RejectPlaintextPorts", portList.join(","));
- }
- }
- delete dlg;
- dlg = 0;
+void
+MainWindow::showBandwidthTab()
+{
+ addTab(_graph);
}
/** Creates and displays Vidalia's About dialog. */
@@ -1920,83 +2115,17 @@ MainWindow::showHelpDialog(const QString &topic)
helpBrowser->showWindow(topic);
}
-/** Creates and displays the Configuration dialog with the current page set to
- * <b>page</b>. */
-void
-MainWindow::showConfigDialog(ConfigDialog::Page page)
-{
- _configDialog->showWindow(page);
-}
-
-/** Displays the Configuration dialog, set to the Server page. */
-void
-MainWindow::showServerConfigDialog()
-{
- showConfigDialog(ConfigDialog::Server);
-}
-
-/** Called when the user selects the "New Identity" action from the menu. */
void
-MainWindow::newIdentity()
+MainWindow::showNetViewerTab()
{
- QString errmsg;
-
- /* Send the NEWNYM signal. If message balloons are supported and the NEWNYM
- * is successful, we will show the result as a balloon. Otherwise, we'll
- * just use a message box. */
- if (_torControl->signal(TorSignal::NewNym, &errmsg)) {
- /* NEWNYM signal was successful */
- QString title = tr("New Identity");
- QString message = tr("All subsequent connections will "
- "appear to be different than your "
- "old connections.");
-
- /* Disable the New Identity button for MIN_NEWIDENTITY_INTERVAL */
- _actionNewIdentity->setEnabled(false);
- ui.lblNewIdentity->setEnabled(false);
- QTimer::singleShot(MIN_NEWIDENTITY_INTERVAL,
- this, SLOT(enableNewIdentity()));
-
- if (QSystemTrayIcon::supportsMessages())
- _trayIcon.showMessage(title, message, QSystemTrayIcon::Information);
- else
- VMessageBox::information(this, title, message, VMessageBox::Ok);
- } else {
- /* NEWNYM signal failed */
- VMessageBox::warning(this,
- tr("Failed to Create New Identity"), errmsg, VMessageBox::Ok);
- }
+ addTab(&_netViewer);
}
-/** Re-enables the 'New Identity' button after a delay from the previous time
- * 'New Identity' was used. */
void
-MainWindow::enableNewIdentity()
+MainWindow::showDebugDialog()
{
- 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)
-{
- 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";
+ DebugDialog dlg;
+ dlg.exec();
}
#if defined(USE_MINIUPNPC)
@@ -2159,60 +2288,77 @@ 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;
+/** Called when the panic button is pressed */
+void
+MainWindow::panic()
+{
+ VidaliaSettings settings;
+ QString binaryPath;
+ QFileInfo starter, vidalia;
- QHostAddress addr(addrPort.at(0));
- quint16 port = addrPort.at(1).toInt();
+ // First some sanity checks so we don't remove any directory
- env << QString("TOR_SOCKS_HOST=%1").arg(addr.toString());
- env << QString("TOR_SOCKS_PORT=%1").arg(port);
+#if defined(Q_WS_WIN)
+ starter.setFile(QString("%1/%2")
+ .arg(settings.panicPath())
+ .arg("Start Tor Browser.exe"));
+ vidalia.setFile(QString("%1/%2")
+ .arg(settings.panicPath())
+ .arg("App/vidalia.exe"));
+
+ binaryPath = vidalia.absoluteFilePath();
+#elif defined(Q_WS_MAC)
+ starter.setFile(QString("%1/%2")
+ .arg(settings.panicPath())
+ .arg("Contents/MacOS/TorBrowserBundle"));
+ vidalia.setFile(QString("%1/%2")
+ .arg(settings.panicPath())
+ .arg("Contents/MacOS/Vidalia.app"));
+
+ binaryPath = QFileInfo(QString("%1/%2")
+ .arg(settings.panicPath())
+ .arg("Contents/MacOS/Vidalia.app/Contents/MacOS/Vidalia")).absolutePath();
+#else
+ starter.setFile(QString("%1/%2")
+ .arg(settings.panicPath())
+ .arg("start-tor-browser"));
+ vidalia.setFile(QString("%1/%2")
+ .arg(settings.panicPath())
+ .arg("App/vidalia"));
+
+ binaryPath = vidalia.absoluteFilePath();
+#endif
- 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(not (starter.exists() and vidalia.exists())) {
+ vWarn("Trying to panic but the directory is not what was expected.");
+ return;
}
- if(settings.getAuthenticationMethod() == TorSettings::PasswordAuth) {
- env << QString("TOR_CONTROL_PASSWD=%1").arg(QString(_controlPassword.toAscii().toHex()));
- env << QString("TOR_CONTROL_PORT=%1").arg(_autoControlPort);
+ if(binaryPath != QApplication::applicationFilePath()) {
+ vWarn("Trying to panic but the Panic Path does not contain Vidalia's binary");
+ return;
}
- return env;
-}
+ hide();
+ _trayIcon.setVisible(false);
-void
-MainWindow::log(tc::Severity type, const QString &message)
-{
- if(type == tc::WarnSeverity)
- _warnTimer->start(1000);
+#if !defined(Q_WS_WIN)
+ bool res = remove_dir(settings.panicPath());
+#else
+ QProcess::startDetached(QString("cmd /C ping -n 1 127.0.0.1 >NUL && rmdir /Q /S \"%1\"")
+ .arg(settings.panicPath()));
+#endif
+ if(_torControl->isRunning()) {
+ // We have taken tor's ownership, so just quit
+ vApp->disconnect();
+ }
+ vApp->quit();
}
+/** Display a message in the application system tray icon */
void
-MainWindow::warnButton()
+MainWindow::trayMessage(const QString &title, const QString &msg,
+ QSystemTrayIcon::MessageIcon icon, int milli)
{
- if(_flashToggle) {
- ui.lblMessageLog->enableFlashing();
- } else {
- ui.lblMessageLog->disableFlashing();
- }
-
- _flashToggle = !_flashToggle;
+ _trayIcon.showMessage(title, msg, icon, milli);
}
diff --git a/src/vidalia/MainWindow.h b/src/vidalia/MainWindow.h
index a434e66..e5befa3 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,10 +34,16 @@
#include "UPNPControl.h"
#endif
+#include "TorControl.h"
+
+#include "PluginEngine.h"
+
#include <QMainWindow>
#include <QTimer>
#include <QSystemTrayIcon>
+class FirstRunWizard;
+
class MainWindow : public VidaliaWindow
{
Q_OBJECT
@@ -54,7 +56,11 @@ public:
public slots:
/** Shows or hides this window. **/
- virtual void setVisible(bool visible);
+ virtual void setVisible(bool visible = false);
+ /** Display a message in the application system tray icon */
+ void trayMessage(const QString &title, const QString &msg,
+ QSystemTrayIcon::MessageIcon icon = QSystemTrayIcon::Information,
+ int milli = 10000);
protected:
/** Called when the user changes the UI translation. */
@@ -64,25 +70,22 @@ 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. */
- void started();
+ void connectToTor();
/** Called when the user selects "Stop" form the menu. */
bool stop();
/** Called when the Tor process has exited, either expectedly or not. */
void stopped(int errorCode, QProcess::ExitStatus exitStatus);
/** Called when the control socket has connected to Tor. */
- void connected();
+ //void connected();
/** Called when the control connection fails. */
void connectFailed(QString errmsg);
/** Called when Vidalia wants to disconnect from a Tor it did not start. */
@@ -91,6 +94,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, bool safe = false);
+ /** 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 +114,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,11 +129,50 @@ 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);
- /** Called when torControl emits logMessage() */
- void log(tc::Severity type, const QString &message);
- /** Toggles the color for the Message Log button */
- void warnButton();
+ /** Called when the Panic! button is pressed */
+ void panic();
+
+ /** Called when server configuration is changed */
+ void updateTitle();
#if defined(USE_AUTOUPDATE)
/** Called when the user clicks the 'Check Now' button in the General
@@ -171,11 +197,15 @@ private slots:
void installUpdatesFailed(const QString &errmsg);
#endif
+
#if defined(USE_MINIUPNPC)
/** Called when a UPnP error occurs. */
void upnpError(UPNPControl::UPNPError error);
#endif
+ /** Called when the user has finished the first run wizard */
+ void enableNetwork();
+
private:
enum TorStatus {
Unset, /**< Tor's status has not yet been set. */
@@ -187,6 +217,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
@@ -194,23 +227,19 @@ 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. */
- bool authenticate();
+ void authenticate();
/** Searches for and attempts to load the control authentication cookie.
* This assumes the cookie is named 'control_auth_cookie'. If
* <b>cookiePath</b> is empty, this method will search some default locations
@@ -230,9 +259,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;
@@ -242,22 +268,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;
@@ -278,30 +290,46 @@ 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;
-
- quint16 _autoControlPort;
-
- /** Timer and bool used to flash buttons with a different color */
- QTimer *_warnTimer;
- bool _flashToggle;
+ 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;
+ QAction *_actionPanic;
+ QAction *_actionHide;
+
+ 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. */
-};
-#endif
+ 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 */
+ bool _pressedStop; /**< True if the user has pressed the Stop Tor button */
+ FirstRunWizard *_wizard; /**< Wizard displayed when running Vidalia for the first time */
+};
+
+#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..c53b8f9
--- /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..66ccad2
--- /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..c1d220d
--- /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 a20df07..0000000
--- a/src/vidalia/VClickLabel.cpp
+++ /dev/null
@@ -1,138 +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);
- _flashToggle = false;
- _isPressed = false;
-}
-
-/** 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 (_flashToggle || _isPressed) {
- p.setBrush(QColor(150,150,150));
- rect.setX(rect.x()+1);
- rect.setY(rect.y()+1);
- rect.setWidth(rect.width());
- rect.setHeight(rect.height());
- p.drawRect(rect);
- }
-
- rect = this->rect();
-
- // when label is in "pressed" state, we will translate the pixmap and text
- // a bit, just like regular buttons do
- const int d = _isPressed ? 2 : 0;
-
- if (vApp->isLeftToRight()) {
- if (!_pixmap.isNull())
- p.drawPixmap(d, qMax((rect.height()-_pixmap.height())/2+d, 0), _pixmap);
- if (!_text.isEmpty())
- p.drawText(_pixmap.width()+2+d, (rect.height()+fontInfo().pixelSize())/2+d, _text);
- } else {
- if (!_pixmap.isNull())
- p.drawPixmap(qMax(rect.right()-_pixmap.width()-d, d),
- qMax((rect.height()-_pixmap.height())/2-d, d), _pixmap);
- if (!_text.isEmpty()) {
- int textWidth = fontMetrics().width(_text);
- p.drawText(qMax(rect.right()-_pixmap.width()-textWidth-2-d, d),
- (rect.height()+fontInfo().pixelSize())/2-d, _text);
- }
- }
- e->accept();
-}
-
-/** Overloaded mouse event to remember click state. */
-void
-VClickLabel::mousePressEvent(QMouseEvent * e)
-{
- if (e->button() == Qt::LeftButton) {
- _isPressed = true;
- update();
- }
- e->accept();
-}
-
-/** Overloaded mouse event to catch left mouse button clicks. */
-void
-VClickLabel::mouseReleaseEvent(QMouseEvent *e)
-{
- if (e->button() == Qt::LeftButton) {
- _isPressed = false;
- update();
- 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();
-}
-
-void
-VClickLabel::enableFlashing()
-{
- _flashToggle = true;
- repaint();
-}
-
-void
-VClickLabel::disableFlashing()
-{
- _flashToggle = false;
- repaint();
-}
diff --git a/src/vidalia/VClickLabel.h b/src/vidalia/VClickLabel.h
deleted file mode 100644
index acdc58e..0000000
--- a/src/vidalia/VClickLabel.h
+++ /dev/null
@@ -1,75 +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);
-
-public slots:
- /** Enables painting a different background color for this label */
- void enableFlashing();
- /** Disables the background color modification */
- void disableFlashing();
-
-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 remember click state. */
- virtual void mousePressEvent(QMouseEvent * 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. */
- bool _flashToggle;/**< Bool toggle for flashing the button. */
- bool _isPressed; /**< Remember if label is currently pressed. */
-};
-
-#endif
-
diff --git a/src/vidalia/VMessageBox.cpp b/src/vidalia/VMessageBox.cpp
index 70e4934..15fc553 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,14 +121,44 @@ 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));
+ 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 VMessageBox::selected(ret, button0, button1, button2);
}
@@ -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 6eee884..1a4da6e 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..0012852
--- /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/Vidalia.cpp b/src/vidalia/Vidalia.cpp
index 19237c3..325aa72 100644
--- a/src/vidalia/Vidalia.cpp
+++ b/src/vidalia/Vidalia.cpp
@@ -55,6 +55,7 @@ QMap<QString, QString> Vidalia::_args; /**< List of command-line arguments. */
QString Vidalia::_style; /**< The current GUI style. */
QString Vidalia::_language; /**< The current language. */
TorControl* Vidalia::_torControl = 0; /**< Main TorControl object. */
+Torrc* Vidalia::_torrc = 0; /**< Main Torrc object. */
Log Vidalia::_log;
QList<QTranslator *> Vidalia::_translators;
@@ -123,8 +124,12 @@ Vidalia::Vidalia(QStringList args, int &argc, char **argv)
/* Set the GUI style appropriately. */
setStyle(_args.value(ARG_GUISTYLE));
+ TorSettings settings;
/* Creates a TorControl object, used to talk to Tor. */
- _torControl = new TorControl(TorSettings().getControlMethod());
+ _torControl = new TorControl(settings.getControlMethod());
+
+ /* Creates a Torrc handler */
+ _torrc = new Torrc(settings.getTorrc(), settings.getDefaultsTorrc());
#ifdef USE_MARBLE
/* Tell Marble where to stash its generated data */
@@ -144,6 +149,7 @@ Vidalia::Vidalia(QStringList args, int &argc, char **argv)
Vidalia::~Vidalia()
{
delete _torControl;
+ delete _torrc;
}
/** Enters the main event loop and waits until exit() is called. The signal
@@ -475,6 +481,7 @@ err:
delete vidaliaQtTranslator;
if (vidaliaTranslator)
delete vidaliaTranslator;
+ delete vidaliaTranslator;
return false;
}
diff --git a/src/vidalia/Vidalia.h b/src/vidalia/Vidalia.h
index 66cf39a..c5224e0 100644
--- a/src/vidalia/Vidalia.h
+++ b/src/vidalia/Vidalia.h
@@ -21,6 +21,7 @@
#include "TorSettings.h"
#include "Log.h"
#include "TorControl.h"
+#include "Torrc.h"
#include <QApplication>
#include <QMap>
@@ -75,6 +76,9 @@ public:
/** Returns Vidalia's main TorControl object. */
static TorControl* torControl() { return _torControl; }
+ /** Returns Vidalia's main TorControl object. */
+ static Torrc* torrc() { return _torrc; }
+
/** Returns the location Vidalia uses for its data files. */
static QString dataDirectory();
/** Returns the default location of Vidalia's data directory. */
@@ -151,6 +155,7 @@ private:
static QString _style; /**< The current GUI style. */
static QString _language; /**< The current language. */
static TorControl* _torControl; /**< Vidalia's main TorControl object.*/
+ static Torrc* _torrc; /**< Vidalia's main Torrc object. */
static Log _log; /**< Logs debugging messages to file or stdout. */
static QList<QTranslator *> _translators; /**< List of installed translators. */
};
diff --git a/src/vidalia/VidaliaTab.cpp b/src/vidalia/VidaliaTab.cpp
new file mode 100644
index 0000000..959ce07
--- /dev/null
+++ b/src/vidalia/VidaliaTab.cpp
@@ -0,0 +1,76 @@
+#include "VidaliaTab.h"
+#include "Vidalia.h"
+
+/** Default constructor.
+ * \param title Tab title.
+ * \param name Optional group name for settings accessed by this tab.
+ * \param parent Parent widget.
+ */
+VidaliaTab::VidaliaTab(const QString &title, const QString &name, QWidget *parent)
+ : QWidget(parent), _title(title)
+{
+ _settings = new VSettings(name);
+}
+
+VidaliaTab::~VidaliaTab()
+{
+ 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/VidaliaTab.h b/src/vidalia/VidaliaTab.h
new file mode 100644
index 0000000..8bf151b
--- /dev/null
+++ b/src/vidalia/VidaliaTab.h
@@ -0,0 +1,74 @@
+/*
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If you
+** did not receive the LICENSE file with this file, you may obtain it from the
+** Vidalia source package distributed by the Vidalia Project at
+** http://www.vidalia-project.net/. No part of Vidalia, including this file,
+** may be copied, modified, propagated, or distributed except according to the
+** terms described in the LICENSE file.
+*/
+
+/*
+** \file VidaliaTab.h
+** \brief Main tab that shows the current Tor status
+*/
+
+#ifndef _VIDALIATAB_H
+#define _VIDALIATAB_H
+
+#include "VSettings.h"
+
+#include <QtGui>
+
+class VidaliaTab : public QWidget
+{
+ Q_OBJECT
+
+public:
+ /** Default constructor. */
+ VidaliaTab(const QString &title, const QString &name = "General", QWidget *parent = 0);
+ /** Destructor. */
+ ~VidaliaTab();
+
+ /** Returns the tab's title */
+ QString getTitle() const { return _title; }
+ /** Sets the tab's title to title */
+ void setTitle(const QString &title) { _title = title; }
+
+ /** Associates a shortcut key sequence with a slot. */
+ void setShortcut(const QString &shortcut, const char *slot);
+
+ /** Gets the saved value of a property associated with this window object.
+ * If no value was saved, the default value is returned. */
+ QVariant getSetting(QString name, QVariant defaultValue);
+ /** Saves a value associated with a setting name for this window object. */
+ void saveSetting(QString name, QVariant value);
+ /** Sets the onTop property of the tab to top */
+ void setOnTop(bool top);
+
+signals:
+ /** Emitted when a VidaliaWindow requests help information on the specified
+ * <b>topic</b>. */
+ void helpRequested(const QString &topic);
+
+ void closeTab();
+
+protected:
+ /** Reimplement the windows' changeEvent() method to check if the event
+ * is a QEvent::LanguageChange event. If so, call retranslateUi(), which
+ * subclasses of VidaliaWindow can reimplement to update their UI. */
+ virtual void changeEvent(QEvent *e);
+ /** Called when the user wants to change the currently visible language. */
+ virtual void retranslateUi();
+
+ virtual void closeEvent(QCloseEvent *event);
+
+ bool _onTop; /**< True if the current tab is the one being displayed */
+
+private:
+ QString _title; /**< Title displayed in the tab */
+ VSettings* _settings; /**< Object used to store window properties */
+};
+
+#endif
+
diff --git a/src/vidalia/bwgraph/BandwidthGraph.cpp b/src/vidalia/bwgraph/BandwidthGraph.cpp
index 4b2d7c8..71f6f15 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 ea6e263..5017554 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. */
@@ -69,6 +65,8 @@ private:
/** 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/AbstractTorSettings.cpp b/src/vidalia/config/AbstractTorSettings.cpp
index 9b3846f..1115e2b 100644
--- a/src/vidalia/config/AbstractTorSettings.cpp
+++ b/src/vidalia/config/AbstractTorSettings.cpp
@@ -128,3 +128,13 @@ AbstractTorSettings::setValue(const QString &key, const QVariant &value)
}
}
+/** Saves the value <b>val</b> for the setting <b>key</b> to the local
+ * settings file. */
+void
+AbstractTorSettings::setVolatileValue(const QString &key, const QVariant &value)
+{
+ if (value != volatileValue(key)) {
+ setChanged(true);
+ VSettings::setVolatileValue(key, value);
+ }
+}
diff --git a/src/vidalia/config/AbstractTorSettings.h b/src/vidalia/config/AbstractTorSettings.h
index 9656428..0ce7711 100644
--- a/src/vidalia/config/AbstractTorSettings.h
+++ b/src/vidalia/config/AbstractTorSettings.h
@@ -19,6 +19,10 @@
#include "VSettings.h"
#include "TorControl.h"
+#define with_torrc_value(VAL) \
+ QStringList ret = Vidalia::torrc()->value((VAL)); \
+ if(ret.size() > 0)
+
class AbstractTorSettings : public VSettings
{
Q_OBJECT
@@ -56,6 +60,8 @@ protected:
* settings file. */
virtual void setValue(const QString &key, const QVariant &value);
+ virtual void setVolatileValue(const QString &key, const QVariant &value);
+
/** Returns true if the given QVariant contains an empty value, depending on
* the data type. For example, 0 is considered an empty integer and "" is
* an empty string. */
diff --git a/src/vidalia/config/AdvancedPage.cpp b/src/vidalia/config/AdvancedPage.cpp
index fffdcf3..56abe16 100644
--- a/src/vidalia/config/AdvancedPage.cpp
+++ b/src/vidalia/config/AdvancedPage.cpp
@@ -19,6 +19,7 @@
#include "VMessageBox.h"
#include "IpValidator.h"
#include "Local8BitStringValidator.h"
+#include "VidaliaSettings.h"
#include "file.h"
@@ -60,12 +61,16 @@ 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)));
connect(ui.btnBrowseSocketPath, SIGNAL(clicked()), this, SLOT(browseSocketPath()));
connect(ui.chkAuto, SIGNAL(toggled(bool)), this, SLOT(toggleAuto(bool)));
+ connect(ui.btnBrowsePanicPath, SIGNAL(clicked()), this, SLOT(browsePanicPath()));
+
/* Hide platform specific features */
#if defined(Q_WS_WIN)
#if 0
@@ -74,6 +79,11 @@ AdvancedPage::AdvancedPage(QWidget *parent)
/* Disable ControlSocket */
ui.rdoControlSocket->setEnabled(false);
#endif
+
+ ui.lblPanicWarn->setVisible(false);
+ ui.lblPanicPath->setVisible(false);
+ ui.linePanicPath->setVisible(false);
+ ui.btnBrowsePanicPath->setVisible(false);
}
/** Destructor */
@@ -191,8 +201,7 @@ AdvancedPage::save(QString &errmsg)
}
QString dataDir = ui.lineTorDataDirectory->text();
- if (dataDir != _settings->getDataDirectory())
- _settings->setDataDirectory(dataDir);
+ _settings->setDataDirectory(dataDir);
}
if(!ui.chkAuto->isChecked()) {
@@ -208,6 +217,10 @@ AdvancedPage::save(QString &errmsg)
&& !ui.chkRandomPassword->isChecked())
_settings->setControlPassword(ui.linePassword->text());
+ VidaliaSettings vsettings;
+ vsettings.setAllowPanic(ui.chkEnablePanic->isChecked());
+ vsettings.setPanicPath(ui.linePanicPath->text());
+
#if 0
#if defined(Q_WS_WIN)
/* Install or uninstall the Tor service as necessary */
@@ -224,6 +237,10 @@ AdvancedPage::load()
{
ui.lineControlAddress->setText(_settings->getControlAddress().toString());
ui.lineControlPort->setText(QString::number(_settings->getControlPort()));
+
+ // We don't want to loose the socksport
+ _settings->setSocksPort(_settings->getSocksPort());
+
ui.lineTorConfig->setText(_settings->getTorrc());
ui.lineTorDataDirectory->setText(_settings->getDataDirectory());
ui.chkAuto->setChecked(_settings->autoControlPort());
@@ -243,11 +260,20 @@ 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);
}
+
+ VidaliaSettings settings;
+
+ ui.chkEnablePanic->setChecked(settings.allowPanic());
+ ui.linePanicPath->setText(settings.panicPath());
+
+ /** We need to keep the ExitNodes settings, even if we don't use it here */
+ _settings->setExitNodes(_settings->exitNodes());
+ /** ... and the same for entry nodes */
+ _settings->setEntryNodes(_settings->entryNodes());
}
/** Called when the user selects a different authentication method from the
@@ -258,6 +284,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>. */
@@ -326,7 +353,7 @@ AdvancedPage::browseTorConfig()
return;
}
}
- ui.lineTorConfig->setText(filename);
+ ui.lineTorConfig->setText(QDir::toNativeSeparators(filename));
}
/** Opens a QFileDialog for the user to browse to or create a directory for
@@ -339,7 +366,7 @@ AdvancedPage::browseTorDataDirectory()
ui.lineTorDataDirectory->text());
if (!dataDir.isEmpty())
- ui.lineTorDataDirectory->setText(dataDir);
+ ui.lineTorDataDirectory->setText(QDir::toNativeSeparators(dataDir));
}
/** Opens a QFileDialog for the user to browse to or create a socket path to
@@ -399,6 +426,7 @@ AdvancedPage::displayTorrcDialog()
{
TorrcDialog rcdialog(this);
rcdialog.exec();
+ emit reloadAll();
}
void
@@ -432,4 +460,47 @@ AdvancedPage::toggleAuto(bool)
ui.lineControlAddress->setVisible(!ui.chkAuto->isChecked());
ui.label->setVisible(!ui.chkAuto->isChecked());
ui.lineControlPort->setVisible(!ui.chkAuto->isChecked());
+ if (ui.lineControlPort->text() == "0")
+ ui.lineControlPort->setText("9051");
+}
+
+void
+AdvancedPage::displayWarning(bool checked)
+{
+ ui.lblWarn->setVisible(!checked and
+ indexToAuthMethod(ui.cmbAuthMethod->currentIndex()) ==
+ TorSettings::PasswordAuth);
+}
+
+/** Opens a QFileDialog for the user to browse to or create a directory for
+ * Tor's DataDirectory. */
+void
+AdvancedPage::browsePanicPath()
+{
+ QString panicPath = QFileDialog::getExistingDirectory(this,
+ tr("Select a Directory to Use for Panic"),
+ ui.linePanicPath->text());
+
+ if (!panicPath.isEmpty())
+ ui.linePanicPath->setText(panicPath);
+}
+
+/** Hides the specified group */
+void
+AdvancedPage::hideGroup(ConfigGroup group)
+{
+ switch(group) {
+ case Control:
+ ui.grpControlPort->hide();
+ break;
+ case ConfigurationFile:
+ ui.grpTorConfigFile->hide();
+ break;
+ case DataDirectory:
+ ui.grpTorDataDirectory->hide();
+ break;
+ case Panic:
+ ui.grpPanic->hide();
+ break;
+ }
}
diff --git a/src/vidalia/config/AdvancedPage.h b/src/vidalia/config/AdvancedPage.h
index d18d0d4..11cd6b6 100644
--- a/src/vidalia/config/AdvancedPage.h
+++ b/src/vidalia/config/AdvancedPage.h
@@ -28,6 +28,13 @@ class AdvancedPage : public ConfigPage
Q_OBJECT
public:
+ enum ConfigGroup {
+ Control,
+ ConfigurationFile,
+ DataDirectory,
+ Panic
+ };
+
/** Default Constructor */
AdvancedPage(QWidget *parent = 0);
/** Default Destructor */
@@ -50,6 +57,9 @@ public:
/** Called when the user changes the UI translation. */
virtual void retranslateUi();
+ /** Hides the specified group */
+ void hideGroup(ConfigGroup group);
+
signals:
/** Emitted when the user changes torrc file to restart Tor */
void restartTor();
@@ -67,6 +77,9 @@ private slots:
/** Called when the user clicks "Browse" to choose the location of Tor's
* socket path. */
void browseSocketPath();
+ /** Called when the user clicks "Browse" to choose location of Tor config
+ * file */
+ void browsePanicPath();
/** Called when the user changes from ControlPort to ControlSocket or
* the other way aroud */
void toggleControl(bool);
@@ -78,6 +91,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..7237d8f 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>619</width>
+ <height>608</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>
@@ -24,12 +30,12 @@
</property>
<layout class="QVBoxLayout">
<item>
- <layout class="QGridLayout">
+ <layout class="QGridLayout" name="grid_layout_1">
<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,18 @@
</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="minimumSize">
+ <size>
+ <width>0</width>
+ <height>18</height>
+ </size>
+ </property>
<property name="text">
<string>Use TCP connection (ControlPort)</string>
</property>
@@ -205,8 +223,20 @@
</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="minimumSize">
+ <size>
+ <width>0</width>
+ <height>18</height>
+ </size>
+ </property>
<property name="text">
<string>Use Unix domain socket (ControlSocket)</string>
</property>
@@ -222,7 +252,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 +261,27 @@
</item>
</layout>
</item>
+ <item>
+ <widget class="QLabel" name="lblWarn">
+ <property name="text">
+ <string><b>WARNING</b>: 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 +335,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 +353,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 +372,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 +427,74 @@
</widget>
</item>
<item>
- <spacer>
+ <widget class="QGroupBox" name="grpPanic">
+ <property name="title">
+ <string>Panic</string>
+ </property>
+ <layout class="QGridLayout" name="gridLayout">
+ <item row="3" column="1" colspan="2">
+ <widget class="QLabel" name="lblPanicWarn">
+ <property name="text">
+ <string><b>WARNING</b>: The panic button will erease the application if pressed</string>
+ </property>
+ </widget>
+ </item>
+ <item row="6" column="0" colspan="2">
+ <widget class="QLineEdit" name="linePanicPath">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ </widget>
+ </item>
+ <item row="6" column="2">
+ <widget class="QPushButton" name="btnBrowsePanicPath">
+ <property name="text">
+ <string>Browse</string>
+ </property>
+ </widget>
+ </item>
+ <item row="3" column="0">
+ <widget class="QCheckBox" name="chkEnablePanic">
+ <property name="text">
+ <string>Enable panic button</string>
+ </property>
+ </widget>
+ </item>
+ <item row="5" column="0" colspan="2">
+ <widget class="QLabel" name="lblPanicPath">
+ <property name="text">
+ <string>Panic path:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="4" column="1">
+ <spacer name="horizontalSpacer_2">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>40</width>
+ <height>1</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ </layout>
+ </widget>
+ </item>
+ <item>
+ <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>
@@ -399,5 +511,70 @@
<tabstop>btnBrowseTorDataDirectory</tabstop>
</tabstops>
<resources/>
- <connections/>
+ <connections>
+ <connection>
+ <sender>chkEnablePanic</sender>
+ <signal>toggled(bool)</signal>
+ <receiver>lblPanicWarn</receiver>
+ <slot>setVisible(bool)</slot>
+ <hints>
+ <hint type="sourcelabel">
+ <x>319</x>
+ <y>448</y>
+ </hint>
+ <hint type="destinationlabel">
+ <x>316</x>
+ <y>472</y>
+ </hint>
+ </hints>
+ </connection>
+ <connection>
+ <sender>chkEnablePanic</sender>
+ <signal>toggled(bool)</signal>
+ <receiver>lblPanicPath</receiver>
+ <slot>setVisible(bool)</slot>
+ <hints>
+ <hint type="sourcelabel">
+ <x>319</x>
+ <y>448</y>
+ </hint>
+ <hint type="destinationlabel">
+ <x>274</x>
+ <y>496</y>
+ </hint>
+ </hints>
+ </connection>
+ <connection>
+ <sender>chkEnablePanic</sender>
+ <signal>toggled(bool)</signal>
+ <receiver>linePanicPath</receiver>
+ <slot>setVisible(bool)</slot>
+ <hints>
+ <hint type="sourcelabel">
+ <x>319</x>
+ <y>448</y>
+ </hint>
+ <hint type="destinationlabel">
+ <x>274</x>
+ <y>529</y>
+ </hint>
+ </hints>
+ </connection>
+ <connection>
+ <sender>chkEnablePanic</sender>
+ <signal>toggled(bool)</signal>
+ <receiver>btnBrowsePanicPath</receiver>
+ <slot>setVisible(bool)</slot>
+ <hints>
+ <hint type="sourcelabel">
+ <x>319</x>
+ <y>448</y>
+ </hint>
+ <hint type="destinationlabel">
+ <x>568</x>
+ <y>531</y>
+ </hint>
+ </hints>
+ </connection>
+ </connections>
</ui>
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.cpp b/src/vidalia/config/ConfigDialog.cpp
index 5bc34a4..f87e1ab 100644
--- a/src/vidalia/config/ConfigDialog.cpp
+++ b/src/vidalia/config/ConfigDialog.cpp
@@ -19,7 +19,6 @@
#include "ServerPage.h"
#include "AdvancedPage.h"
#include "AppearancePage.h"
-#include "ServicePage.h"
#include "VMessageBox.h"
#include "ServerSettings.h"
#include "NetworkSettings.h"
@@ -67,6 +66,8 @@ ConfigDialog::ConfigDialog(QWidget* parent)
/* Used to connect restartTor signals */
AdvancedPage *advancedPage;
+ /* Used to connect configChanged signals */
+ ServerPage *serverPage;
/* Create the config pages and actions */
QActionGroup *grp = new QActionGroup(this);
GeneralPage *generalPage = new GeneralPage(ui.stackPages);
@@ -80,14 +81,10 @@ ConfigDialog::ConfigDialog(QWidget* parent)
createPageAction(QIcon(IMAGE_NETWORK),
tr("Network"), "Network", grp));
- ui.stackPages->add(new ServerPage(ui.stackPages),
+ ui.stackPages->add(serverPage = new ServerPage(ui.stackPages),
createPageAction(QIcon(IMAGE_SERVER),
tr("Sharing"), "Sharing", grp));
- ui.stackPages->add(new ServicePage(ui.stackPages),
- createPageAction(QIcon(IMAGE_SERVICE),
- tr("Services"), "Services", grp));
-
ui.stackPages->add(new AppearancePage(ui.stackPages),
createPageAction(QIcon(IMAGE_APPEARANCE),
tr("Appearance"), "Appearance", grp));
@@ -97,10 +94,13 @@ ConfigDialog::ConfigDialog(QWidget* parent)
tr("Advanced"), "Advanced", grp));
connect(advancedPage, SIGNAL(restartTor()), this, SIGNAL(restartTor()));
+ connect(serverPage, SIGNAL(configChanged()), this, SIGNAL(configChanged()));
foreach (ConfigPage *page, ui.stackPages->pages()) {
connect(page, SIGNAL(helpRequested(QString)),
this, SLOT(help(QString)));
+ connect(page, SIGNAL(reloadAll()),
+ this, SLOT(loadSettings()));
}
/* Create the toolbar */
@@ -204,10 +204,8 @@ ConfigDialog::saveChanges()
return;
}
}
- if (Vidalia::torControl()->isConnected())
- applyChanges();
- else
- close();
+
+ applyChanges();
}
/** Called after Vidalia has authenticated to Tor and applies any changes
@@ -243,8 +241,7 @@ ConfigDialog::applyChanges()
}
appliedChanges = true;
}
- if (appliedChanges)
- saveConf();
+
close();
}
@@ -277,8 +274,6 @@ ConfigDialog::help()
help("config.appearance"); break;
case Advanced:
help("config.advanced"); break;
- case Service:
- help("config.services"); break;
default:
help("config.general"); break;
}
diff --git a/src/vidalia/config/ConfigDialog.h b/src/vidalia/config/ConfigDialog.h
index 4804c1e..3369200 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 */
@@ -51,6 +51,8 @@ signals:
void checkForUpdates();
/** Emitted when the user changes torrc file to restart Tor */
void restartTor();
+ /** Emitted when user changes server configuration */
+ void configChanged();
protected:
/** Called when the user changes the UI translation. */
@@ -76,10 +78,10 @@ private slots:
/** Stub method that relays the checkForUpdates() signal from the General
* settings page to the owner of the config dialog (MainWindow). */
void onCheckForUpdates();
-
-private:
/** Loads the current configuration settings */
void loadSettings();
+
+private:
/** Creates a new action for a config page. */
QAction* createPageAction(const QIcon &img, const QString &text,
const QString &data, QActionGroup *group);
diff --git a/src/vidalia/config/ConfigPage.h b/src/vidalia/config/ConfigPage.h
index 0046606..3e1e4dc 100644
--- a/src/vidalia/config/ConfigPage.h
+++ b/src/vidalia/config/ConfigPage.h
@@ -62,6 +62,12 @@ signals:
* <b>topic</b>. */
void helpRequested(const QString &topic);
+ /** Emitted when all the settings need to be reloaded */
+ void reloadAll();
+
+ /** Emitted when user changes server configuration */
+ void configChanged();
+
private:
QString _title; /**< Title of this configuration page. */
};
diff --git a/src/vidalia/config/DefaultSettings.cpp b/src/vidalia/config/DefaultSettings.cpp
new file mode 100644
index 0000000..db89d60
--- /dev/null
+++ b/src/vidalia/config/DefaultSettings.cpp
@@ -0,0 +1,20 @@
+#include "DefaultSettings.h"
+#include "Vidalia.h"
+
+DefaultSettings::DefaultSettings()
+{
+ _settings = new QSettings(Vidalia::dataDirectory() + "/vidalia.defaults.conf",
+ QSettings::InitFormat);
+}
+
+DefaultSettings::~DefaultSettings()
+{
+ delete _settings;
+}
+
+QVariant
+DefaultSettings::getDefault(const QString &key,
+ const QVariant &defaultVal = QVariant()) const
+{
+ return _settings->value(key, defaultVal);
+}
diff --git a/src/vidalia/config/DefaultSettings.h b/src/vidalia/config/DefaultSettings.h
new file mode 100644
index 0000000..7611c9f
--- /dev/null
+++ b/src/vidalia/config/DefaultSettings.h
@@ -0,0 +1,37 @@
+/*
+** 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 DefaultSettings.h
+** \brief
+*/
+
+#ifndef _DEFAULTSETTINGS_H
+#define _DEFAULTSETTINGS_H
+
+#include <QSettings>
+
+class DefaultSettings
+{
+ public:
+ /** Default constructor. */
+ DefaultSettings();
+ /** Default desrtuctor */
+ ~DefaultSettings();
+
+ /** Return the stored default value */
+ QVariant getDefault(const QString &key,
+ const QVariant &defaultVal = QVariant()) const;
+
+ private:
+ QSettings *_settings;
+};
+
+#endif
diff --git a/src/vidalia/config/GeneralPage.cpp b/src/vidalia/config/GeneralPage.cpp
index 6b0a1ba..f6d2668 100644
--- a/src/vidalia/config/GeneralPage.cpp
+++ b/src/vidalia/config/GeneralPage.cpp
@@ -35,8 +35,6 @@ GeneralPage::GeneralPage(QWidget *parent)
/* Bind event to actions */
connect(ui.btnBrowseTorExecutable, SIGNAL(clicked()),
this, SLOT(browseTorExecutable()));
- connect(ui.btnBrowseProxyExecutable, SIGNAL(clicked()),
- this, SLOT(browseProxyExecutable()));
connect(ui.btnUpdateNow, SIGNAL(clicked()), this, SLOT(updateNow()));
#if !defined(Q_OS_WIN32)
@@ -95,17 +93,6 @@ GeneralPage::browseTorExecutable()
ui.lineTorExecutable->setText(filePath);
}
-/** Open a QFileDialog to browse for a proxy executable file. */
-void
-GeneralPage::browseProxyExecutable()
-{
- QString filePath = browseExecutable(tr("Select Proxy Executable"),
- ui.lineProxyExecutable->text());
-
- if (! filePath.isEmpty())
- ui.lineProxyExecutable->setText(filePath);
-}
-
/** Saves all settings for this page */
bool
GeneralPage::save(QString &errmsg)
@@ -115,18 +102,11 @@ GeneralPage::save(QString &errmsg)
errmsg = tr("You must specify the name of your Tor executable.");
return false;
}
- if (ui.chkRunProxyAtTorStartup->isChecked()) {
- _vidaliaSettings->setProxyExecutable(ui.lineProxyExecutable->text());
- _vidaliaSettings->setProxyExecutableArguments(
- ui.lineProxyExecutableArguments->text());
- }
_torSettings->setExecutable(torExecutable);
_vidaliaSettings->setRunTorAtStart(ui.chkRunTorAtVidaliaStartup->isChecked());
_vidaliaSettings->setRunVidaliaOnBoot(
ui.chkRunVidaliaAtSystemStartup->isChecked());
- _vidaliaSettings->setRunProxyAtStart(
- ui.chkRunProxyAtTorStartup->isChecked());
return true;
}
@@ -139,11 +119,6 @@ GeneralPage::load()
ui.lineTorExecutable->setText(_torSettings->getExecutable());
ui.chkRunTorAtVidaliaStartup->setChecked(_vidaliaSettings->runTorAtStart());
-
- ui.lineProxyExecutable->setText(_vidaliaSettings->getProxyExecutable());
- ui.lineProxyExecutableArguments->setText(
- _vidaliaSettings->getProxyExecutableArguments());
- ui.chkRunProxyAtTorStartup->setChecked(_vidaliaSettings->runProxyAtStart());
}
void
diff --git a/src/vidalia/config/GeneralPage.h b/src/vidalia/config/GeneralPage.h
index e7bdbff..7809f1b 100644
--- a/src/vidalia/config/GeneralPage.h
+++ b/src/vidalia/config/GeneralPage.h
@@ -47,8 +47,6 @@ signals:
private slots:
/** Open a QFileDialog to browse for a Tor executable file. */
void browseTorExecutable();
- /** Open a QFileDialog to browse for a proxy executable file. */
- void browseProxyExecutable();
/** Initiate an immediate check for software updates. */
void updateNow();
diff --git a/src/vidalia/config/GeneralPage.ui b/src/vidalia/config/GeneralPage.ui
index 80cc819..af26eb7 100644
--- a/src/vidalia/config/GeneralPage.ui
+++ b/src/vidalia/config/GeneralPage.ui
@@ -1,71 +1,72 @@
-<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>
- <width>492</width>
+ <width>494</width>
<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,97 +77,24 @@
</widget>
</item>
<item>
- <widget class="QGroupBox" name="grpProxyExecutable" >
- <property name="sizePolicy" >
- <sizepolicy vsizetype="Preferred" hsizetype="Preferred" >
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="minimumSize" >
- <size>
- <width>0</width>
- <height>0</height>
- </size>
- </property>
- <property name="title" >
- <string>Proxy Application (optional)</string>
- </property>
- <layout class="QVBoxLayout" name="verticalLayout_2" >
- <item>
- <widget class="QCheckBox" name="chkRunProxyAtTorStartup" >
- <property name="text" >
- <string>Start a proxy application when Tor starts</string>
- </property>
- <property name="checked" >
- <bool>true</bool>
- </property>
- </widget>
- </item>
- <item>
- <layout class="QHBoxLayout" >
- <item>
- <widget class="QLineEdit" name="lineProxyExecutable" >
- <property name="enabled" >
- <bool>true</bool>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QPushButton" name="btnBrowseProxyExecutable" >
- <property name="enabled" >
- <bool>true</bool>
- </property>
- <property name="text" >
- <string>Browse</string>
- </property>
- </widget>
- </item>
- </layout>
- </item>
- <item>
- <layout class="QHBoxLayout" >
- <item>
- <widget class="QLabel" name="lblProxyExecutableArguments" >
- <property name="enabled" >
- <bool>true</bool>
- </property>
- <property name="text" >
- <string>Proxy Application Arguments:</string>
- </property>
- </widget>
- </item>
- </layout>
- </item>
- <item>
- <widget class="QLineEdit" name="lineProxyExecutableArguments" >
- <property name="enabled" >
- <bool>true</bool>
- </property>
- </widget>
- </item>
- </layout>
- </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" >
+ <property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
@@ -175,11 +103,11 @@
</spacer>
</item>
<item>
- <spacer name="horizontalSpacer" >
- <property name="orientation" >
+ <spacer name="horizontalSpacer">
+ <property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
- <property name="sizeHint" >
+ <property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
@@ -188,8 +116,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>
@@ -198,11 +126,11 @@
</widget>
</item>
<item>
- <spacer name="verticalSpacer" >
- <property name="orientation" >
+ <spacer name="verticalSpacer">
+ <property name="orientation">
<enum>Qt::Vertical</enum>
</property>
- <property name="sizeHint" >
+ <property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
@@ -213,7 +141,7 @@
</layout>
</widget>
<resources>
- <include location="../res/vidalia.qrc" />
+ <include location="../res/vidalia.qrc"/>
</resources>
<connections/>
</ui>
diff --git a/src/vidalia/config/NetworkPage.cpp b/src/vidalia/config/NetworkPage.cpp
index 7d16fbd..ea132e6 100644
--- a/src/vidalia/config/NetworkPage.cpp
+++ b/src/vidalia/config/NetworkPage.cpp
@@ -38,6 +38,8 @@ NetworkPage::NetworkPage(QWidget *parent)
/* Invoke the Qt Designer generated object setup routine */
ui.setupUi(this);
+ _settings = new NetworkSettings(Vidalia::torControl());
+
connect(ui.btnAddBridge, SIGNAL(clicked()), this, SLOT(addBridge()));
connect(ui.btnRemoveBridge, SIGNAL(clicked()), this, SLOT(removeBridge()));
connect(ui.btnCopyBridge, SIGNAL(clicked()),
@@ -68,6 +70,12 @@ NetworkPage::NetworkPage(QWidget *parent)
#endif
}
+/** Default destructor */
+NetworkPage::~NetworkPage()
+{
+ delete _settings;
+}
+
/** Called when the user changes the UI translation. */
void
NetworkPage::retranslateUi()
@@ -81,7 +89,7 @@ NetworkPage::retranslateUi()
bool
NetworkPage::apply(QString &errmsg)
{
- return NetworkSettings(Vidalia::torControl()).apply(&errmsg);
+ return _settings->apply(&errmsg);
}
/** Returns true if the user has changed their server settings since the *
@@ -89,7 +97,7 @@ NetworkPage::apply(QString &errmsg)
bool
NetworkPage::changedSinceLastApply()
{
- return NetworkSettings(Vidalia::torControl()).changedSinceLastApply();
+ return _settings->changedSinceLastApply();
}
/** Reverts the server configuration settings to their values at the last *
@@ -97,8 +105,7 @@ NetworkPage::changedSinceLastApply()
void
NetworkPage::revert()
{
- NetworkSettings settings(Vidalia::torControl());
- settings.revert();
+ _settings->revert();
}
/** Called when a link in a label is clicked. <b>url</b> is the target of
@@ -181,7 +188,6 @@ NetworkPage::bridgeSelectionChanged()
bool
NetworkPage::save(QString &errmsg)
{
- NetworkSettings settings(Vidalia::torControl());
QString addr;
QString user, pass;
NetworkSettings::ProxyType proxy = NetworkSettings::NoProxy;
@@ -230,13 +236,13 @@ NetworkPage::save(QString &errmsg)
proxy = static_cast<NetworkSettings::ProxyType>(type);
}
- settings.setProxyType(proxy);
- settings.setProxyAddress(addr);
- settings.setProxyUsername(user);
- settings.setProxyPassword(pass);
+ _settings->setProxyType(proxy);
+ _settings->setProxyAddress(addr);
+ _settings->setProxyUsername(user);
+ _settings->setProxyPassword(pass);
/* Save the reachable port settings */
- settings.setFascistFirewall(ui.chkFascistFirewall->isChecked());
+ _settings->setFascistFirewall(ui.chkFascistFirewall->isChecked());
foreach (QString portString,
ui.lineReachablePorts->text().split(",", QString::SkipEmptyParts)) {
quint32 port = portString.toUInt(&ok);
@@ -246,7 +252,11 @@ NetworkPage::save(QString &errmsg)
}
reachablePorts << (quint16)port;
}
- settings.setReachablePorts(reachablePorts);
+ _settings->setReachablePorts(reachablePorts);
+
+ if (!ui.lineBridge->text().trimmed().isEmpty())
+ addBridge();
+
if (ui.chkUseBridges->isChecked()) {
if (ui.listBridges->count() < 1) {
@@ -256,10 +266,10 @@ NetworkPage::save(QString &errmsg)
}
/* Save the bridge settings */
- settings.setUseBridges(ui.chkUseBridges->isChecked());
+ _settings->setUseBridges(ui.chkUseBridges->isChecked());
for (int i = 0; i < ui.listBridges->count(); i++)
bridgeList << ui.listBridges->item(i)->text();
- settings.setBridgeList(bridgeList);
+ _settings->setBridgeList(bridgeList);
return true;
}
@@ -268,20 +278,19 @@ NetworkPage::save(QString &errmsg)
void
NetworkPage::load()
{
- NetworkSettings settings(Vidalia::torControl());
QStringList reachablePortStrings;
NetworkSettings::ProxyType proxyType;
/* Load proxy settings */
- proxyType = settings.getProxyType();
+ proxyType = _settings->getProxyType();
ui.chkUseProxy->setChecked(proxyType != NetworkSettings::NoProxy);
- QStringList proxy = settings.getProxyAddress().split(":");
+ QStringList proxy = _settings->getProxyAddress().split(":");
if (proxy.size() >= 1)
ui.lineProxyAddress->setText(proxy.at(0));
if (proxy.size() >= 2)
ui.lineProxyPort->setText(proxy.at(1));
- ui.lineProxyUsername->setText(settings.getProxyUsername());
- ui.lineProxyPassword->setText(settings.getProxyPassword());
+ ui.lineProxyUsername->setText(_settings->getProxyUsername());
+ ui.lineProxyPassword->setText(_settings->getProxyPassword());
/* SOCKS options are only available on Tor >= 0.2.2.1-alpha, so don't show
* them if Tor is running and its version is less than that. */
@@ -303,17 +312,17 @@ NetworkPage::load()
ui.cmboProxyType->setCurrentIndex(ui.cmboProxyType->findData(proxyType));
/* Load firewall settings */
- ui.chkFascistFirewall->setChecked(settings.getFascistFirewall());
- QList<quint16> reachablePorts = settings.getReachablePorts();
+ ui.chkFascistFirewall->setChecked(_settings->getFascistFirewall());
+ QList<quint16> reachablePorts = _settings->getReachablePorts();
foreach (quint16 port, reachablePorts) {
reachablePortStrings << QString::number(port);
}
ui.lineReachablePorts->setText(reachablePortStrings.join(","));
/* Load bridge settings */
- ui.chkUseBridges->setChecked(settings.getUseBridges());
+ ui.chkUseBridges->setChecked(_settings->getUseBridges());
ui.listBridges->clear();
- ui.listBridges->addItems(settings.getBridgeList());
+ ui.listBridges->addItems(_settings->getBridgeList());
}
/** Disable proxy username and password fields when the user wants to use
diff --git a/src/vidalia/config/NetworkPage.h b/src/vidalia/config/NetworkPage.h
index 0b94ef2..db52db7 100644
--- a/src/vidalia/config/NetworkPage.h
+++ b/src/vidalia/config/NetworkPage.h
@@ -20,6 +20,8 @@
#include "ConfigPage.h"
#include "Vidalia.h"
+class NetworkSettings;
+
#include <QPoint>
@@ -30,6 +32,8 @@ class NetworkPage : public ConfigPage
public:
/** Default Constructor */
NetworkPage(QWidget *parent = 0);
+ /** Defaults Destructor */
+ ~NetworkPage();
/** Saves the changes on this page */
bool save(QString &errmsg);
@@ -72,6 +76,8 @@ private slots:
private:
/** Qt Designer generated object */
Ui::NetworkPage ui;
+
+ NetworkSettings *_settings;
};
#endif
diff --git a/src/vidalia/config/NetworkSettings.cpp b/src/vidalia/config/NetworkSettings.cpp
index aaef16d..21c41c7 100644
--- a/src/vidalia/config/NetworkSettings.cpp
+++ b/src/vidalia/config/NetworkSettings.cpp
@@ -15,6 +15,8 @@
#include "NetworkSettings.h"
#include "TorControl.h"
+#include "Torrc.h"
+#include "Vidalia.h"
#define SETTING_FASCIST_FIREWALL "FascistFirewall"
#define SETTING_REACHABLE_ADDRESSES "ReachableAddresses"
@@ -62,12 +64,22 @@ NetworkSettings::NetworkSettings(TorControl *torControl)
bool
NetworkSettings::apply(QString *errmsg)
{
- QMultiHash<QString, QString> conf;
quint32 torVersion = torControl()->getTorVersion();
-
- conf.insert(SETTING_REACHABLE_ADDRESSES,
- (getFascistFirewall() ?
- localValue(SETTING_REACHABLE_ADDRESSES).toStringList().join(",") : ""));
+ // If there is no tor version, asume the greatest
+ if(not torVersion)
+ torVersion = 0xffffff;
+
+ Torrc *torrc = Vidalia::torrc();
+ QStringList clearKeys;
+
+ if(volatileValue(SETTING_FASCIST_FIREWALL).toBool()) {
+ torrc->setValue(SETTING_FASCIST_FIREWALL, "1");
+ torrc->setValue(SETTING_REACHABLE_ADDRESSES,
+ volatileValue(SETTING_REACHABLE_ADDRESSES).toStringList().join(","));
+ } else {
+ torrc->setValue(SETTING_FASCIST_FIREWALL, "0");
+ clearKeys << SETTING_REACHABLE_ADDRESSES;
+ }
QString socks4, socks5, http, https;
QString addr, user, pass, auth;
@@ -94,45 +106,58 @@ NetworkSettings::apply(QString *errmsg)
break;
}
- if (torVersion >= 0x020201) {
- /* SOCKS support was implemented in 0.2.2.1 */
- conf.insert(SETTING_SOCKS4_PROXY, socks4);
- conf.insert(SETTING_SOCKS5_PROXY, socks5);
- conf.insert(SETTING_SOCKS5_USERNAME, user);
- conf.insert(SETTING_SOCKS5_PASSWORD, pass);
- }
+ if(getProxyType() != NoProxy) {
+ if (torVersion >= 0x020201) {
+ /* SOCKS support was implemented in 0.2.2.1 */
+ torrc->setValue(SETTING_SOCKS4_PROXY, socks4);
+ torrc->setValue(SETTING_SOCKS5_PROXY, socks5);
+ torrc->setValue(SETTING_SOCKS5_USERNAME, user);
+ torrc->setValue(SETTING_SOCKS5_PASSWORD, pass);
+ }
- conf.insert(SETTING_HTTPS_PROXY, https);
- conf.insert(SETTING_HTTPS_PROXY_AUTH, auth);
+ torrc->setValue(SETTING_HTTPS_PROXY, https);
+ torrc->setValue(SETTING_HTTPS_PROXY_AUTH, auth);
+ } else {
+ clearKeys << SETTING_SOCKS4_PROXY
+ << SETTING_SOCKS5_PROXY
+ << SETTING_SOCKS5_USERNAME
+ << SETTING_SOCKS5_PASSWORD
+ << SETTING_HTTPS_PROXY
+ << SETTING_HTTPS_PROXY_AUTH;
+ }
- if (getUseBridges()) {
+ bool useBridges = volatileValue(SETTING_USE_BRIDGES, false).toBool();
+ if (useBridges) {
/* We want to always enable TunnelDirConns and friends when using
* bridge relays. */
- conf.insert(SETTING_TUNNEL_DIR_CONNS, "1");
- conf.insert(SETTING_PREFER_TUNNELED_DIR_CONNS, "1");
+ torrc->setValue(SETTING_TUNNEL_DIR_CONNS, "1");
+ torrc->setValue(SETTING_PREFER_TUNNELED_DIR_CONNS, "1");
} else if (torVersion <= 0x020021) {
/* TunnelDirConns is enabled by default on Tor >= 0.2.0.22-rc, so don't
* disable it if our Tor is recent enough. */
- conf.insert(SETTING_TUNNEL_DIR_CONNS, "0");
- conf.insert(SETTING_PREFER_TUNNELED_DIR_CONNS, "0");
+ torrc->setValue(SETTING_TUNNEL_DIR_CONNS, "0");
+ torrc->setValue(SETTING_PREFER_TUNNELED_DIR_CONNS, "0");
}
if (torVersion >= 0x020003) {
/* Do the bridge stuff only on Tor >= 0.2.0.3-alpha */
- QStringList bridges = localValue(SETTING_BRIDGE_LIST).toStringList();
- if (getUseBridges() && !bridges.isEmpty()) {
- conf.insert(SETTING_USE_BRIDGES, "1");
- conf.insert(SETTING_UPDATE_BRIDGES, "1");
+ QStringList bridges = volatileValue(SETTING_BRIDGE_LIST).toStringList();
+ if (useBridges && !bridges.isEmpty()) {
+ torrc->setValue(SETTING_USE_BRIDGES, "1");
+ torrc->setValue(SETTING_UPDATE_BRIDGES, "1");
foreach (QString bridge, bridges) {
- conf.insert(SETTING_BRIDGE_LIST, bridge);
+ torrc->setValue(SETTING_BRIDGE_LIST, bridge);
}
} else {
- conf.insert(SETTING_USE_BRIDGES, "0");
- conf.insert(SETTING_BRIDGE_LIST, "");
- conf.insert(SETTING_UPDATE_BRIDGES, "0");
+ torrc->setValue(SETTING_USE_BRIDGES, "0");
+ torrc->setValue(SETTING_UPDATE_BRIDGES, "0");
+ clearKeys << SETTING_BRIDGE_LIST;
}
}
- return torControl()->setConf(conf, errmsg);
+
+ torrc->clear(clearKeys);
+
+ return torrc->apply(torControl(), errmsg);
}
/** Returns true if we need to set ReachableAddresses because we're behind a
@@ -140,7 +165,12 @@ NetworkSettings::apply(QString *errmsg)
bool
NetworkSettings::getFascistFirewall()
{
- return localValue(SETTING_FASCIST_FIREWALL).toBool();
+ QStringList ret = Vidalia::torrc()->value(SETTING_FASCIST_FIREWALL);
+ bool val = false;
+
+ if(ret.size() > 0)
+ val = ret.at(0) == "1";
+ return val;
}
/** Sets to <b>fascistFirewall</b> whether Tor should only create outgoing
@@ -149,7 +179,7 @@ NetworkSettings::getFascistFirewall()
void
NetworkSettings::setFascistFirewall(bool fascistFirewall)
{
- setValue(SETTING_FASCIST_FIREWALL, fascistFirewall);
+ setVolatileValue(SETTING_FASCIST_FIREWALL, QVariant(fascistFirewall));
}
/** Returns a list of ports to be specified in ReachableAddresses. */
@@ -160,7 +190,8 @@ NetworkSettings::getReachablePorts()
QStringList lineList;
bool ok;
- lineList = value(SETTING_REACHABLE_ADDRESSES).toStringList();
+ lineList = Vidalia::torrc()->value(SETTING_REACHABLE_ADDRESSES);
+
foreach (QString line, lineList) {
foreach (QString address, line.split(",", QString::SkipEmptyParts)) {
QStringList parts = address.split(":");
@@ -184,7 +215,7 @@ NetworkSettings::setReachablePorts(const QList<quint16> &reachablePorts)
foreach (quint16 port, reachablePorts) {
portList << "*:" + QString::number(port);
}
- setValue(SETTING_REACHABLE_ADDRESSES, portList);
+ setVolatileValue(SETTING_REACHABLE_ADDRESSES, portList);
}
}
@@ -251,7 +282,11 @@ NetworkSettings::setProxyPassword(const QString &pass)
bool
NetworkSettings::getUseBridges()
{
- return value(SETTING_USE_BRIDGES).toBool();
+ QStringList ret = Vidalia::torrc()->value(SETTING_USE_BRIDGES);
+ bool val = false;
+ if(ret.size() > 0)
+ val = ret.at(0) == "1";
+ return val;
}
/** Sets to <b>useBridges</b> whether Tor should try to use bridge nodes
@@ -259,21 +294,21 @@ NetworkSettings::getUseBridges()
void
NetworkSettings::setUseBridges(bool useBridges)
{
- setValue(SETTING_USE_BRIDGES, useBridges);
+ setVolatileValue(SETTING_USE_BRIDGES, useBridges);
}
/** Returns a list of bridge nodes Tor should use. */
QStringList
NetworkSettings::getBridgeList()
{
- return value(SETTING_BRIDGE_LIST).toStringList();
+ return Vidalia::torrc()->value(SETTING_BRIDGE_LIST);
}
/** Sets to <b>bridgeList</b> the list of bridge nodes Tor should use. */
void
NetworkSettings::setBridgeList(const QStringList &bridgeList)
{
- setValue(SETTING_BRIDGE_LIST, bridgeList);
+ setVolatileValue(SETTING_BRIDGE_LIST, bridgeList);
}
/** Returns true if Tor is configured to try to tunnel its directory
@@ -281,7 +316,11 @@ NetworkSettings::setBridgeList(const QStringList &bridgeList)
bool
NetworkSettings::getTunnelDirConns()
{
- return value(SETTING_TUNNEL_DIR_CONNS).toBool();
+ QStringList ret = Vidalia::torrc()->value(SETTING_TUNNEL_DIR_CONNS);
+ bool val = true;
+ if(ret.size() > 0)
+ val = ret.at(0) == "1";
+ return val;
}
/** Converts the ProxyType <b>type</b> to a string to store in the
diff --git a/src/vidalia/config/ServerPage.cpp b/src/vidalia/config/ServerPage.cpp
index 6fabc90..31660a4 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)),
@@ -106,6 +106,11 @@ ServerPage::ServerPage(QWidget *parent)
connect(ui.lblWhatsThis, SIGNAL(linkActivated(QString)),
this, SLOT(linkActivated(QString)));
+ connect(ui.chkAccounting, SIGNAL(stateChanged(int)),
+ this, SLOT(toggleAccounting(int)));
+ connect(ui.cmbTime, SIGNAL(currentIndexChanged(const QString &)),
+ this, SLOT(toggleDisplayDay(const QString &)));
+
/* Set validators for address, mask and various port number fields */
ui.lineServerNickname->setValidator(new NicknameValidator(this));
ui.lineServerPort->setValidator(new QIntValidator(1, 65535, this));
@@ -229,9 +234,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 +255,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
@@ -278,7 +284,13 @@ ServerPage::changedSinceLastApply()
bool
ServerPage::apply(QString &errmsg)
{
- return _settings->apply(&errmsg);
+ if (_settings->apply(&errmsg)) {
+ /* Emits signal used to set Vidalia window title in MainWindow */
+ emit configChanged();
+ return true;
+ }
+
+ return false;
}
/** Returns true if the user has changed their server settings since the
@@ -317,8 +329,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())
@@ -337,6 +349,16 @@ ServerPage::save(QString &errmsg)
saveBandwidthLimits();
saveExitPolicies();
+ if(ui.chkAccounting->checkState() != Qt::Checked)
+ _settings->disableAccounting();
+ else {
+ _settings->setAccountingMax(ui.spnAmount->value(),
+ ui.cmbUnit->currentText());
+ _settings->setAccountingStart(ui.cmbTime->currentText(),
+ ui.spnDay->value(),
+ ui.spnTime->text());
+ }
+
#if defined(USE_MINIUPNPC)
_settings->setUpnpEnabled(ui.chkEnableUpnp->isChecked());
#endif
@@ -376,6 +398,19 @@ ServerPage::load()
loadExitPolicies();
loadBridgeIdentity();
+ ui.chkAccounting->setCheckState(Qt::Unchecked);
+ toggleAccounting(Qt::Unchecked);
+
+ if(_settings->isAccountingEnabled()) {
+ ui.chkAccounting->setCheckState(Qt::Checked);
+ ui.spnAmount->setValue(_settings->accountingMaxAmount());
+ ui.cmbUnit->setCurrentIndex(ui.cmbUnit->findText(_settings->accountingMaxUnit()));
+ ui.cmbTime->setCurrentIndex(ui.cmbTime->findText(_settings->accountingStartDwm()));
+ if(ui.spnDay->isVisible())
+ ui.spnDay->setValue(_settings->accountingStartDay());
+ ui.spnTime->setTime(QTime::fromString(_settings->accountingStartTime(), "h:mm"));
+ }
+
#if defined(USE_MINIUPNPC)
ui.chkEnableUpnp->setChecked(_settings->isUpnpEnabled());
#endif
@@ -506,8 +541,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 +572,6 @@ ServerPage::saveExitPolicies()
exitPolicy->addPolicy(Policy(Policy::RejectAll));
}
}
-
_settings->setExitPolicy(*exitPolicy);
}
@@ -681,3 +715,44 @@ err:
dlg.exec();
}
+void
+ServerPage::toggleAccounting(int state)
+{
+ if(state == Qt::Checked) {
+ ui.lblPush->setVisible(true);
+ ui.spnAmount->setVisible(true);
+ ui.cmbUnit->setVisible(true);
+ ui.lblPer->setVisible(true);
+ ui.cmbTime->setVisible(true);
+ if(ui.cmbTime->currentText() == "month" or
+ ui.cmbTime->currentText() == "week") {
+ ui.spnDay->setVisible(true);
+ ui.lblDay->setVisible(true);
+ }
+ ui.lblAt->setVisible(true);
+ ui.spnTime->setVisible(true);
+ ui.lblTime->setVisible(true);
+ } else {
+ ui.lblPush->setVisible(false);
+ ui.spnAmount->setVisible(false);
+ ui.cmbUnit->setVisible(false);
+ ui.lblPer->setVisible(false);
+ ui.cmbTime->setVisible(false);
+ ui.spnDay->setVisible(false);
+ ui.lblDay->setVisible(false);
+ ui.lblTime->setVisible(false);
+ ui.lblAt->setVisible(false);
+ ui.spnTime->setVisible(false);
+ }
+}
+
+void
+ServerPage::toggleDisplayDay(const QString &str)
+{
+ ui.spnDay->setVisible(str == "month" or str == "week");
+ ui.spnDay->setMinimum(1);
+ if(str == "month")
+ ui.spnDay->setMaximum(28);
+ else
+ ui.spnDay->setMaximum(7);
+}
diff --git a/src/vidalia/config/ServerPage.h b/src/vidalia/config/ServerPage.h
index 82b8bc6..b906a1f 100644
--- a/src/vidalia/config/ServerPage.h
+++ b/src/vidalia/config/ServerPage.h
@@ -82,6 +82,11 @@ private slots:
/** Called when the user clicks on a QLabel containing a hyperlink. */
void linkActivated(const QString &url);
+ /** Called when the user toggles the Enable Accounting checkbox */
+ void toggleAccounting(int state);
+ /** Called when the user selects a new item from cmbTime */
+ void toggleDisplayDay(const QString &str);
+
private:
/** Index values of rate values in the bandwidth limits dropdown box. */
enum BwRateIndex {
diff --git a/src/vidalia/config/ServerPage.ui b/src/vidalia/config/ServerPage.ui
index 0f98560..f26f7e4 100644
--- a/src/vidalia/config/ServerPage.ui
+++ b/src/vidalia/config/ServerPage.ui
@@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>548</width>
- <height>578</height>
+ <width>704</width>
+ <height>688</height>
</rect>
</property>
<property name="contextMenuPolicy">
@@ -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,27 +536,43 @@ 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>
+ <layout class="QGridLayout" name="gridLayout_2">
+ <item row="0" column="2" colspan="6">
<layout class="QVBoxLayout">
<item>
- <widget class="QLabel" name="label_2">
+ <widget class="QLabel" name="label_5">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
+ <property name="maximumSize">
+ <size>
+ <width>100</width>
+ <height>20</height>
+ </size>
+ </property>
<property name="text">
- <string>Average Rate</string>
+ <string>Maximum Rate</string>
</property>
</widget>
</item>
<item>
<layout class="QHBoxLayout">
<item>
- <widget class="QLineEdit" name="lineAvgRateLimit">
+ <widget class="QLineEdit" name="lineMaxRateLimit">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
<horstretch>0</horstretch>
@@ -579,11 +582,11 @@ problem with your relay. You might also include your PGP or GPG fingerprint.</st
<property name="maximumSize">
<size>
<width>60</width>
- <height>22</height>
+ <height>20</height>
</size>
</property>
<property name="toolTip">
- <string>Long-term average bandwidth limit</string>
+ <string>Peak bandwidth rate limit</string>
</property>
<property name="maxLength">
<number>12</number>
@@ -594,41 +597,51 @@ problem with your relay. You might also include your PGP or GPG fingerprint.</st
</widget>
</item>
<item>
- <widget class="QLabel" name="label_6">
+ <widget class="QLabel" name="label_7">
<property name="text">
<string>KB/s</string>
</property>
</widget>
</item>
+ <item>
+ <spacer>
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeType">
+ <enum>QSizePolicy::Expanding</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>71</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
</layout>
</item>
</layout>
</item>
- <item>
+ <item row="0" column="0" colspan="2">
<layout class="QVBoxLayout">
<item>
- <widget class="QLabel" name="label_5">
+ <widget class="QLabel" name="label_2">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="maximumSize">
- <size>
- <width>100</width>
- <height>20</height>
- </size>
- </property>
<property name="text">
- <string>Maximum Rate</string>
+ <string>Average Rate</string>
</property>
</widget>
</item>
<item>
<layout class="QHBoxLayout">
<item>
- <widget class="QLineEdit" name="lineMaxRateLimit">
+ <widget class="QLineEdit" name="lineAvgRateLimit">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
<horstretch>0</horstretch>
@@ -638,11 +651,11 @@ problem with your relay. You might also include your PGP or GPG fingerprint.</st
<property name="maximumSize">
<size>
<width>60</width>
- <height>20</height>
+ <height>22</height>
</size>
</property>
<property name="toolTip">
- <string>Peak bandwidth rate limit</string>
+ <string>Long-term average bandwidth limit</string>
</property>
<property name="maxLength">
<number>12</number>
@@ -653,46 +666,223 @@ problem with your relay. You might also include your PGP or GPG fingerprint.</st
</widget>
</item>
<item>
- <widget class="QLabel" name="label_7">
+ <widget class="QLabel" name="label_6">
<property name="text">
<string>KB/s</string>
</property>
</widget>
</item>
- <item>
- <spacer>
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeType">
- <enum>QSizePolicy::Expanding</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>71</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- </item>
</layout>
</item>
</layout>
</item>
</layout>
</item>
- <item row="0" column="0">
- <widget class="QLabel" name="label_8">
+ </layout>
+ </widget>
+ </item>
+ <item>
+ <layout class="QGridLayout" name="gridLayout_3">
+ <item row="1" column="4">
+ <widget class="QComboBox" name="cmbTime">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="maximumSize">
+ <size>
+ <width>80</width>
+ <height>16777215</height>
+ </size>
+ </property>
+ <item>
<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>
+ <string>day</string>
</property>
- <property name="wordWrap">
- <bool>true</bool>
+ </item>
+ <item>
+ <property name="text">
+ <string>week</string>
</property>
- </widget>
- </item>
- </layout>
- </widget>
+ </item>
+ <item>
+ <property name="text">
+ <string>month</string>
+ </property>
+ </item>
+ </widget>
+ </item>
+ <item row="0" column="0" colspan="2">
+ <widget class="QCheckBox" name="chkAccounting">
+ <property name="text">
+ <string>Enable accounting</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="9">
+ <widget class="QTimeEdit" name="spnTime">
+ <property name="maximumSize">
+ <size>
+ <width>60</width>
+ <height>16777215</height>
+ </size>
+ </property>
+ <property name="displayFormat">
+ <string>h:mm</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="5">
+ <widget class="QLabel" name="lblAt">
+ <property name="maximumSize">
+ <size>
+ <width>20</width>
+ <height>16777215</height>
+ </size>
+ </property>
+ <property name="text">
+ <string>at</string>
+ </property>
+ <property name="alignment">
+ <set>Qt::AlignCenter</set>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="3">
+ <widget class="QLabel" name="lblPer">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="maximumSize">
+ <size>
+ <width>40</width>
+ <height>16777215</height>
+ </size>
+ </property>
+ <property name="text">
+ <string>per</string>
+ </property>
+ <property name="alignment">
+ <set>Qt::AlignCenter</set>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="7">
+ <widget class="QSpinBox" name="spnDay">
+ <property name="maximumSize">
+ <size>
+ <width>40</width>
+ <height>16777215</height>
+ </size>
+ </property>
+ <property name="minimum">
+ <number>1</number>
+ </property>
+ <property name="maximum">
+ <number>31</number>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="2">
+ <widget class="QComboBox" name="cmbUnit">
+ <property name="maximumSize">
+ <size>
+ <width>80</width>
+ <height>16777215</height>
+ </size>
+ </property>
+ <item>
+ <property name="text">
+ <string>bytes</string>
+ </property>
+ </item>
+ <item>
+ <property name="text">
+ <string>KB</string>
+ </property>
+ </item>
+ <item>
+ <property name="text">
+ <string>MB</string>
+ </property>
+ </item>
+ <item>
+ <property name="text">
+ <string>GB</string>
+ </property>
+ </item>
+ <item>
+ <property name="text">
+ <string>TB</string>
+ </property>
+ </item>
+ </widget>
+ </item>
+ <item row="1" column="0">
+ <widget class="QLabel" name="lblPush">
+ <property name="text">
+ <string>Push no more than</string>
+ </property>
+ <property name="alignment">
+ <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="8">
+ <widget class="QLabel" name="lblTime">
+ <property name="text">
+ <string>time</string>
+ </property>
+ <property name="alignment">
+ <set>Qt::AlignCenter</set>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="6">
+ <widget class="QLabel" name="lblDay">
+ <property name="maximumSize">
+ <size>
+ <width>50</width>
+ <height>16777215</height>
+ </size>
+ </property>
+ <property name="text">
+ <string>day</string>
+ </property>
+ <property name="alignment">
+ <set>Qt::AlignCenter</set>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="10">
+ <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>
+ <item row="1" column="1">
+ <widget class="QSpinBox" name="spnAmount">
+ <property name="minimum">
+ <number>1</number>
+ </property>
+ <property name="maximum">
+ <number>999999</number>
+ </property>
+ </widget>
+ </item>
+ </layout>
</item>
<item>
<spacer>
diff --git a/src/vidalia/config/ServerSettings.cpp b/src/vidalia/config/ServerSettings.cpp
index e4b7ead..25c7a80 100644
--- a/src/vidalia/config/ServerSettings.cpp
+++ b/src/vidalia/config/ServerSettings.cpp
@@ -20,6 +20,7 @@
#ifdef USE_MINIUPNPC
#include "UPNPControl.h"
#endif
+#include "Vidalia.h"
#include "net.h"
#include "stringutil.h"
@@ -48,7 +49,8 @@
#define SETTING_RELAY_BANDWIDTH_RATE "RelayBandwidthRate"
#define SETTING_RELAY_BANDWIDTH_BURST "RelayBandwidthBurst"
#define SETTING_PUBLISH_SERVER_DESCRIPTOR "PublishServerDescriptor"
-
+#define SETTING_ACCOUNTING_MAX "AccountingMax"
+#define SETTING_ACCOUNTING_START "AccountingStart"
/** Constructor.
* \param torControl a TorControl object used to read and apply the server
@@ -72,80 +74,73 @@ 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");
}
-/** Returns a QHash of Tor-recognizable configuratin keys to their current
- * values. */
-QHash<QString, QString>
-ServerSettings::confValues()
-{
- QHash<QString, QString> conf;
- quint32 torVersion = torControl()->getTorVersion();
-
- /* Server Nickname */
- conf.insert(SETTING_NICKNAME,
- (isServerEnabled() ? localValue(SETTING_NICKNAME).toString()
- : ""));
- /* Server ORPort */
- conf.insert(SETTING_ORPORT,
- (isServerEnabled() ? localValue(SETTING_ORPORT).toString()
- : "0"));
- /* Server DirPort */
- conf.insert(SETTING_DIRPORT,
- (isDirectoryMirror() ? localValue(SETTING_DIRPORT).toString()
- : "0"));
- /* Server Exit Policy */
- conf.insert(SETTING_EXITPOLICY,
- ((isBridgeEnabled() || isNonExitEnabled()) ? "reject *:*"
- : localValue(SETTING_EXITPOLICY).toString()));
-
- /* Server bandwidth settings */
- conf.insert((torVersion >= 0x020001 ? SETTING_RELAY_BANDWIDTH_RATE
- : SETTING_BANDWIDTH_RATE),
- QString::number(localValue(SETTING_BANDWIDTH_RATE).toUInt()) + " bytes");
- conf.insert((torVersion >= 0x020001 ? SETTING_RELAY_BANDWIDTH_BURST
- : SETTING_BANDWIDTH_BURST),
- QString::number(localValue(SETTING_BANDWIDTH_BURST).toUInt()) + " bytes");
-
- /* Server Contact Information */
- QString contact =
- localValue(SETTING_CONTACT).toString().trimmed();
- QString defaultContact = defaultValue(SETTING_CONTACT).toString();
- if ((contact == defaultContact) ||
- (contact == scrub_email_addr(defaultContact))) {
- /* Only set the contact info if they put something non-default there */
- contact = "";
- }
- conf.insert(SETTING_CONTACT, scrub_email_addr(contact));
-
- /* Set if we're a bridge relay */
- if (isBridgeEnabled()) {
- conf.insert(SETTING_BRIDGE_RELAY, "1");
- conf.insert(SETTING_PUBLISH_SERVER_DESCRIPTOR,
- publishServerDescriptor() ? "1" : "0");
- } else {
- conf.insert(SETTING_BRIDGE_RELAY, "0");
- conf.insert(SETTING_PUBLISH_SERVER_DESCRIPTOR, "1");
- }
- return conf;
-}
-
/** Applies the current server configuration settings to Tor. If <b>errmsg</b>
* is specified and an error occurs while applying the settings, it will be
* set to a string describing the error. */
bool
ServerSettings::apply(QString *errmsg)
{
- bool rc;
+ Torrc *torrc = Vidalia::torrc();
configurePortForwarding();
- if (isServerEnabled()) {
- rc = torControl()->setConf(confValues(), errmsg);
+ if (volatileValue(SETTING_ENABLED).toBool()) {
+ quint32 torVersion = torControl()->getTorVersion();
+
+ /* Server Nickname */
+ torrc->setValue(SETTING_NICKNAME,
+ volatileValue(SETTING_NICKNAME).toString());
+ /* Server ORPort */
+ torrc->setValue(SETTING_ORPORT,
+ volatileValue(SETTING_ORPORT).toString());
+ /* Server DirPort */
+ torrc->setValue(SETTING_DIRPORT,
+ volatileValue(SETTING_DIRPORT).toString());
+ /* Server Exit Policy */
+ torrc->clear(QStringList() << SETTING_EXITPOLICY);
+ if(volatileValue(SETTING_BRIDGE_RELAY).toBool() ||
+ volatileValue(SETTING_NONEXIT_RELAY).toBool()) {
+ torrc->setValue(SETTING_EXITPOLICY, "reject *:*");
+ } else {
+ torrc->setValue(SETTING_EXITPOLICY, volatileValue(SETTING_EXITPOLICY).toString());
+ }
+ /* Server bandwidth settings */
+ torrc->setValue((torVersion >= 0x020001 ? SETTING_RELAY_BANDWIDTH_RATE
+ : SETTING_BANDWIDTH_RATE),
+ QString::number(volatileValue(SETTING_BANDWIDTH_RATE).toUInt()) + " bytes");
+ torrc->setValue((torVersion >= 0x020001 ? SETTING_RELAY_BANDWIDTH_BURST
+ : SETTING_BANDWIDTH_BURST),
+ QString::number(volatileValue(SETTING_BANDWIDTH_BURST).toUInt()) + " bytes");
+
+ /* Server Contact Information */
+ QString contact =
+ volatileValue(SETTING_CONTACT).toString().trimmed();
+ QString defaultContact = defaultValue(SETTING_CONTACT).toString();
+ if ((contact == defaultContact) ||
+ (contact == scrub_email_addr(defaultContact))) {
+ /* Only set the contact info if they put something non-default there */
+ contact = "";
+ }
+ torrc->setValue(SETTING_CONTACT, scrub_email_addr(contact));
+
+ /* Set if we're a bridge relay */
+ if (volatileValue(SETTING_BRIDGE_RELAY).toBool()) {
+ torrc->setValue(SETTING_BRIDGE_RELAY, "1");
+ torrc->setValue(SETTING_PUBLISH_SERVER_DESCRIPTOR,
+ publishServerDescriptor() ? "1" : "0");
+ } else {
+ torrc->setValue(SETTING_BRIDGE_RELAY, "0");
+ torrc->setValue(SETTING_PUBLISH_SERVER_DESCRIPTOR, "1");
+ }
+
+ torrc->setValue(SETTING_ACCOUNTING_MAX, volatileValue(SETTING_ACCOUNTING_MAX).toString());
+ torrc->setValue(SETTING_ACCOUNTING_START, volatileValue(SETTING_ACCOUNTING_START).toString());
} else {
QStringList resetKeys;
quint32 torVersion = torControl()->getTorVersion();
@@ -163,9 +158,9 @@ ServerSettings::apply(QString *errmsg)
resetKeys << SETTING_BANDWIDTH_RATE
<< SETTING_BANDWIDTH_BURST;
}
- rc = torControl()->resetConf(resetKeys, errmsg);
+ torrc->clear(resetKeys);
}
- return rc;
+ return torrc->apply(torControl(), errmsg);
}
/* TODO: We should call this periodically, in case the router gets rebooted or forgets its UPnP settings */
@@ -227,7 +222,7 @@ ServerSettings::torValue(const QString &key) const
void
ServerSettings::setServerEnabled(bool enable)
{
- setValue(SETTING_ENABLED, enable);
+ setVolatileValue(SETTING_ENABLED, enable);
}
/** Returns true if Tor is currently configured to run as a Tor server. If Tor
@@ -241,7 +236,11 @@ ServerSettings::isServerEnabled()
if (torControl()->getConf(SETTING_ORPORT, orPort))
return (orPort.toUInt() > 0);
}
- return localValue(SETTING_ENABLED).toBool();
+
+ with_torrc_value(SETTING_ORPORT) {
+ return ret.at(0).toUInt() > 0;
+ }
+ return false;
}
/** Sets to <b>enabled</b> whether Tor should be a bridge node when acting as
@@ -249,14 +248,17 @@ ServerSettings::isServerEnabled()
void
ServerSettings::setBridgeEnabled(bool enabled)
{
- setValue(SETTING_BRIDGE_RELAY, enabled);
+ setVolatileValue(SETTING_BRIDGE_RELAY, enabled);
}
/** Returns true if Tor is configured to act as a bridge node. */
bool
ServerSettings::isBridgeEnabled()
{
- return value(SETTING_BRIDGE_RELAY).toBool() && isServerEnabled();
+ with_torrc_value(SETTING_BRIDGE_RELAY) {
+ return (ret.at(0) == "1") && isServerEnabled();
+ }
+ return false;
}
/** Sets to <b>enabled</b> whether Tor should be a non-exit node when acting as
@@ -264,56 +266,77 @@ ServerSettings::isBridgeEnabled()
void
ServerSettings::setNonExitEnabled(bool enabled)
{
- setValue(SETTING_NONEXIT_RELAY, enabled);
+ setVolatileValue(SETTING_NONEXIT_RELAY, enabled);
}
/** Returns true if Tor is configured to act as a non-exit node. */
bool
ServerSettings::isNonExitEnabled()
{
- return value(SETTING_NONEXIT_RELAY).toBool() && isServerEnabled();
+ with_torrc_value(SETTING_EXITPOLICY) {
+ return ret.size() == 1 and ret.at(0) == "reject *:*" and isServerEnabled();
+ }
+ return false;
}
/** Sets the server's ORPort. */
void
ServerSettings::setORPort(quint16 orPort)
{
- setValue(SETTING_ORPORT, orPort);
+ setVolatileValue(SETTING_ORPORT, orPort);
}
/** Gets the server's current ORPort setting. */
quint16
ServerSettings::getORPort()
{
- return (quint16)value(SETTING_ORPORT).toUInt();
+ quint16 val = 0;
+ with_torrc_value(SETTING_ORPORT) {
+ val = (quint16)ret.at(0).toUInt();
+ } else {
+ val = (quint16)defaultValue(SETTING_ORPORT).toUInt();
+ }
+
+ return val;
}
/** Sets the server's current DirPort. */
void
ServerSettings::setDirPort(quint16 dirPort)
{
- setValue(SETTING_DIRPORT, dirPort);
+ setVolatileValue(SETTING_DIRPORT, dirPort);
}
/** Gets the server's current DirPort. */
quint16
ServerSettings::getDirPort()
{
- return (quint16)value(SETTING_DIRPORT).toUInt();
+ quint16 val = 0;
+ with_torrc_value(SETTING_DIRPORT) {
+ val = (quint16)ret.at(0).toUInt();
+ } else {
+ val = (quint16)defaultValue(SETTING_DIRPORT).toUInt();
+ }
+ return val;
}
/** Sets the server's nickname. */
void
ServerSettings::setNickname(QString nickname)
{
- setValue(SETTING_NICKNAME, nickname);
+ setVolatileValue(SETTING_NICKNAME, nickname);
}
/** Gets the server's nickname. */
QString
ServerSettings::getNickname()
{
- QString nickname = value(SETTING_NICKNAME).toString();
+ QString nickname = "<Unnamed>";
+ with_torrc_value(SETTING_NICKNAME) {
+ nickname = ret.at(0);
+ } else {
+ nickname = defaultValue(SETTING_NICKNAME).toString();
+ }
/* Ensure the nickname contains only valid characters and is not too long. */
return ensure_valid_chars(nickname,
VALID_NICKNAME_CHARS).left(MAX_NICKNAME_LEN);
@@ -323,70 +346,97 @@ ServerSettings::getNickname()
void
ServerSettings::setContactInfo(QString contact)
{
- setValue(SETTING_CONTACT, contact);
+ setVolatileValue(SETTING_CONTACT, contact);
}
/** Gets the server's contact information. */
QString
ServerSettings::getContactInfo()
{
- return value(SETTING_CONTACT).toString();
+ QString contact;
+ with_torrc_value(SETTING_CONTACT) {
+ contact = ret.at(0);
+ } else {
+ contact = defaultValue(SETTING_CONTACT).toString();
+ }
+ return contact;
}
/** Returns whether this server will act as a directory mirror or not. */
bool
ServerSettings::isDirectoryMirror()
{
- return localValue(SETTING_DIRMIRROR).toBool();
+ return getDirPort() > 0;
}
/** Sets whether this server will act as a directory mirror. */
void
ServerSettings::setDirectoryMirror(bool mirror)
{
- setValue(SETTING_DIRMIRROR, mirror);
+ setVolatileValue(SETTING_DIRMIRROR, mirror);
}
/** Returns the exit policy for this server. */
ExitPolicy
ServerSettings::getExitPolicy()
{
- return ExitPolicy(value(SETTING_EXITPOLICY).toString());
+ QString val = "";
+ with_torrc_value(SETTING_EXITPOLICY) {
+ foreach(QString ep, ret) {
+ val = ep + "," + val;
+ }
+ } else {
+ val = defaultValue(SETTING_EXITPOLICY).toString();
+ }
+ return ExitPolicy(val);
}
/** Sets the exit policy for this server. */
void
ServerSettings::setExitPolicy(ExitPolicy &exitPolicy)
{
- setValue(SETTING_EXITPOLICY, exitPolicy.toString());
+ setVolatileValue(SETTING_EXITPOLICY, exitPolicy.toString());
}
/** Returns the long-term average bandwidth rate (in KB/s) for this server. */
quint32
ServerSettings::getBandwidthAvgRate()
{
- return value(SETTING_BANDWIDTH_RATE).toUInt();
+ quint32 val = 0;
+ with_torrc_value(SETTING_BANDWIDTH_RATE) {
+ val = ret.at(0).trimmed().split(" ").at(0).toUInt();
+ } else {
+ val = defaultValue(SETTING_BANDWIDTH_RATE).toUInt();
+ }
+
+ return val;
}
/** Sets the long-term average bandwidth rate (in KB/s) for this server. */
void
ServerSettings::setBandwidthAvgRate(quint32 rate)
{
- setValue(SETTING_BANDWIDTH_RATE, rate);
+ setVolatileValue(SETTING_BANDWIDTH_RATE, rate);
}
/** Returns the maximum bandwidth burst rate (in KB/s) for this server. */
quint32
ServerSettings::getBandwidthBurstRate()
{
- return value(SETTING_BANDWIDTH_BURST).toUInt();
+ quint32 val = 0;
+ with_torrc_value(SETTING_BANDWIDTH_BURST) {
+ val = ret.at(0).trimmed().split(" ").at(0).toUInt();
+ } else {
+ val = defaultValue(SETTING_BANDWIDTH_BURST).toUInt();
+ }
+ return val;
}
/** Sets the maximum bandwidth burst rate (in KB/s) for this server. */
void
ServerSettings::setBandwidthBurstRate(quint32 rate)
{
- setValue(SETTING_BANDWIDTH_BURST, rate);
+ setVolatileValue(SETTING_BANDWIDTH_BURST, rate);
}
/** Sets whether the user's server descriptor will be published or not.
@@ -396,18 +446,20 @@ ServerSettings::setBandwidthBurstRate(quint32 rate)
void
ServerSettings::setPublishServerDescriptor(bool publish)
{
- if (publish)
- setValue(SETTING_PUBLISH_SERVER_DESCRIPTOR, "1");
- else
- setValue(SETTING_PUBLISH_SERVER_DESCRIPTOR, "0");
+ setVolatileValue(SETTING_PUBLISH_SERVER_DESCRIPTOR, publish?"1":"0");
}
/** Returns true if the user's server descriptor will be published to the
* appropriate authorities. */
bool
-ServerSettings::publishServerDescriptor() const
+ServerSettings::publishServerDescriptor()
{
- return (value(SETTING_PUBLISH_SERVER_DESCRIPTOR).toString() != "0");
+ with_torrc_value(SETTING_PUBLISH_SERVER_DESCRIPTOR) {
+ return ret.at(0) != "0";
+ } else {
+ return defaultValue(SETTING_PUBLISH_SERVER_DESCRIPTOR).toBool();
+ }
+ return false;
}
/** Returns true if UPnP support is available and enabled. */
@@ -431,3 +483,105 @@ ServerSettings::setUpnpEnabled(bool enabled)
#endif
}
+bool
+ServerSettings::isAccountingEnabled()
+{
+ with_torrc_value(SETTING_ACCOUNTING_MAX) {
+ return true;
+ }
+
+ return false;
+}
+
+void
+ServerSettings::disableAccounting()
+{
+ Vidalia::torrc()->clear(QStringList() << SETTING_ACCOUNTING_MAX);
+}
+
+void
+ServerSettings::setAccountingMax(int amount, const QString &unit)
+{
+ setVolatileValue(SETTING_ACCOUNTING_MAX, QString("%1 %2").arg(amount).arg(unit));
+}
+
+void
+ServerSettings::setAccountingStart(const QString &dwm,
+ int day,
+ const QString &time)
+{
+ if(dwm == "month" or dwm == "week")
+ setVolatileValue(SETTING_ACCOUNTING_START,
+ QString("%1 %2 %3").arg(dwm)
+ .arg(day).arg(time));
+ else
+ setVolatileValue(SETTING_ACCOUNTING_START,
+ QString("%1 %2").arg(dwm).arg(time));
+}
+
+int
+ServerSettings::accountingMaxAmount()
+{
+ with_torrc_value(SETTING_ACCOUNTING_MAX) {
+ QStringList parts = ret.at(0).split(" ");
+ if(parts.size() < 2)
+ return 0;
+ return parts.at(0).trimmed().toInt();
+ }
+
+ return 0;
+}
+
+const QString
+ServerSettings::accountingMaxUnit()
+{
+ with_torrc_value(SETTING_ACCOUNTING_MAX) {
+ QStringList parts = ret.at(0).split(" ");
+ if(parts.size() < 2)
+ return QString();
+ return parts.at(1).trimmed();
+ }
+
+ return QString();
+}
+
+const QString
+ServerSettings::accountingStartDwm()
+{
+ with_torrc_value(SETTING_ACCOUNTING_START) {
+ QStringList parts = ret.at(0).split(" ");
+ if(parts.size() < 2)
+ return QString();
+ return parts.at(0).trimmed();
+ }
+
+ return QString();
+}
+
+int
+ServerSettings::accountingStartDay()
+{
+ with_torrc_value(SETTING_ACCOUNTING_START) {
+ QStringList parts = ret.at(0).split(" ");
+ if(parts.size() < 3)
+ return 1;
+ return parts.at(1).trimmed().toInt();
+ }
+
+ return 1;
+}
+
+const QString
+ServerSettings::accountingStartTime()
+{
+ with_torrc_value(SETTING_ACCOUNTING_START) {
+ QStringList parts = ret.at(0).split(" ");
+ if(parts.size() < 2)
+ return QString();
+ if(parts.size() == 3)
+ return parts.at(2).trimmed();
+ return parts.at(1).trimmed();
+ }
+
+ return QString();
+}
diff --git a/src/vidalia/config/ServerSettings.h b/src/vidalia/config/ServerSettings.h
index 26ab9dc..cfb10b1 100644
--- a/src/vidalia/config/ServerSettings.h
+++ b/src/vidalia/config/ServerSettings.h
@@ -94,7 +94,7 @@ public:
void setPublishServerDescriptor(bool publish);
/** Returns true if the user's server descriptor will be published to
* the appropriate authorities. */
- bool publishServerDescriptor() const;
+ bool publishServerDescriptor();
/** Configure port forwarding. */
void configurePortForwarding();
@@ -106,15 +106,31 @@ public:
/** Sets whether Vidalia should try to configure port forwarding using UPnP. */
void setUpnpEnabled(bool enabled);
+ /** Returns true if accounting is enabled */
+ bool isAccountingEnabled();
+ /** Disables accounting options */
+ void disableAccounting();
+ /** Sets AccountingMax to amount unit */
+ void setAccountingMax(int amount, const QString &unit);
+ /** Sets AccountingStart for dwm (day/week/month) day and time */
+ void setAccountingStart(const QString &dwm, int day, const QString &time);
+
+ /** Returns the max amount of bytes/KB/etc for accounting */
+ int accountingMaxAmount();
+ /** Returns the unit for the max amount */
+ const QString accountingMaxUnit();
+ /** Returns the configured AccountingStart (day/week/month) */
+ const QString accountingStartDwm();
+ /** Returns the day of the week/month for AccountingStart */
+ int accountingStartDay();
+ /** Returns the time of day for AccountingStart */
+ const QString accountingStartTime();
+
protected:
/** Virtual method called when we retrieve a server-related setting from Tor.
* Currently this just translates BandwidthFoo to RelayBandwidthFoo when
* appropriate. */
virtual QVariant torValue(const QString &key) const;
-
-private:
- /** Returns Tor-recognizable configuration keys and current values. */
- QHash<QString,QString> confValues();
};
#endif
diff --git a/src/vidalia/config/Service.cpp b/src/vidalia/config/Service.cpp
deleted file mode 100644
index e06aa98..0000000
--- a/src/vidalia/config/Service.cpp
+++ /dev/null
@@ -1,119 +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.
-*/
-
-#include "Service.h"
-
-
-/** Default Constructor */
-Service::Service()
-{
-}
-
-/** Constructor to create a new Service with initial settings */
-Service::Service(QString serviceAddress, QString virtualPort,
- QString physicalAddressPort, QString serviceDirectory, bool enabled)
-{
- _serviceAddress = serviceAddress;
- _virtualPort = virtualPort;
- _physicalAddressPort = physicalAddressPort;
- _serviceDirectory = serviceDirectory;
- _enabled = enabled;
-}
-
-/** Destructor */
-Service::~Service()
-{
-}
-
-/** Sets the deploy status of a service */
-void Service::setEnabled(bool enabled)
-{
- _enabled = enabled;
-}
-
-/** Sets the adress of a service */
-void Service::setServiceAddress(QString serviceAddress)
-{
- _serviceAddress = serviceAddress;
-}
-
-/** Sets the virtualPort of a service */
-void Service::setVirtualPort(QString virtualPort)
-{
- _virtualPort = virtualPort;
-}
-
-/** Sets the physical Adress and the local port of a service */
-void Service::setPhysicalAddressPort(QString physicalAddressPort)
-{
- _physicalAddressPort = physicalAddressPort;
-}
-
-/** Sets the service directory of a service */
-void Service::setServiceDirectory(QString serviceDirectory)
-{
- _serviceDirectory = serviceDirectory;
-}
-
-/** Sets the additional options of a service e.g. excludeNodes */
-void Service::setAdditionalServiceOptions(QString options)
-{
- _additionalServiceOptions = options;
-}
-
-/** Writes service class data from <b>myObj</b> to the QDataStream
- * <b>out</b>. */
-QDataStream&operator<<(QDataStream &out, const Service &myObj)
-{
- out << myObj.serviceAddress();
- out << myObj.virtualPort();
- out << myObj.physicalAddressPort();
- out << myObj.serviceDirectory();
- out << myObj.enabled();
- out << myObj.additionalServiceOptions();
-
- return out;
-}
-
-/** Reads service class data in from the QDataStream <b>in</b> and
- populates * the <b>myObj</b> object accordingly. */
-QDataStream&operator>>(QDataStream &in, Service &myObj)
-{
- QString serviceAddress;
- QString virtualPort;
- QString physicalAddressPort;
- QString serviceDirectory;
- bool enabled;
- QString additionalServiceOptions;
-
- /* Read in from the data stream */
- in >> serviceAddress >> virtualPort >> physicalAddressPort
- >> serviceDirectory >> enabled >> additionalServiceOptions;
-
- /* Set the appropriate class member variables */
- myObj.setServiceAddress(serviceAddress);
- myObj.setVirtualPort(virtualPort);
- myObj.setPhysicalAddressPort(physicalAddressPort);
- myObj.setServiceDirectory(serviceDirectory);
- myObj.setEnabled(enabled);
- myObj.setAdditionalServiceOptions(additionalServiceOptions);
-
- /* Return the updated data stream */
- return in;
-}
-
-/** Creates a string by concatenating the values of the service. */
-QString
-Service::toString()
-{
- return _serviceAddress +"#"+ _virtualPort +"#"+ _physicalAddressPort +
- "#"+ _serviceDirectory +"#"+ _enabled + "#"+ _additionalServiceOptions;
-}
-
diff --git a/src/vidalia/config/Service.h b/src/vidalia/config/Service.h
deleted file mode 100644
index 33941e8..0000000
--- a/src/vidalia/config/Service.h
+++ /dev/null
@@ -1,80 +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.
-*/
-
-#ifndef _SERVICE_H
-#define _SERVICE_H
-
-#include <QString>
-#include <QList>
-#include <QMetaType>
-
-
-class Service
-{
-public:
- /** Default constructor. */
- Service();
- /** Constructor to create a new Service with initial settings */
- Service(QString serviceAddress, QString virtualPort,
- QString physicalAddressPort, QString serviceDirectory, bool enabled);
- /** Destructor */
- virtual ~Service();
- /** Returns the service Adress of the service */
- QString serviceAddress() const { return _serviceAddress; }
- /** Returns the listeningPort of the service */
- QString virtualPort() const { return _virtualPort; }
- /** Returns the physical Adresse and the local Port of the service */
- QString physicalAddressPort() const { return _physicalAddressPort; }
- /** Returns the service directory of the service */
- QString serviceDirectory() const { return _serviceDirectory; }
- /** Returns the deployed status of a service */
- bool enabled() const { return _enabled; }
- /** Returns the additional options of a service e.g. excludeNodes */
- QString additionalServiceOptions() const
- { return _additionalServiceOptions; }
- /** Sets the adress of a service */
- void setServiceAddress(QString serviceAddress);
- /** Sets the listening port of a service */
- void setVirtualPort(QString virtualPort);
- /** Sets the physical Adress and the local Port of a service */
- void setPhysicalAddressPort(QString physicalAddressPort);
- /** Sets the service directory of a service */
- void setServiceDirectory(QString serviceDirectory);
- /** Sets the deployed status a service */
- void setEnabled(bool enabled);
- /** Sets the additional options of a service e.g. excludeNodes */
- void setAdditionalServiceOptions(QString options);
- /** Writes service class data from <b>myObj</b> to the QDataStream
- * <b>out</b>. */
- friend QDataStream& operator<<(QDataStream &out, const Service &myObj);
- /** Reads service class data in from the QDataStream <b>in</b> and
- populates * the <b>myObj</b> object accordingly. */
- friend QDataStream& operator>>(QDataStream &in, Service &myObj);
- /** this method creates a string by concatenating the values of the service */
- QString toString();
-
-private:
- /** The adress of the service */
- QString _serviceAddress;
- /** The listening Port of the service */
- QString _virtualPort;
- /** The physical Adress and the local port of teh service */
- QString _physicalAddressPort;
- /** the directory of the service */
- QString _serviceDirectory;
- /** The Enabled status of the service */
- bool _enabled;
- /** Some additional service options, not configured/displayed by Vidalia */
- QString _additionalServiceOptions;
-
-};
-Q_DECLARE_METATYPE(Service);
-#endif /*SERIVCE_H_*/
-
diff --git a/src/vidalia/config/ServiceList.cpp b/src/vidalia/config/ServiceList.cpp
deleted file mode 100644
index 284c5ce..0000000
--- a/src/vidalia/config/ServiceList.cpp
+++ /dev/null
@@ -1,56 +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.
-*/
-
-#include "ServiceList.h"
-
-
-/** Default constructor. */
-ServiceList::ServiceList()
-{
-}
-
-/** Constructor to create a new Servicelist with initial settings */
-void ServiceList::addService(Service service)
-{
- _services.append(service);
-}
-
-/** Destructor */
-ServiceList::~ServiceList()
-{
-}
-
-/* Sets the serviceList */
-void ServiceList::setServices(QList<Service> services)
-{
- _services = services;
-}
-
-/** Writes ServiceList class data from <b>myObj</b> to the QDataStream
- * <b>out</b>. */
-QDataStream&operator<<(QDataStream &out, const ServiceList &myObj)
-{
- out << myObj.services(); /* Write the services*/
- return out;
-}
-
-/** Reads ServiceList class data in from the QDataStream <b>in</b> and
- populates * the <b>myObj</b> object accordingly. */
-QDataStream&operator>>(QDataStream &in, ServiceList &myObj)
-{
- QList<Service> services;
- /* Read in from the data stream */
- in >> services;
- /* Set the appropriate class member variables */
- myObj.setServices(services);
- /* Return the updated data stream */
- return in;
-}
-
diff --git a/src/vidalia/config/ServiceList.h b/src/vidalia/config/ServiceList.h
deleted file mode 100644
index 53ae777..0000000
--- a/src/vidalia/config/ServiceList.h
+++ /dev/null
@@ -1,51 +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.
-*/
-
-#ifndef _SERVICELIST_H
-#define _SERVICELIST_H
-
-#include "Service.h"
-
-#include <QList>
-
-
-class ServiceList
-{
-public:
-
- /** Default constructor. */
- ServiceList();
- /** Destructor */
- virtual ~ServiceList();
- /** Returns the list of services */
- void addService(Service service);
- /** Sets the lists of services */
- void setServices(QList<Service> services);
- /** Returns the list of services */
- QList<Service> services() const {
- return _services;
- }
- /** Writes ServiceList class data from <b>myObj</b> to the QDataStream
- * <b>out</b>. */
- friend QDataStream& operator<<(QDataStream &out, const ServiceList &myObj);
- /** Reads ServiceList class data in from the QDataStream <b>in</b> and
- populates * the <b>myObj</b> object accordingly. */
- friend QDataStream& operator>>(QDataStream &in, ServiceList &myObj);
-
-private:
-
- /** The list of Services */
- QList<Service> _services;
-
-};
-Q_DECLARE_METATYPE(ServiceList);
-
-#endif
-
diff --git a/src/vidalia/config/ServicePage.cpp b/src/vidalia/config/ServicePage.cpp
deleted file mode 100644
index 3ee1a86..0000000
--- a/src/vidalia/config/ServicePage.cpp
+++ /dev/null
@@ -1,613 +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.
-*/
-
-#include "ServicePage.h"
-#include "Service.h"
-#include "ServiceList.h"
-#include "VMessageBox.h"
-#include "ConfigDialog.h"
-#include "IpValidator.h"
-#include "DomainValidator.h"
-#include "Vidalia.h"
-
-#include "stringutil.h"
-#include "file.h"
-
-#include <QHeaderView>
-#include <QClipboard>
-#include <QFile>
-#include <QTextStream>
-
-
-/** Constructor */
-ServicePage::ServicePage(QWidget *parent)
-: ConfigPage(parent, "Services")
-{
- /* Invoke the Qt Designer generated object setup routine */
- ui.setupUi(this);
- /* A QMap, mapping from the row number to the Entity for
- * all services */
- _services = new QMap<int, Service>();
- /* A QMap, mapping from the directory path to the Entity for
- * all Tor services */
- _torServices = new QMap<QString, Service>();
-
- ui.serviceWidget->horizontalHeader()->resizeSection(0, 150);
- ui.serviceWidget->horizontalHeader()->resizeSection(1, 89);
- ui.serviceWidget->horizontalHeader()->resizeSection(2, 100);
- ui.serviceWidget->horizontalHeader()->resizeSection(3, 120);
- ui.serviceWidget->horizontalHeader()->resizeSection(4, 60);
- ui.serviceWidget->horizontalHeader()->setResizeMode(0, QHeaderView::Stretch);
- ui.serviceWidget->horizontalHeader()->setResizeMode(1, QHeaderView::Stretch);
- ui.serviceWidget->horizontalHeader()->setResizeMode(2, QHeaderView::Stretch);
- ui.serviceWidget->horizontalHeader()->setResizeMode(3, QHeaderView::Stretch);
- ui.serviceWidget->verticalHeader()->hide();
-
- connect(ui.addButton, SIGNAL(clicked()), this, SLOT(addService()));
- connect(ui.removeButton, SIGNAL(clicked()), this, SLOT(removeService()));
- connect(ui.copyButton, SIGNAL(clicked()), this, SLOT(copyToClipboard()));
- connect(ui.browseButton, SIGNAL(clicked()), this, SLOT(browseDirectory()));
- connect(ui.serviceWidget, SIGNAL(itemClicked(QTableWidgetItem*)),
- this, SLOT(serviceSelectionChanged()));
- connect(ui.serviceWidget, SIGNAL(itemChanged(QTableWidgetItem*)),
- this, SLOT(valueChanged()));
-}
-
-/** Destructor */
-ServicePage::~ServicePage()
-{
- delete _services;
- delete _torServices;
-}
-
-/** Called when the user changes the UI translation. */
-void
-ServicePage::retranslateUi()
-{
- ui.retranslateUi(this);
-}
-
-/** Saves changes made to settings on the Server settings page. */
-bool
-ServicePage::save(QString &errmsg)
-{
- ServiceSettings serviceSettings(Vidalia::torControl());
- QList<Service> serviceList;
- QList<Service> publishedServices;
- int index = 0;
-
- while(index < ui.serviceWidget->rowCount()) {
- QString address = ui.serviceWidget->item(index,0)->text();
- QString virtualPort = ui.serviceWidget->item(index,1)->text();
- QString physicalAddress = ui.serviceWidget->item(index,2)->text();
- QString directoryPath = ui.serviceWidget->item(index,3)->text();
- bool enabled = _services->value(index).enabled();
- Service temp(address, virtualPort, physicalAddress, directoryPath,
- enabled);
- temp.setAdditionalServiceOptions(
- _services->value(ui.serviceWidget->currentRow()).additionalServiceOptions());
- serviceList.push_back(temp);
- if(enabled) {
- publishedServices.push_back(temp);
- }
- index++;
- }
-
- bool save = checkBeforeSaving(serviceList);
- if(save) {
- ServiceList sList;
- if(serviceList.size() > 0) {
- sList.setServices(serviceList);
- } else {
- _services = new QMap<int, Service>();
- sList.setServices(_services->values());
- }
- serviceSettings.setServices(sList);
- if(publishedServices.size() > 0) {
- startServicesInTor(publishedServices);
- } else {
- QString errmsg1 = tr("Error while trying to unpublish all services");
- QString &errmsg = errmsg1;
- serviceSettings.unpublishAllServices(&errmsg);
- }
- return true;
- } else {
- errmsg = tr("Please configure at least a service directory and a virtual "
- "port for each service you want to save. Remove the other ones.");
- return false;
- }
-}
-
-/** this method checks if either all services have minimal
- * configuration or not */
-bool
-ServicePage::checkBeforeSaving(QList<Service> serviceList)
-{
- bool result = true;
- foreach(Service s, serviceList) {
- if(s.serviceDirectory().isEmpty() || s.virtualPort().isEmpty()) {
- result = false;
- break;
- }
- }
- return result;
-}
-
-/** this method generates the configuration string for a list of services */
-void
-ServicePage::startServicesInTor(QList<Service> services)
-{
- ServiceSettings serviceSettings(Vidalia::torControl());
- QString serviceConfString;
- QString errmsg = "Error while trying to publish services.";
- QListIterator<Service> it(services);
-
- while(it.hasNext()) {
- Service temp = it.next();
- serviceConfString.append("hiddenservicedir=" +
- string_escape(temp.serviceDirectory()) + " ");
- serviceConfString.append("hiddenserviceport=" +
- string_escape(temp.virtualPort() +
- (temp.physicalAddressPort().isEmpty() ? "" : " " +
- temp.physicalAddressPort())));
- serviceConfString.append(" " + temp.additionalServiceOptions());
- }
- serviceSettings.applyServices(serviceConfString, &errmsg);
-}
-
-/** Loads previously saved settings */
-void
-ServicePage::load()
-{
- ServiceSettings serviceSettings(Vidalia::torControl());
- QList<Service> torServiceList;
-
- ui.removeButton->setEnabled(false);
- ui.copyButton->setEnabled(false);
- ui.browseButton->setEnabled(false);
- // get all services
- _services->clear();
- _torServices->clear();
-
- QString torConfigurationString = serviceSettings.getHiddenServiceDirectories();
- torServiceList = extractSingleServices(torConfigurationString);
- QList<Service> completeList = torServiceList;
- // the services stored with vidalia
- ServiceList serviceList = serviceSettings.getServices();
- QList<Service> serviceSettingsList = serviceList.services();
- QListIterator<Service> it(serviceSettingsList);
- // check whether a service is already in the list because he is published
- while(it.hasNext()) {
- Service temp = it.next();
- if(isServicePublished(temp, torServiceList) == false) {
- completeList.push_back(temp);
- }
- }
- // generate the _services data structure used during vidalia session
- QListIterator<Service> it2(completeList);
- int index = 0;
- while (it2.hasNext()) {
- Service tempService = it2.next();
- _services->insert(index, tempService);
- index++;
- }
- initServiceTable(_services);
-}
-
-/** this method returns a list of services by parsing the configuration
- * string given by the tor controller */
-QList<Service>
-ServicePage::extractSingleServices(QString conf)
-{
- QList<Service> list;
- QStringList strList = conf.split("250 HiddenServiceDir");
- strList.removeFirst();
- QListIterator<QString> it(strList);
- //for each service directory splitted string = service
- while(it.hasNext()) {
- QString temp = it.next();
- list.push_back(generateService(temp));
- }
- return list;
-}
-
-/** this return a Service by parseing the configuration string
- * of Tor and storeing its values into the object */
-Service
-ServicePage::generateService(QString s)
-{
- QString additionalOptions = s;
- // remove directory
- int index = additionalOptions.indexOf("250",1);
- additionalOptions.remove(0, index+4);
- // remove the first appearance of the port
- int startindex = additionalOptions.indexOf("hiddenserviceport", 0,
- Qt::CaseInsensitive);
- int endindex = additionalOptions.indexOf("250", startindex);
- if(endindex != -1) {
- additionalOptions.remove(startindex, (endindex-startindex)+4);
- //remove all appearances of "250"
- while(additionalOptions.contains("250")) {
- int i = additionalOptions.indexOf("250", 0);
- additionalOptions.remove(i, 4);
- }
- // prepare for correct quotation
- if (!additionalOptions.endsWith('\n')) {
- additionalOptions.append("\n");
- }
- //quote the values
- int j = additionalOptions.indexOf("=", 0);
- while(j != -1) {
- additionalOptions.insert(j+1, "\"");
- int end = additionalOptions.indexOf("\n", j);
- additionalOptions.insert(end, "\"");
- j = additionalOptions.indexOf("=", end);
- }
- //replace the line brakes with a space and create one single line
- additionalOptions.replace(QString("\n"), QString(" "));
- } else {
- additionalOptions = "";
- }
-
- QString address, virtualPort, physAddressPort, serviceDir;
- // service directory
- QStringList strList = s.split("\n");
- QString tempServiceDir = strList.first().trimmed();
- serviceDir = tempServiceDir.remove(0, 1);
- //virtual port
- QStringList strList2 = s.split("HiddenServicePort");
- strList2.removeFirst();
- QStringList strList3 = strList2.first().split("\n");
- QStringList strList4 = strList3.first().split(" ");
- if(strList4.size() > 0) {
- QString tempVirtualPort = strList4.first();
- virtualPort = tempVirtualPort.remove(0, 1);
- strList4.removeFirst();
- //physical address:port
- if(!strList4.isEmpty()) {
- physAddressPort = strList4.first().trimmed();
- }
- } else {
- QString tempVirtualPort = strList3.first();
- virtualPort = tempVirtualPort.remove(0, 1);
- }
- //get .onion address
- QString serviceHostnameDir = serviceDir;
- serviceHostnameDir.append("/");
- serviceHostnameDir.append("hostname");
- QFile file(serviceHostnameDir);
- if (!file.open(QIODevice::ReadOnly | QIODevice::Text)) {
- address = "[Directory not found]";
- } else {
- QTextStream in(&file);
- QString hostname;
- while (!in.atEnd()) {
- hostname.append(in.readLine());
- }
- address = hostname;
- }
- Service service(address, virtualPort, physAddressPort, serviceDir, true);
- service.setAdditionalServiceOptions(additionalOptions);
- _torServices->insert(serviceDir, service);
- return service;
-}
-
-/** this method checks either a service is published or not */
-bool
-ServicePage::isServicePublished(Service service, QList<Service> torServices)
-{
- QListIterator<Service> it(torServices);
- while(it.hasNext()) {
- Service temp = it.next();
- if(temp.serviceDirectory().compare(service.serviceDirectory()) == 0) {
- return true;
- }
- }
- return false;
-}
-
-/** this method creates/displays the values for each service
- * shown in the service listing */
-void
-ServicePage::initServiceTable(QMap<int, Service>* services)
-{
- // clean the widget
- int rows = ui.serviceWidget->rowCount();
- for(int i = 0; i < rows; i++) {
- ui.serviceWidget->removeRow(0);
- }
- //for each service
- int index = 0;
- while(index < services->size()) {
- Service tempService = services->value(index);
- ui.serviceWidget->insertRow(index);
- QTableWidgetItem *cboxitem = new QTableWidgetItem();
- cboxitem->setFlags(Qt::ItemIsSelectable);
- QTableWidgetItem *addressitem = new QTableWidgetItem();
- addressitem->setFlags(Qt::ItemIsSelectable);
- if(tempService.serviceAddress().length() < 0) {
- addressitem->setText(tempService.serviceAddress());
- } else {
- QString serviceHostnameDir = tempService.serviceDirectory();
- serviceHostnameDir.append("/");
- serviceHostnameDir.append("hostname");
- QFile file(serviceHostnameDir);
- if (!file.open(QIODevice::ReadOnly | QIODevice::Text)) {
- addressitem->setText("[Directory not found]");
- } else {
- QTextStream in(&file);
- QString hostname;
- while (!in.atEnd()) {
- hostname.append(in.readLine());
- }
- addressitem->setText(hostname);
- tempService.setServiceAddress(hostname);
- }
- }
- addressitem->setData(32, addressitem->text());
- QTableWidgetItem *serviceDir =
- new QTableWidgetItem(tempService.serviceDirectory(), 0);
- serviceDir->setData(32, tempService.serviceDirectory());
- QTableWidgetItem* virtualportitem =
- new QTableWidgetItem(tempService.virtualPort(), 0);
- virtualportitem->setData(32, tempService.virtualPort());
- QTableWidgetItem* targetitem =
- new QTableWidgetItem(tempService.physicalAddressPort(),0);
- targetitem->setData(32, tempService.physicalAddressPort());
- if(tempService.enabled()) {
- cboxitem->setCheckState(Qt::Checked);
- serviceDir->setFlags(Qt::ItemIsSelectable);
- } else {
- cboxitem->setCheckState(Qt::Unchecked);
- }
- cboxitem->setTextAlignment(Qt::AlignCenter);
- ui.serviceWidget->setItem(index, 0, addressitem);
- ui.serviceWidget->setItem(index, 1, virtualportitem);
- ui.serviceWidget->setItem(index, 2, targetitem);
- ui.serviceWidget->setItem(index, 3, serviceDir);
- ui.serviceWidget->setItem(index, 4, cboxitem);
- index++;
- }
-}
-
-/** this method is called when the user clicks the "Add"-Button
- * it generates a new empty table entrie(row) */
-void
-ServicePage::addService()
-{
- int rows = ui.serviceWidget->rowCount();
- ui.serviceWidget->insertRow(rows);
- QTableWidgetItem *address = new QTableWidgetItem("["+tr("Created by Tor")+"]");
- address->setFlags(Qt::ItemIsSelectable);
- QTableWidgetItem *dummy = new QTableWidgetItem();
- QTableWidgetItem *dummy2 = new QTableWidgetItem();
- QTableWidgetItem *dummy3 = new QTableWidgetItem();
- QTableWidgetItem *cboxitem = new QTableWidgetItem();
- cboxitem->setFlags(Qt::ItemIsSelectable);
- cboxitem->setCheckState(Qt::Checked);
- ui.serviceWidget->setItem(rows, 0, address);
- ui.serviceWidget->setItem(rows, 1, dummy);
- ui.serviceWidget->setItem(rows, 2, dummy2);
- ui.serviceWidget->setItem(rows, 3, dummy3);
- ui.serviceWidget->setItem(rows, 4, cboxitem);
- Service s;
- s.setEnabled(true);
- _services->insert(rows, s);
-}
-
-/** this method is called when the user clicks the "Remove"-Button
- * it removes a service/row of the service listing */
-void
-ServicePage::removeService()
-{
- int rows = ui.serviceWidget->rowCount();
- int selrow = ui.serviceWidget->currentRow();
- if(selrow < 0 || selrow >= _services->size()) {
- VMessageBox::warning(this, tr("Error"), tr("Please select a Service."),
- VMessageBox::Ok);
- return;
- } else {
- ui.serviceWidget->removeRow(selrow);
- //decrease all other service keys
- for(int i = 0; i < (rows-selrow-1); i++) {
- int index = i+selrow;
- Service s = _services->take(index+1);
- _services->insert(index, s);
- }
- }
- serviceSelectionChanged();
-}
-
-/** this method is called when the user clicks on the "Copy"-Button, it
- * copies the .onion-Address of the selected service into the clipboard */
-void
-ServicePage::copyToClipboard()
-{
- int selrow = ui.serviceWidget->currentRow();
- if(selrow < 0 || selrow >= _services->size()) {
- VMessageBox::warning(this, tr("Error"), tr("Please select a Service."),
- VMessageBox::Ok);
- return;
- } else {
- QString onionAddress = ui.serviceWidget->item(selrow,0)->text();
- QClipboard *clipboard = QApplication::clipboard();
- QString clipboardText;
- QTableWidgetItem* selectedItem = ui.serviceWidget->item(selrow,0);
- clipboardText.append(selectedItem->text());
- clipboard->setText(clipboardText);
- }
-}
-
-/** this method is called when the user clicks on the "Brows"-Button it opens
- * a QFileDialog to choose a service directory */
-void
-ServicePage::browseDirectory()
-{
- int selrow = ui.serviceWidget->currentRow();
- if(selrow < 0 || selrow >= _services->size()) {
- VMessageBox::warning(this, tr("Error"), tr("Please select a Service."),
- VMessageBox::Ok);
- return;
- } else {
- QString dirname =
- QFileDialog::getExistingDirectory(this,
- tr("Select Service Directory"), "",
- QFileDialog::ShowDirsOnly
- | QFileDialog::DontResolveSymlinks);
-
- if (dirname.isEmpty()) {
- return;
- }
- ui.serviceWidget->item(selrow,3)->setText(dirname);
- Service s = _services->take(selrow);
- s.setServiceDirectory(dirname);
- _services->insert(selrow, s);
- }
-}
-
-/** this method is called when the selects an other tablewidgetitem */
-void
-ServicePage::serviceSelectionChanged()
-{
- bool emptyTable = false;
- if(ui.serviceWidget->rowCount() > 0) {
- ui.removeButton->setEnabled(true);
- ui.copyButton->setEnabled(true);
- ui.browseButton->setEnabled(true);
- } else {
- ui.removeButton->setEnabled(false);
- ui.copyButton->setEnabled(false);
- ui.browseButton->setEnabled(false);
- emptyTable = true;
- }
- int currentRow = ui.serviceWidget->currentRow();
- if(emptyTable == false) {
- QTableWidgetItem* item = ui.serviceWidget->item(currentRow, 0);
- if(item != NULL) {
- bool b = item->text().contains(".onion");
- ui.copyButton->setEnabled(b);
- }
- }
-
- QString selDir = _services->value(ui.serviceWidget->currentRow()).
- serviceDirectory();
- QList<QString> strList = _torServices->keys();
- if(selDir.length() > 0) {
- QListIterator<QString> it(strList);
- while(it.hasNext()) {
- QString temp = it.next();
- if(selDir.compare(temp) == 0) {
- ui.browseButton->setEnabled(false);
- break;
- }
- }
- }
- // if the user has clicked on the checkbox cell
- if(ui.serviceWidget->currentColumn() == 4) {
- Service service = _services->take(currentRow);
- QTableWidgetItem* item = ui.serviceWidget->item(currentRow,4);
- if(service.enabled()) {
- item->setCheckState(Qt::Unchecked);
- service.setEnabled(false);
- } else {
- item->setCheckState(Qt::Checked);
- service.setEnabled(true);
- }
- _services->insert(currentRow, service);
- }
-}
-
-/** this method is called when the user finished editing a cell and it provides
- * that only valid values are set */
-void
-ServicePage::valueChanged()
-{
- int pos = 0;
- QIntValidator* portValidator = new QIntValidator(1, 65535, this);
- DomainValidator* domainValidator = new DomainValidator(this);
- IpValidator* ipValidator = new IpValidator(this);
- QTableWidgetItem* item = ui.serviceWidget->currentItem();
- if (item == NULL || item->text() == NULL || item->text().length() == 0) {
- // nothing to validate here
- return;
- }
- QString text = item->text();
- switch (item->column()) {
- case 1: // virtual port
- if(portValidator->validate(text, pos) == QValidator::Acceptable) {
- // correct data; buffer value in user role 32
- item->setData(32, text);
- } else {
- //incorrect data; restore value from user role 32
- VMessageBox::warning(this, tr("Error"),
- tr("Virtual Port may only contain valid port numbers [1..65535]."),
- VMessageBox::Ok);
- item->setText(item->data(32).toString());
- }
- break;
- case 2: // target
- if(text.contains(":")) {
- // check for <address>:<port>
- QStringList strList = text.split(":");
- if (strList.size() != 2) {
- goto invalid;
- }
- QString address = strList.at(0);
- QString port = strList.at(1);
- if((address.compare("localhost") != 0 &&
- ipValidator->validate(address, pos) != QValidator::Acceptable &&
- domainValidator->validate(address, pos) != QValidator::Acceptable) ||
- portValidator->validate(port, pos) != QValidator::Acceptable) {
- goto invalid;
- }
- } else { // either <address> or <port>
- if (text.compare("localhost") != 0 &&
- ipValidator->validate(text, pos) != QValidator::Acceptable &&
- domainValidator->validate(text, pos) != QValidator::Acceptable &&
- portValidator->validate(text, pos) != QValidator::Acceptable) {
- goto invalid;
- }
- }
- goto valid;
- invalid:
- VMessageBox::warning(this, tr("Error"),
- tr("Target may only contain address:port, address, or port."),
- VMessageBox::Ok);
- item->setText(item->data(32).toString());
- break;
- valid:
- item->setData(32, text);
- break;
- case 3: // service directory
- // compare with directories of other enabled services
- for (int index = 0; index < ui.serviceWidget->rowCount(); index++) {
- // skip own row
- if(index == item->row()) {
- continue;
- }
- QTableWidgetItem* compareWith = ui.serviceWidget->item(index, 3);
- if(compareWith != NULL) {
- QString actualDir = compareWith->text();
- if(actualDir.length() > 0 && text.compare(actualDir) == 0) {
- // service directory already in use
- VMessageBox::warning(this, tr("Error"),
- tr("Directory already in use by another service."),
- VMessageBox::Ok);
- item->setText(item->data(32).toString());
- return;
- }
- }
- }
- // correct data; buffer value in user role 32
- item->setData(32, text);
- break;
- }
-}
-
diff --git a/src/vidalia/config/ServicePage.h b/src/vidalia/config/ServicePage.h
deleted file mode 100644
index e32f3a1..0000000
--- a/src/vidalia/config/ServicePage.h
+++ /dev/null
@@ -1,80 +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.
-*/
-
-#ifndef _SERVICEPAGE_H
-#define _SERVICEPAGE_H
-
-#include "ui_ServicePage.h"
-#include "ConfigPage.h"
-#include "TorSettings.h"
-#include "ServiceSettings.h"
-#include "ExitPolicy.h"
-#include "HelpBrowser.h"
-
-#include "TorControl.h"
-
-
-class ServicePage : public ConfigPage
-{
- Q_OBJECT
-
-public:
- /** Default Constructor */
- ServicePage(QWidget *parent = 0);
- /** Default Destructor */
- ~ServicePage();
- /** Saves the changes on this page */
- bool save(QString &errmsg);
- /** Loads the settings for this page */
- void load();
- /** Initialize the service table */
- void initServiceTable(QMap<int, Service>* _services);
- /** Called when the user changes the UI translation. */
- virtual void retranslateUi();
-
-private slots:
- /** Called whenever the user clicks on the 'add' button. */
- void addService();
- /** Called whenever the user clicks on the 'remove' button. */
- void removeService();
- /** Called whenever the user clicks on the 'copy' button. */
- void copyToClipboard();
- /** Called whenever the user clicks on the 'browse' button. */
- void browseDirectory();
- /** Called whenever the user selects a different service. */
- void serviceSelectionChanged();
- /** Returns a list of services by parsing the configuration string given
- * by the Tor controller. */
- QList<Service> extractSingleServices(QString conf);
- /** Returns a Service by parsing the configuration string from Tor and
- * storing its values into the Service object. */
- Service generateService(QString serviceString);
- /** Starts all services in <b>services</b>, with Tor. */
- void startServicesInTor(QList<Service> services);
- /** Returns true if <b>service</b> is published. */
- bool isServicePublished(Service service, QList<Service> torServices);
- /** Returns true if all services have the required minimal configuration. */
- bool checkBeforeSaving(QList<Service> services);
- /** Called when the user finished editing a cell and checks that only valid
- * values are set. */
- void valueChanged();
-
-private:
- /** A QMap, mapping from the row number in the table to the service Entity */
- QMap<int, Service>* _services;
- /** A QList, consisting of all running services before vidalia starts */
- QMap<QString, Service>* _torServices;
-
- /** Qt Designer generated object */
- Ui::ServicePage ui;
-};
-
-#endif
-
diff --git a/src/vidalia/config/ServicePage.ui b/src/vidalia/config/ServicePage.ui
deleted file mode 100644
index 8be3a59..0000000
--- a/src/vidalia/config/ServicePage.ui
+++ /dev/null
@@ -1,166 +0,0 @@
-<ui version="4.0" >
- <class>ServicePage</class>
- <widget class="QWidget" name="ServicePage" >
- <property name="geometry" >
- <rect>
- <x>0</x>
- <y>0</y>
- <width>600</width>
- <height>400</height>
- </rect>
- </property>
- <property name="minimumSize" >
- <size>
- <width>600</width>
- <height>400</height>
- </size>
- </property>
- <property name="windowTitle" >
- <string>Form</string>
- </property>
- <layout class="QVBoxLayout" >
- <item>
- <widget class="QGroupBox" name="groupBox" >
- <property name="sizePolicy" >
- <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <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" >
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="selectionMode" >
- <enum>QAbstractItemView::SingleSelection</enum>
- </property>
- <property name="selectionBehavior" >
- <enum>QAbstractItemView::SelectRows</enum>
- </property>
- <property name="textElideMode" >
- <enum>Qt::ElideLeft</enum>
- </property>
- <property name="showGrid" >
- <bool>true</bool>
- </property>
- <column>
- <property name="text" >
- <string>Onion Address</string>
- </property>
- </column>
- <column>
- <property name="text" >
- <string>Virtual Port</string>
- </property>
- </column>
- <column>
- <property name="text" >
- <string>Target</string>
- </property>
- </column>
- <column>
- <property name="text" >
- <string>Directory Path</string>
- </property>
- </column>
- <column>
- <property name="text" >
- <string>Enabled</string>
- </property>
- </column>
- </widget>
- </item>
- <item row="0" column="1" >
- <widget class="QToolButton" name="addButton" >
- <property name="toolTip" >
- <string>Add new service to list</string>
- </property>
- <property name="text" >
- <string/>
- </property>
- <property name="icon" >
- <iconset resource="../res/vidalia.qrc" >:/images/22x22/list-add.png</iconset>
- </property>
- </widget>
- </item>
- <item row="1" column="1" >
- <widget class="QToolButton" name="removeButton" >
- <property name="toolTip" >
- <string>Remove selected service from list</string>
- </property>
- <property name="text" >
- <string/>
- </property>
- <property name="icon" >
- <iconset resource="../res/vidalia.qrc" >:/images/22x22/list-remove.png</iconset>
- </property>
- </widget>
- </item>
- <item row="2" column="1" >
- <widget class="QToolButton" name="copyButton" >
- <property name="toolTip" >
- <string>Copy onion address of selected service to clipboard</string>
- </property>
- <property name="text" >
- <string/>
- </property>
- <property name="icon" >
- <iconset resource="../res/vidalia.qrc" >:/images/22x22/edit-copy.png</iconset>
- </property>
- </widget>
- </item>
- <item row="3" column="1" >
- <widget class="QToolButton" name="browseButton" >
- <property name="toolTip" >
- <string>Browse in local file system and choose directory for selected service</string>
- </property>
- <property name="text" >
- <string/>
- </property>
- <property name="icon" >
- <iconset resource="../res/vidalia.qrc" >:/images/22x22/folder.png</iconset>
- </property>
- </widget>
- </item>
- <item row="4" column="1" >
- <spacer>
- <property name="orientation" >
- <enum>Qt::Vertical</enum>
- </property>
- <property name="sizeHint" >
- <size>
- <width>21</width>
- <height>46</height>
- </size>
- </property>
- </spacer>
- </item>
- </layout>
- </widget>
- </item>
- <item>
- <spacer>
- <property name="orientation" >
- <enum>Qt::Vertical</enum>
- </property>
- <property name="sizeHint" >
- <size>
- <width>20</width>
- <height>141</height>
- </size>
- </property>
- </spacer>
- </item>
- </layout>
- </widget>
- <resources/>
- <connections/>
-</ui>
diff --git a/src/vidalia/config/ServiceSettings.cpp b/src/vidalia/config/ServiceSettings.cpp
deleted file mode 100644
index 77a9905..0000000
--- a/src/vidalia/config/ServiceSettings.cpp
+++ /dev/null
@@ -1,167 +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.
-*/
-
-#include "ServiceSettings.h"
-#include "TorSettings.h"
-
-#include "stringutil.h"
-
-/* Service Settings */
-#define SETTING_SERVICE_VIRTUAL_PORT "Service/VirtualPort"
-#define SETTING_SERVICE_ADDRESS "Service/ServiceAddress"
-#define SETTING_SERVICE_PHYSICAL_ADDRESS "Service/ServicePhysicalAddress"
-#define SETTING_SERVICE_ENABLED "Service/Enabled"
-#define SETTING_TOR_SERVICES "Service/Services"
-
-/** Constructor.
- * \param torControl a TorControl object used to read and apply the Service
- * configuration settings.
- */
-ServiceSettings::ServiceSettings(TorControl *torControl)
-{
- _torControl = torControl;
- setDefault(SETTING_SERVICE_VIRTUAL_PORT , 0);
- setDefault(SETTING_SERVICE_PHYSICAL_ADDRESS, "127.0.0.1:0");
- setDefault(SETTING_SERVICE_ENABLED, "true");
-}
-
-/** Set ServiceList to serialise it */
-void
-ServiceSettings::setServices(ServiceList service)
-{
- QStringList serviceList;
- if(service.services().size() > 0) {
- QList<Service> services = service.services();
- foreach (Service tempService, services) {
- serviceList << tempService.toString();
- }
- }
- setValue(SETTING_TOR_SERVICES, serviceList);
-}
-
-/** Get serialised ServiceList */
-ServiceList
-ServiceSettings::getServices()
-{
- QString address,virtualPort,physAddrPort,serviceDir,enabledS,additionalData;
- bool enabled = false;
- QStringList stringList;
- ServiceList services;
-
- stringList = value(SETTING_TOR_SERVICES).toStringList();
- foreach (QString s, stringList) {
- QStringList skippedList = s.split("#");
- address = skippedList.first();
- skippedList.removeFirst();
- virtualPort = skippedList.first();
- skippedList.removeFirst();
- physAddrPort = skippedList.first();
- skippedList.removeFirst();
- serviceDir = skippedList.first();
- skippedList.removeFirst();
- enabledS = skippedList.first();
- skippedList.removeFirst();
- additionalData = skippedList.first();
- if(enabledS.compare("x1") == 0) {
- enabled = true;
- }
- Service service(address, virtualPort, physAddrPort, serviceDir, enabled);
- service.setAdditionalServiceOptions(additionalData);
- services.addService(service);
- }
- return services;
-}
-
-/** Returns the virtual port for a specific service*/
-QString
-ServiceSettings::getVirtualPort()
-{
- QString port = value(SETTING_SERVICE_VIRTUAL_PORT).toString();
- return port;
-}
-
-/** Set the virtual port for a specific service*/
-void
-ServiceSettings::setVirtualPort(QString servicePort)
-{
- setValue(SETTING_SERVICE_VIRTUAL_PORT, servicePort);
-}
-
-/** Returns the .onion - service address for a specific service */
-QString
-ServiceSettings::getServiceAddress()
-{
- QString addr = value(SETTING_SERVICE_ADDRESS).toString();
- return addr;
-}
-
-/** Set the .onion - service address or hostname for a specific service */
-void
-ServiceSettings::setServiceAddress(QString addr)
-{
- setValue(SETTING_SERVICE_ADDRESS, addr);
-}
-
-/** Returns the physical address for a specific service */
-QString
-ServiceSettings::getPhysicalAddressPort()
-{
- QString addr = value(SETTING_SERVICE_PHYSICAL_ADDRESS).toString();
- return addr;
-}
-
-/** Set the physical address or hostname for a specific service */
-void
-ServiceSettings::setPhysicalAddressPort(QString addr)
-{
- setValue(SETTING_SERVICE_PHYSICAL_ADDRESS, addr);
-}
-
-/** Returns if the Service is enabled */
-bool
-ServiceSettings::isEnabled()
-{
- return value(SETTING_SERVICE_ENABLED).toBool();
-}
-
-/** Set the service enabled */
-void
-ServiceSettings::setEnabled(bool boolean)
-{
- setValue(SETTING_SERVICE_ENABLED, boolean);
-}
-
-/** Get all service directories from Tor */
-QString
-ServiceSettings::getHiddenServiceDirectories()
-{
- /*XXX: Domenik: Why does this always try to getconf hiddenserviceoptions
- * even if the socket is not connected? */
- QString value = _torControl->getHiddenServiceConf("hiddenserviceoptions");
- return value;
-}
-
-/** Set all services the user wants to start and send it to the
- * Tor Controller*/
-void
-ServiceSettings::applyServices(QString value, QString *errmsg)
-{
- _torControl->setConf(value, errmsg);
- _torControl->saveConf(errmsg);
-}
-
-/** Unpublish all HiddenServices */
-void
-ServiceSettings::unpublishAllServices(QString *errmsg)
-{
- _torControl->resetConf("HiddenServiceDir", errmsg);
- _torControl->saveConf(errmsg);
-}
-
diff --git a/src/vidalia/config/ServiceSettings.h b/src/vidalia/config/ServiceSettings.h
deleted file mode 100644
index 0ee445c..0000000
--- a/src/vidalia/config/ServiceSettings.h
+++ /dev/null
@@ -1,61 +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.
-*/
-
-#ifndef _SERVICESETTINGS_H
-#define _SERVICESETTINGS_H
-
-#include <TorControl.h>
-#include <ServiceList.h>
-#include <VidaliaSettings.h>
-#include <ExitPolicy.h>
-
-
-/* XXX: Domenik: Shouldn't this inherit AbstractTorSettings like the rest of
- * the settings classes? */
-class ServiceSettings : private VidaliaSettings
-{
-public:
- /** Constructor */
- ServiceSettings(TorControl *torControl);
- /** Returns the service port for a specific service*/
- QString getVirtualPort();
- /** Set the service port for a specific service*/
- void setVirtualPort(QString servicePort);
- /** Returns the .onion - service address for a specific service */
- QString getServiceAddress();
- /** Set the .onion - service address for a specific service */
- void setServiceAddress(QString serviceAddress);
- /** Returns the service address or hostname for a specific service */
- QString getPhysicalAddressPort();
- /** Set the service address or hostname for a specific service */
- void setPhysicalAddressPort(QString physicalAddress);
- /** Returns if the Service is enabled */
- bool isEnabled();
- /** Set the service enabled */
- void setEnabled(bool enabled);
- /** Returns a ServiceList containing all services */
- ServiceList getServices();
- /** Set ServiceList to serialise it */
- void setServices(ServiceList services);
- /** Get Service Directories */
- QString getHiddenServiceDirectories();
- /** Set all services the user wants to start and send it to the
- * Tor Controller */
- void applyServices(QString value, QString *errmsg);
- /** Unpublish all services */
- void unpublishAllServices(QString *errmsg);
-
-private:
- /** A TorControl object used to talk to Tor. */
- TorControl* _torControl;
-};
-
-#endif
-
diff --git a/src/vidalia/config/TorSettings.cpp b/src/vidalia/config/TorSettings.cpp
index ff7cf68..25de975 100644
--- a/src/vidalia/config/TorSettings.cpp
+++ b/src/vidalia/config/TorSettings.cpp
@@ -29,8 +29,10 @@
/* Tor Settings */
#define SETTING_TOR_EXECUTABLE "TorExecutable"
#define SETTING_TORRC "Torrc"
-#define SETTING_CONTROL_ADDR "ControlAddr"
+#define SETTING_DEFAULTS_TORRC "DefaultsTorrc"
+#define SETTING_CONTROL_ADDR "ControlListenAddress"
#define SETTING_CONTROL_PORT "ControlPort"
+#define SETTING_SOCKS_PORT "SocksPort"
#define SETTING_SOCKET_PATH "ControlSocket"
#define SETTING_CONTROL_METHOD "ControlMethod"
#define SETTING_AUTH_TOKEN "AuthToken"
@@ -45,6 +47,9 @@
#define SETTING_BOOTSTRAP "Bootstrap"
#define SETTING_BOOTSTRAP_FROM "BootstrapFrom"
#define SETTING_AUTOCONTROL "AutoControl"
+#define SETTING_DISABLE_NETWORK "DisableNetwork"
+#define SETTING_EXITNODES "ExitNodes"
+#define SETTING_ENTRYNODES "EntryNodes"
/** Default to using hashed password authentication */
#define DEFAULT_AUTH_METHOD PasswordAuth
@@ -60,6 +65,7 @@
#define TOR_ARG_HASHED_PASSWORD "HashedControlPassword"
#define TOR_ARG_COOKIE_AUTH "CookieAuthentication"
#define TOR_ARG_SOCKSPORT "SocksPort"
+#define TOR_ARG_CONTROLFILE "ControlPortWriteToFile"
/** Generate random control passwords of 16 characters */
#define PASSWORD_LEN 16
@@ -81,43 +87,66 @@ TorSettings::TorSettings(TorControl *torControl)
#endif
setDefault(SETTING_TORRC, Vidalia::dataDirectory() + "/torrc");
+ setDefault(SETTING_DEFAULTS_TORRC,Vidalia::dataDirectory() + "/defaults_torrc");
setDefault(SETTING_CONTROL_ADDR, "127.0.0.1");
setDefault(SETTING_CONTROL_PORT, 9051);
+ setDefault(SETTING_SOCKS_PORT, 9050);
setDefault(SETTING_AUTH_METHOD, toString(DEFAULT_AUTH_METHOD));
setDefault(SETTING_CONTROL_METHOD, DEFAULT_CONTROL_METHOD);
setDefault(SETTING_SOCKET_PATH, DEFAULT_SOCKET_PATH);
setDefault(SETTING_DATA_DIRECTORY, "");
setDefault(SETTING_CONTROL_PASSWORD, "");
setDefault(SETTING_USE_RANDOM_PASSWORD, true);
- setDefault(SETTING_WARN_PLAINTEXT_PORTS, QList<QVariant>() << 23 << 109
- << 110 << 143);
- setDefault(SETTING_REJECT_PLAINTEXT_PORTS, QList<QVariant>());
setDefault(SETTING_BOOTSTRAP, false);
setDefault(SETTING_BOOTSTRAP_FROM, "");
setDefault(SETTING_AUTOCONTROL, false);
+ setDefault(SETTING_DISABLE_NETWORK, false);
}
/** Applies any changes to Tor's control port or authentication settings. */
bool
TorSettings::apply(QString *errmsg)
{
- QHash<QString, QString> conf;
- QString hashedPassword;
+ Torrc *torrc = Vidalia::torrc();
- conf.insert(SETTING_CONTROL_PORT,
- localValue(SETTING_CONTROL_PORT).toString());
+ torrc->setValue(SETTING_DATA_DIRECTORY, volatileValue(SETTING_DATA_DIRECTORY).toString());
- if(localValue(SETTING_AUTOCONTROL).toBool())
- conf.insert(TOR_ARG_SOCKSPORT, "auto");
- else
- conf.insert(TOR_ARG_SOCKSPORT, "9050");
+ torrc->clear(QStringList() << SETTING_SOCKS_PORT);
+ if(volatileValue(SETTING_AUTOCONTROL).toBool()) {
+ torrc->setValue(SETTING_CONTROL_PORT, "auto");
+ torrc->setValue(SETTING_SOCKS_PORT, "auto");
+ torrc->setValue(TOR_ARG_CONTROLFILE, QString("%1/port.conf").arg(getDataDirectory()));
+ } else {
+ QString socks = volatileValue(SETTING_SOCKS_PORT).toString();
+ QString control = volatileValue(SETTING_CONTROL_PORT).toString();
+
+ if (socks == "0")
+ socks = "9050";
+
+ {
+ with_torrc_value(SETTING_SOCKS_PORT) {
+ if (ret.at(0) != "auto")
+ socks = ret.at(0);
+ }
+ }
+ {
+ with_torrc_value(SETTING_CONTROL_PORT) {
+ if (ret.at(0) != "auto")
+ control = ret.at(0);
+ }
+ }
+
+ torrc->setValue(SETTING_SOCKS_PORT, socks);
+ torrc->setValue(SETTING_CONTROL_PORT, control);
+ }
+ QString hashedPassword;
AuthenticationMethod authMethod =
toAuthenticationMethod(localValue(SETTING_AUTH_METHOD).toString());
switch (authMethod) {
case CookieAuth:
- conf.insert(TOR_ARG_COOKIE_AUTH, "1");
- conf.insert(TOR_ARG_HASHED_PASSWORD, "");
+ torrc->setValue(TOR_ARG_COOKIE_AUTH, "1");
+ torrc->setValue(TOR_ARG_HASHED_PASSWORD, "");
break;
case PasswordAuth:
hashedPassword = useRandomPassword()
@@ -128,34 +157,54 @@ TorSettings::apply(QString *errmsg)
*errmsg = tr("Failed to hash the control password.");
return false;
}
- conf.insert(TOR_ARG_COOKIE_AUTH, "0");
- conf.insert(TOR_ARG_HASHED_PASSWORD, hashedPassword);
+ torrc->setValue(TOR_ARG_COOKIE_AUTH, "0");
+ if(not useRandomPassword())
+ torrc->setValue(TOR_ARG_HASHED_PASSWORD, hashedPassword);
break;
default:
- conf.insert(TOR_ARG_COOKIE_AUTH, "0");
- conf.insert(TOR_ARG_HASHED_PASSWORD, "");
+ torrc->setValue(TOR_ARG_COOKIE_AUTH, "0");
+ torrc->setValue(TOR_ARG_HASHED_PASSWORD, "");
}
- conf.insert(SETTING_WARN_PLAINTEXT_PORTS,
- localValue(SETTING_WARN_PLAINTEXT_PORTS).toStringList().join(","));
- conf.insert(SETTING_REJECT_PLAINTEXT_PORTS,
- localValue(SETTING_REJECT_PLAINTEXT_PORTS).toStringList().join(","));
+ quint32 torVersion = Vidalia::torControl()->getTorVersion();
+ if (torVersion >= 0x00020309)
+ torrc->setValue(SETTING_DISABLE_NETWORK,
+ volatileValue(SETTING_DISABLE_NETWORK).toBool() ? "1" : "0");
+
+ QString exitNodes = volatileValue(SETTING_EXITNODES).toString();
+
+ if (exitNodes.isEmpty()) {
+ torrc->clear(QStringList() << SETTING_EXITNODES);
+ } else {
+ torrc->setValue(SETTING_EXITNODES, exitNodes);
+ }
- return torControl()->setConf(conf, errmsg);
+ QString entryNodes = volatileValue(SETTING_ENTRYNODES).toString();
+
+ if (entryNodes.isEmpty()) {
+ torrc->clear(QStringList() << SETTING_ENTRYNODES);
+ } else {
+ torrc->setValue(SETTING_ENTRYNODES, entryNodes);
+ }
+
+ return torrc->apply(Vidalia::torControl(), errmsg);
}
/** Gets the location of Tor's data directory. */
QString
TorSettings::getDataDirectory() const
{
- return QDir::convertSeparators(value(SETTING_DATA_DIRECTORY).toString());
+ with_torrc_value(SETTING_DATA_DIRECTORY) {
+ return ret.at(0);
+ }
+ return QDir::convertSeparators(volatileValue(SETTING_DATA_DIRECTORY).toString());
}
/** Sets the location to use as Tor's data directory. */
void
TorSettings::setDataDirectory(const QString &dataDirectory)
{
- setValue(SETTING_DATA_DIRECTORY, dataDirectory);
+ setVolatileValue(SETTING_DATA_DIRECTORY, dataDirectory);
}
/** Returns a fully-qualified path to Tor's executable, including the
@@ -184,7 +233,11 @@ TorSettings::getTorrc() const
TorControl *tc = torControl();
if (tc && tc->isConnected() && tc->getInfo("config-file", torrc))
return QDir::convertSeparators(torrc);
- return QDir::convertSeparators(localValue(SETTING_TORRC).toString());
+
+ torrc = localValue(SETTING_TORRC).toString();
+ if(QDir(QFileInfo(torrc).filePath()).isRelative())
+ torrc = QCoreApplication::applicationDirPath() + "/" + torrc;
+ return QDir::convertSeparators(torrc);
}
/** Sets the torrc that will be used when starting Tor.
@@ -196,11 +249,38 @@ TorSettings::setTorrc(const QString &torrc)
setValue(SETTING_TORRC, torrc);
}
+/** Returns the defaults torrc that will be used when starting Tor. */
+QString
+TorSettings::getDefaultsTorrc() const
+{
+ QString torrc;
+ // TorControl *tc = torControl();
+ // if (tc && tc->isConnected() && tc->getInfo("config-file", torrc))
+ // return QDir::convertSeparators(torrc);
+
+ torrc = localValue(SETTING_DEFAULTS_TORRC).toString();
+ if(QDir(QFileInfo(torrc).filePath()).isRelative())
+ torrc = QCoreApplication::applicationDirPath() + "/" + torrc;
+ return QDir::convertSeparators(torrc);
+}
+
+/** Sets the defaults torrc that will be used when starting Tor.
+ * \param torrc The defaults torrc to use.
+ */
+void
+TorSettings::setDefaultsTorrc(const QString &torrc)
+{
+ setValue(SETTING_DEFAULTS_TORRC, torrc);
+}
+
/** Get the address or hostname used to connect to Tor */
QHostAddress
TorSettings::getControlAddress() const
{
- QString addr = localValue(SETTING_CONTROL_ADDR).toString();
+ QString addr = defaultValue(SETTING_CONTROL_ADDR).toString();
+ with_torrc_value(SETTING_CONTROL_ADDR) {
+ addr = ret.at(0);
+ }
return QHostAddress(addr);
}
@@ -208,35 +288,60 @@ TorSettings::getControlAddress() const
void
TorSettings::setControlAddress(const QHostAddress &addr)
{
- setValue(SETTING_CONTROL_ADDR, addr.toString());
+ setVolatileValue(SETTING_CONTROL_ADDR, addr.toString());
}
/** Get the control port used to connect to Tor */
quint16
TorSettings::getControlPort() const
{
- return (quint16)value(SETTING_CONTROL_PORT).toInt();
+ quint16 port = defaultValue(SETTING_CONTROL_PORT).toInt();
+ with_torrc_value(SETTING_CONTROL_PORT) {
+ port = (quint16)ret.at(0).toUInt();
+ }
+ return port;
+}
+
+/** Get the socks port used to connect to Tor */
+quint16
+TorSettings::getSocksPort() const
+{
+ quint16 port = defaultValue(SETTING_SOCKS_PORT).toInt();
+ with_torrc_value(SETTING_SOCKS_PORT) {
+ port = (quint16)ret.at(0).toUInt();
+ }
+ return port;
}
/** Set the control port used to connect to Tor */
void
TorSettings::setControlPort(quint16 port)
{
- setValue(SETTING_CONTROL_PORT, port);
+ setVolatileValue(SETTING_CONTROL_PORT, port);
+}
+
+/** Set the socks port used to connect to Tor */
+void
+TorSettings::setSocksPort(quint16 port)
+{
+ setVolatileValue(SETTING_SOCKS_PORT, port);
}
/** Get the path for ControlSocket */
QString
TorSettings::getSocketPath() const
{
- return value(SETTING_SOCKET_PATH).toString();
+ with_torrc_value(SETTING_SOCKET_PATH) {
+ return ret.at(0);
+ }
+ return defaultValue(SETTING_SOCKET_PATH).toString();
}
/** Set the path for ControlSocket */
void
TorSettings::setSocketPath(const QString &path)
{
- setValue(SETTING_SOCKET_PATH, path);
+ setVolatileValue(SETTING_SOCKET_PATH, path);
}
/** Get the current control method */
@@ -321,10 +426,12 @@ QList<quint16>
TorSettings::getWarnPlaintextPorts() const
{
QList<quint16> out;
- QList<QVariant> ports;
+ QStringList ports;
- ports = value(SETTING_WARN_PLAINTEXT_PORTS).toList();
- foreach (QVariant port, ports) {
+ ports = Vidalia::torrc()->value(SETTING_WARN_PLAINTEXT_PORTS);
+ if(ports.size() > 0)
+ ports = ports.at(0).split(",");
+ foreach (QString port, ports) {
out << port.toUInt();
}
return out;
@@ -335,11 +442,11 @@ TorSettings::getWarnPlaintextPorts() const
void
TorSettings::setWarnPlaintextPorts(const QList<quint16> &ports)
{
- QList<QVariant> warnList;
+ QStringList warnList;
foreach (quint16 port, ports) {
- warnList << QVariant(port);
+ warnList << QString::number(port);
}
- setValue(SETTING_WARN_PLAINTEXT_PORTS, warnList);
+ setValue(SETTING_WARN_PLAINTEXT_PORTS, warnList.join(","));
}
/** Returns the current list of ports that will cause Tor to reject the
@@ -348,10 +455,11 @@ QList<quint16>
TorSettings::getRejectPlaintextPorts() const
{
QList<quint16> out;
- QList<QVariant> ports;
-
- ports = value(SETTING_REJECT_PLAINTEXT_PORTS).toList();
- foreach (QVariant port, ports) {
+ QStringList ports;
+ ports = Vidalia::torrc()->value(SETTING_REJECT_PLAINTEXT_PORTS);
+ if(ports.size() > 0)
+ ports = ports.at(0).split(",");
+ foreach (QString port, ports) {
out << port.toUInt();
}
return out;
@@ -362,11 +470,31 @@ TorSettings::getRejectPlaintextPorts() const
void
TorSettings::setRejectPlaintextPorts(const QList<quint16> &ports)
{
- QList<QVariant> rejectList;
+ QStringList rejectList;
foreach (quint16 port, ports) {
- rejectList << QVariant(port);
+ rejectList << QString::number(port);
+ }
+ setValue(SETTING_REJECT_PLAINTEXT_PORTS, rejectList.join(","));
+}
+
+/** Returns the value for the DisableNetwork option */
+bool
+TorSettings::getDisableNetwork() const
+{
+ bool val = false;
+ with_torrc_value(SETTING_DISABLE_NETWORK) {
+ val = (bool)ret.at(0).toUInt();
}
- setValue(SETTING_REJECT_PLAINTEXT_PORTS, rejectList);
+
+ return val;
+}
+
+/** Sets the DisableNetwork property for tor. When enabled, tor
+ * won't try to reach any node. */
+void
+TorSettings::setDisableNetwork(bool val)
+{
+ setVolatileValue(SETTING_DISABLE_NETWORK, val);
}
/** Returns the string description of the authentication method specified by
@@ -462,11 +590,48 @@ TorSettings::bootstrapFrom() const
bool
TorSettings::autoControlPort() const
{
- return value(SETTING_AUTOCONTROL).toBool();
+ return getControlPort() == 0;
}
void
TorSettings::setAutoControlPort(const bool autoControl)
{
- setValue(SETTING_AUTOCONTROL, autoControl);
+ setVolatileValue(SETTING_AUTOCONTROL, autoControl);
+}
+
+
+/** Returns the selected exit nodes */
+QStringList
+TorSettings::exitNodes() const
+{
+ QStringList exitNodes;
+ with_torrc_value(SETTING_EXITNODES) {
+ exitNodes = ret.at(0).split(",");
+ }
+ return exitNodes;
+}
+
+/** Sets the exit nodes to the specified list */
+void
+TorSettings::setExitNodes(const QStringList &exitNodes)
+{
+ setVolatileValue(SETTING_EXITNODES, exitNodes.join(","));
+}
+
+/** Returns the selected entry nodes */
+QStringList
+TorSettings::entryNodes() const
+{
+ QStringList entryNodes;
+ with_torrc_value(SETTING_ENTRYNODES) {
+ entryNodes = ret.at(0).split(",");
+ }
+ return entryNodes;
+}
+
+/** Sets the entry nodes to the specified list */
+void
+TorSettings::setEntryNodes(const QStringList &entryNodes)
+{
+ setVolatileValue(SETTING_ENTRYNODES, entryNodes.join(","));
}
diff --git a/src/vidalia/config/TorSettings.h b/src/vidalia/config/TorSettings.h
index 75d9754..e995ba7 100644
--- a/src/vidalia/config/TorSettings.h
+++ b/src/vidalia/config/TorSettings.h
@@ -56,6 +56,11 @@ public:
/** Sets the torrc to use when starting Tor. */
void setTorrc(const QString &torrc);
+ /** Gets the defaults torrc to use when starting Tor. */
+ QString getDefaultsTorrc() const;
+ /** Sets the defaults torrc to use when starting Tor. */
+ void setDefaultsTorrc(const QString &torrc);
+
/** Get Tor's control interface address. */
QHostAddress getControlAddress() const;
/** Set Tor's control interface address. */
@@ -63,8 +68,12 @@ public:
/** Get the control port. */
quint16 getControlPort() const;
+ /** Get the socks port. */
+ quint16 getSocksPort() const;
/** Set the control port. */
void setControlPort(quint16 port);
+ /** Set the socks port. */
+ void setSocksPort(quint16 port);
/** Get the path for ControlSocket */
QString getSocketPath() const;
@@ -118,6 +127,12 @@ public:
* when the user tries to connect to one of them. */
void setRejectPlaintextPorts(const QList<quint16> &ports);
+ /** Returns the value for the DisableNetwork option */
+ bool getDisableNetwork() const;
+ /** Sets the DisableNetwork property for tor. When enabled, tor
+ * won't try to reach any node. */
+ void setDisableNetwork(bool val);
+
/** Generates a random control password consisting of PASSWORD_LEN
* characters. */
static QString randomPassword();
@@ -134,6 +149,16 @@ public:
/** Sets the location of the bootstrap torrc file */
void setBootstrapFrom(const QString &from);
+ /** Returns the selected exit nodes */
+ QStringList exitNodes() const;
+ /** Sets the exit nodes to the specified list */
+ void setExitNodes(const QStringList &exitNodes);
+
+ /** Returns the selected entry nodes */
+ QStringList entryNodes() const;
+ /** Sets the entry nodes to the specified list */
+ void setEntryNodes(const QStringList &entryNodes);
+
private:
/** Returns the AuthenticationMethod enum value for the string
* description of the authentication method given in <b>authMethod</b>. */
diff --git a/src/vidalia/config/TorrcDialog.cpp b/src/vidalia/config/TorrcDialog.cpp
index 3a08710..abc7bb7 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.
@@ -69,60 +87,8 @@ TorrcDialog::~TorrcDialog()
bool
TorrcDialog::parseAndSet(QString *errmsg)
{
- if(!errmsg) errmsg = new QString("");
- if(!tc || !tc->isConnected()) {
- *errmsg = tr("Error connecting to Tor");
- return false;
- }
-
- QString key, val;
- QStringList parts, lines;
-
- if(ui.rdoAll->isChecked())
- lines = ui.teditTorrc->toPlainText().split('\n', QString::SkipEmptyParts);
- else {
- QString tmp = ui.teditTorrc->toPlainText();
- QTextCursor tcursor = ui.teditTorrc->textCursor();
- int start = tcursor.selectionStart();
- int end = tcursor.selectionEnd();
- tmp = tmp.mid(start, end - start).trimmed();
- if(tmp.isEmpty()) {
- *errmsg = tr("Selection is empty. Please select some text, or check \"Apply all\"");
- return false;
- }
-
- lines = tmp.split('\n', QString::SkipEmptyParts);
- }
- /* First pass: parsing */
- int i = 0;
- foreach(QString line, lines) {
- i++;
- int commentIndex = line.indexOf("#");
- if(commentIndex != -1)
- line = line.remove(commentIndex, line.length() - commentIndex);
-
- line = line.trimmed();
- if(line.startsWith("#")) continue; // Skip commentaries
- parts = line.split(" ", QString::SkipEmptyParts);
- if(parts.count() < 2) {
- *errmsg = tr("Error at line %1: \"%2\"").arg(i).arg(line);
- return false;
- }
- }
- /* Second pass: setting */
- QHash<QString,QString> settings;
- foreach(QString line, lines) {
- line = line.trimmed();
- parts = line.split(" ", QString::SkipEmptyParts);
- key = parts[0];
- parts.removeFirst();
- val = parts.join(" ");
- settings.insert(key, val);
- }
-
- if(!tc->setConf(settings, errmsg)) return false;
-
- return true;
+ return Vidalia::torrc()->setRawContents(ui.teditTorrc->toPlainText(),
+ errmsg, Vidalia::torControl());
}
/** Loads the saved torrc file that Tor's using to the TextEdit widget for
@@ -130,20 +96,19 @@ TorrcDialog::parseAndSet(QString *errmsg)
void
TorrcDialog::loadTorrc()
{
- if(tc && tc->isConnected()) {
- QString text = "";
- QFile file(tc->getInfo("config-file").toString());
- if(file.open(QFile::ReadOnly)) {
- QTextStream in(&file);
- QString line = "";
- do {
- line = in.readLine();
- text += line + "\n";
- } while(!line.isNull());
- ui.teditTorrc->setText(text);
- } else {
- QMessageBox::critical(this, tr("Error"), tr("An error ocurred while opening torrc file"));
- }
+ QString text = "";
+ QFile file(Vidalia::torrc()->getTorrcPath());
+ if(file.open(QFile::ReadOnly)) {
+ QTextStream in(&file);
+ QString line = "";
+ do {
+ line = in.readLine();
+ text += line + "\n";
+ } while(!line.isNull());
+ ui.teditTorrc->setText(text);
+ } else {
+ QMessageBox::critical(this, tr("Error"), tr("An error ocurred while opening torrc file: %1")
+ .arg(file.error()));
}
}
@@ -153,17 +118,9 @@ void
TorrcDialog::saveTorrc()
{
QString errmsg = "";
- if(tc && tc->isConnected()) {
- if(!parseAndSet(&errmsg)) {
- QMessageBox::critical(this, tr("Error"), errmsg);
- return;
- }
- if(ui.chkSave->isChecked()) {
- if(!tc->saveConf(&errmsg)) {
- QMessageBox::critical(this, tr("Error"), errmsg);
- return;
- }
- }
+ if(!parseAndSet(&errmsg)) {
+ QMessageBox::critical(this, tr("Error"), errmsg);
+ return;
}
accept();
}
diff --git a/src/vidalia/config/TorrcDialog.h b/src/vidalia/config/TorrcDialog.h
index 372c672..e16b04f 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..5e55d79 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,33 @@
<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">
- <property name="text">
- <string>Save settings. If unchecked it will only apply settings to the current Tor instance.</string>
- </property>
- <property name="checked">
- <bool>true</bool>
- </property>
- </widget>
- </item>
- <item row="0" column="0">
- <layout class="QHBoxLayout" name="horizontalLayout">
- <item>
- <widget class="QPushButton" name="btnCut">
- <property name="text">
- <string>Cut</string>
- </property>
- <property name="icon">
- <iconset resource="../res/vidalia.qrc">
- <normaloff>:/images/22x22/editcut.png</normaloff>:/images/22x22/editcut.png</iconset>
- </property>
- <property name="iconSize">
- <size>
- <width>22</width>
- <height>22</height>
- </size>
- </property>
- <property name="flat">
- <bool>true</bool>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QPushButton" name="btnCopy">
- <property name="text">
- <string>Copy</string>
- </property>
- <property name="icon">
- <iconset resource="../res/vidalia.qrc">
- <normaloff>:/images/22x22/edit-copy.png</normaloff>:/images/22x22/edit-copy.png</iconset>
- </property>
- <property name="iconSize">
- <size>
- <width>22</width>
- <height>22</height>
- </size>
- </property>
- <property name="flat">
- <bool>true</bool>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QPushButton" name="btnPaste">
- <property name="text">
- <string>Paste</string>
- </property>
- <property name="icon">
- <iconset resource="../res/vidalia.qrc">
- <normaloff>:/images/22x22/editpaste.png</normaloff>:/images/22x22/editpaste.png</iconset>
- </property>
- <property name="iconSize">
- <size>
- <width>22</width>
- <height>22</height>
- </size>
- </property>
- <property name="flat">
- <bool>true</bool>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QPushButton" name="btnUndo">
- <property name="text">
- <string>Undo</string>
- </property>
- <property name="icon">
- <iconset resource="../res/vidalia.qrc">
- <normaloff>:/images/22x22/edit_undo.png</normaloff>:/images/22x22/edit_undo.png</iconset>
- </property>
- <property name="iconSize">
- <size>
- <width>22</width>
- <height>22</height>
- </size>
- </property>
- <property name="flat">
- <bool>true</bool>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QPushButton" name="btnRedo">
- <property name="text">
- <string>Redo</string>
- </property>
- <property name="icon">
- <iconset resource="../res/vidalia.qrc">
- <normaloff>:/images/22x22/edit_redo.png</normaloff>:/images/22x22/edit_redo.png</iconset>
- </property>
- <property name="iconSize">
- <size>
- <width>22</width>
- <height>22</height>
- </size>
- </property>
- <property name="flat">
- <bool>true</bool>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QPushButton" name="btnSelectAll">
- <property name="text">
- <string>Select All</string>
- </property>
- <property name="icon">
- <iconset resource="../res/vidalia.qrc">
- <normaloff>:/images/22x22/edit_select_all.png</normaloff>:/images/22x22/edit_select_all.png</iconset>
- </property>
- <property name="iconSize">
- <size>
- <width>22</width>
- <height>22</height>
- </size>
- </property>
- <property name="flat">
- <bool>true</bool>
- </property>
- </widget>
- </item>
- <item>
- <spacer name="horizontalSpacer">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeHint" >
- <size>
- <width>40</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- </item>
- </layout>
- </item>
- <item row="3" column="0">
- <layout class="QHBoxLayout" name="horizontalLayout_2">
- <item>
- <widget class="QRadioButton" name="rdoAll">
- <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>
- </layout>
+ <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 row="1" column="0">
+ <item>
<widget class="QDialogButtonBox" name="buttonBox">
<property name="orientation">
<enum>Qt::Horizontal</enum>
@@ -204,6 +60,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 +154,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 +170,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 +186,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 +202,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 +218,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 +234,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/VSettings.cpp b/src/vidalia/config/VSettings.cpp
index 283cd81..c1e2dfc 100644
--- a/src/vidalia/config/VSettings.cpp
+++ b/src/vidalia/config/VSettings.cpp
@@ -20,16 +20,25 @@
/** The file in which all settings will read and written. */
#define SETTINGS_FILE (Vidalia::dataDirectory() + "/vidalia.conf")
+#define SETTINGS_DEFAULTS_FILE (Vidalia::dataDirectory() + "/vidalia.defaults.conf")
/** Constructor */
VSettings::VSettings(const QString settingsGroup)
: QSettings(SETTINGS_FILE, QSettings::IniFormat)
{
+ _defaultSettings = new QSettings(SETTINGS_DEFAULTS_FILE,
+ QSettings::IniFormat);
+
if (!settingsGroup.isEmpty())
beginGroup(settingsGroup);
}
+VSettings::~VSettings()
+{
+ delete _defaultSettings;
+}
+
/** Returns the location of Vidalia's configuration settings file. */
QString
VSettings::settingsFile()
@@ -70,7 +79,7 @@ VSettings::setValue(const QString &key, const QVariant &val)
void
VSettings::setDefault(const QString &key, const QVariant &val)
{
- _defaults.insert(key, val);
+ _defaults.insert(key, _defaultSettings->value(key, val));
}
/** Returns the default setting value associated with <b>key</b>. If
@@ -103,3 +112,17 @@ VSettings::allSettings() const
return settings;
}
+QVariant
+VSettings::volatileValue(const QString &key,
+ const QVariant &defaultVal) const
+{
+ if(_volatileSettings.count(key) == 0)
+ return defaultVal;
+ return _volatileSettings.value(key);
+}
+
+void
+VSettings::setVolatileValue(const QString &key, const QVariant &val)
+{
+ _volatileSettings.insert(key, val);
+}
diff --git a/src/vidalia/config/VSettings.h b/src/vidalia/config/VSettings.h
index 251e9f8..725748e 100644
--- a/src/vidalia/config/VSettings.h
+++ b/src/vidalia/config/VSettings.h
@@ -29,6 +29,8 @@ public:
* set a prefix that will be prepended to keys specified to VSettings in
* value() and setValue(). */
VSettings(const QString group = QString());
+ /** Default destructor */
+ ~VSettings();
/** Returns the location of Vidalia's configuration settings file. */
static QString settingsFile();
@@ -57,9 +59,19 @@ protected:
* point. */
QMap<QString, QVariant> allSettings() const;
+ virtual QVariant volatileValue(const QString &key,
+ const QVariant &defaultVal = QVariant()) const;
+ virtual void setVolatileValue(const QString &key, const QVariant &val);
+
private:
/** Association of setting key names to default setting values. */
QHash<QString, QVariant> _defaults;
+
+ /** Stores values that last as long as Vidalia lives as a process */
+ QMap<QString, QVariant> _volatileSettings;
+
+ /** Defaults stored in a settings file */
+ QSettings *_defaultSettings;
};
#endif
diff --git a/src/vidalia/config/VidaliaSettings.cpp b/src/vidalia/config/VidaliaSettings.cpp
index d5bfdfb..4c92a1f 100644
--- a/src/vidalia/config/VidaliaSettings.cpp
+++ b/src/vidalia/config/VidaliaSettings.cpp
@@ -29,28 +29,26 @@
#define SETTING_RUN_TOR_AT_START "RunTorAtStart"
#define SETTING_DATA_DIRECTORY "DataDirectory"
#define SETTING_SHOW_MAINWINDOW_AT_START "ShowMainWindowAtStart"
-#define SETTING_BROWSER_EXECUTABLE "BrowserExecutable"
-#define SETTING_BROWSER_DIRECTORY "BrowserDirectory"
-#define SETTING_PROFILE_DIRECTORY "ProfileDirectory"
-#define SETTING_DEFAULT_PROFILE_DIRECTORY "DefaultProfileDirectory"
-#define SETTING_PLUGINS_DIRECTORY "PluginsDirectory"
-#define SETTING_DEFAULT_PLUGINS_DIRECTORY "DefaultPluginsDirectory"
+#define SETTING_BROWSER_EXECUTABLE "BrowserExecutable"
+#define SETTING_BROWSER_DIRECTORY "BrowserDirectory"
#define SETTING_IM_EXECUTABLE "IMExecutable"
-#define SETTING_RUN_PROXY_AT_START "RunProxyAtStart"
-#define SETTING_PROXY_EXECUTABLE "ProxyExecutable"
-#define SETTING_PROXY_EXECUTABLE_ARGUMENTS "ProxyExecutableArguments"
#define SETTING_CHECK_FOR_UPDATES "CheckForUpdates"
#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"
+#define SETTING_ALLOW_PANIC "AllowPanic"
+#define SETTING_PANIC_PATH "PanicPath"
+#define SETTING_FIRST_RUN "FirstRun"
+#define SETTING_VIDALIA_VERSION "VidaliaVersion"
#if defined(Q_OS_WIN32)
#define STARTUP_REG_KEY "Software\\Microsoft\\Windows\\CurrentVersion\\Run"
#define VIDALIA_REG_KEY "Vidalia"
#endif
-#define SETTING_ICON_PREF "IconDisplayPreference"
+#define SETTING_ICON_PREF "IconPref"
/** Default Constructor */
VidaliaSettings::VidaliaSettings()
@@ -77,9 +75,6 @@ VidaliaSettings::VidaliaSettings()
setDefault(SETTING_SHOW_MAINWINDOW_AT_START, true);
setDefault(SETTING_BROWSER_EXECUTABLE, "");
setDefault(SETTING_IM_EXECUTABLE, "");
- setDefault(SETTING_RUN_PROXY_AT_START, false);
- setDefault(SETTING_PROXY_EXECUTABLE, "");
- setDefault(SETTING_PROXY_EXECUTABLE_ARGUMENTS, QString());
#if defined(Q_WS_WIN)
setDefault(SETTING_CHECK_FOR_UPDATES, true);
#else
@@ -88,13 +83,17 @@ 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);
+ setDefault(SETTING_ALLOW_PANIC, false);
+ setDefault(SETTING_PANIC_PATH, "");
+ setDefault(SETTING_FIRST_RUN, true);
+ setDefault(SETTING_REMEMBER_DONTWARNEXIT, true);
- setDefault(SETTING_PROFILE_DIRECTORY, "");
- setDefault(SETTING_DEFAULT_PROFILE_DIRECTORY, "");
- setDefault(SETTING_PLUGINS_DIRECTORY, "");
- setDefault(SETTING_DEFAULT_PLUGINS_DIRECTORY, "");
+ setValue(SETTING_VIDALIA_VERSION, Vidalia::version());
}
/** Gets the currently preferred language code for Vidalia. */
@@ -239,53 +238,6 @@ VidaliaSettings::setIMExecutable(const QString &IMExecutable)
setValue(SETTING_IM_EXECUTABLE, IMExecutable);
}
-/** Returns true if Vidalia should start a proxy application when it
- * starts. */
-bool
-VidaliaSettings::runProxyAtStart()
-{
- return value(SETTING_RUN_PROXY_AT_START).toBool();
-}
-
-/** Set whether to run a proxy application when Vidalia starts. */
-void
-VidaliaSettings::setRunProxyAtStart(bool run)
-{
- setValue(SETTING_RUN_PROXY_AT_START, run);
-}
-
-/** Returns a fully-qualified path to the proxy server, including the
- * executable name. */
-QString
-VidaliaSettings::getProxyExecutable() const
-{
- return QDir::convertSeparators(value(SETTING_PROXY_EXECUTABLE).toString());
-}
-
-/** Sets the location and name of the proxy server executable to the given
- * string. If set to the empty string, the proxy will not be started. */
-void
-VidaliaSettings::setProxyExecutable(const QString &proxyExecutable)
-{
- setValue(SETTING_PROXY_EXECUTABLE, proxyExecutable);
-}
-
-/** Returns a string containing additional command line arguments to be passed
- * to ProxyExecutable */
-QString
-VidaliaSettings::getProxyExecutableArguments() const
-{
- return value(SETTING_PROXY_EXECUTABLE_ARGUMENTS).toString();
-}
-
-/** Sets the additional arguments to be passed to Proxy Executable */
-void
-VidaliaSettings::setProxyExecutableArguments(const QString
- &proxyExecutableArguments)
-{
- setValue(SETTING_PROXY_EXECUTABLE_ARGUMENTS, proxyExecutableArguments);
-}
-
bool
VidaliaSettings::isAutoUpdateEnabled() const
{
@@ -334,6 +286,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()
@@ -373,50 +337,74 @@ VidaliaSettings::skipVersionCheck() const
return value(SETTING_SKIP_VERSION_CHECK).toBool();
}
-QString
-VidaliaSettings::getDefaultProfileDirectory() const
+bool
+VidaliaSettings::rememberShutdown()
{
- return QDir::convertSeparators(value(SETTING_DEFAULT_PROFILE_DIRECTORY).toString());
+ return value(SETTING_REMEMBER_SHUTDOWN).toBool();
}
void
-VidaliaSettings::setDefaultProfileDirectory(const QString &dir)
+VidaliaSettings::setRememberShutdown(bool val)
{
- setValue(SETTING_DEFAULT_PROFILE_DIRECTORY, dir);
+ setValue(SETTING_REMEMBER_SHUTDOWN, val);
}
-QString
-VidaliaSettings::getProfileDirectory() const
+bool
+VidaliaSettings::allowPanic() const
{
- return QDir::convertSeparators(value(SETTING_PROFILE_DIRECTORY).toString());
+ return value(SETTING_ALLOW_PANIC).toBool();
}
void
-VidaliaSettings::setProfileDirectory(const QString &dir)
+VidaliaSettings::setAllowPanic(bool val)
{
- setValue(SETTING_PROFILE_DIRECTORY, dir);
+ setValue(SETTING_ALLOW_PANIC, val);
}
QString
-VidaliaSettings::getPluginsDirectory() const
+VidaliaSettings::panicPath() const
{
- return QDir::convertSeparators(value(SETTING_PLUGINS_DIRECTORY).toString());
+ return value(SETTING_PANIC_PATH).toString();
}
void
-VidaliaSettings::setPluginsDirectory(const QString &dir)
+VidaliaSettings::setPanicPath(const QString &path)
{
- setValue(SETTING_PLUGINS_DIRECTORY, dir);
+ setValue(SETTING_PANIC_PATH, path);
}
-QString
-VidaliaSettings::getDefaultPluginsDirectory() const
+bool
+VidaliaSettings::firstRun() const
+{
+ return value(SETTING_FIRST_RUN).toBool();
+}
+
+void
+VidaliaSettings::setFirstRun(bool val)
+{
+ setValue(SETTING_FIRST_RUN, val);
+}
+
+bool
+VidaliaSettings::dontWarnExitNodes() const
+{
+ return value(SETTING_REMEMBER_DONTWARNEXIT).toBool();
+}
+
+void
+VidaliaSettings::setDontWarnExitNodes(bool val)
+{
+ setValue(SETTING_REMEMBER_DONTWARNEXIT, val);
+}
+
+bool
+VidaliaSettings::dontWarnEntryNodes() const
{
- return QDir::convertSeparators(value(SETTING_DEFAULT_PLUGINS_DIRECTORY).toString());
+ return value(SETTING_REMEMBER_DONTWARNENTRY).toBool();
}
void
-VidaliaSettings::setDefaultPluginsDirectory(const QString &dir)
+VidaliaSettings::setDontWarnEntryNodes(bool val)
{
- setValue(SETTING_DEFAULT_PLUGINS_DIRECTORY, dir);
+ setValue(SETTING_REMEMBER_DONTWARNENTRY, val);
}
diff --git a/src/vidalia/config/VidaliaSettings.h b/src/vidalia/config/VidaliaSettings.h
index 4ecf2d3..43a9600 100644
--- a/src/vidalia/config/VidaliaSettings.h
+++ b/src/vidalia/config/VidaliaSettings.h
@@ -20,6 +20,10 @@
#include <QDateTime>
+/** Public setting keys */
+#define SETTING_REMEMBER_SHUTDOWN "RememberShutdown"
+#define SETTING_REMEMBER_DONTWARNEXIT "DontWarnExitNodes"
+#define SETTING_REMEMBER_DONTWARNENTRY "DontWarnEntryNodes"
/** Handles saving and restoring Vidalia's settings, such as the
* location of Tor, the control port, etc.
@@ -82,16 +86,6 @@ public:
* If set to the empty string, the browser will not be started. */
void setBrowserDirectory(const QString &browserDirectory);
- /** Browser directories */
- QString getDefaultProfileDirectory() const;
- void setDefaultProfileDirectory(const QString &dir);
- QString getProfileDirectory() const;
- void setProfileDirectory(const QString &dir);
- QString getPluginsDirectory() const;
- void setPluginsDirectory(const QString &dir);
- QString getDefaultPluginsDirectory() const;
- void setDefaultPluginsDirectory(const QString &dir);
-
/** Returns a fully-qualified path to the IM client, including the
* executable name. */
QString getIMExecutable() const;
@@ -99,25 +93,6 @@ public:
* string. If set to the empty string, the client will not be started. */
void setIMExecutable(const QString &IMExecutable);
- /** Returns true if Vidalia should start a proxy application when it
- * starts. */
- bool runProxyAtStart();
- /** Set whether to run a proxy application when Vidalia starts. */
- void setRunProxyAtStart(bool run);
-
- /** Returns a fully-qualified path to the proxy server, including the
- * executable name. */
- QString getProxyExecutable() const;
- /** Sets the location and name of the proxy server executable to the given
- * string. If set to the empty string, the proxy will not be started. */
- void setProxyExecutable(const QString &proxyExecutable);
-
- /** Returns a list containing additional command line arguments to be
- * passed to ProxyExecutable */
- QString getProxyExecutableArguments() const;
- /** Sets the additional arguments to be passed to Proxy Executable */
- void setProxyExecutableArguments(const QString &proxyExecutableArguments);
-
/** Returns true if Vidalia should automatically check for software updates.
*/
bool isAutoUpdateEnabled() const;
@@ -142,6 +117,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();
@@ -152,6 +132,41 @@ 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);
+
+ /** Returns true if AllowPanic is enabled */
+ bool allowPanic() const;
+ /** Sets AllowPanic to val */
+ void setAllowPanic(bool val);
+
+ /** Returns the path that should be eliminated for panic */
+ QString panicPath() const;
+ /** Sets the path for panic */
+ void setPanicPath(const QString &path);
+
+ /** Returns true if it's Vidalia's first run */
+ bool firstRun() const;
+ /** Sets Vidalia's first run option */
+ void setFirstRun(bool val);
+
+ /** Returns true if Vidalia should warn the user when setting Exit
+ * nodes by hand */
+ bool dontWarnExitNodes() const;
+ /** Sets wether Vidalia should warn the user when setting Exit nodes
+ * by hand */
+ void setDontWarnExitNodes(bool val);
+
+ /** Returns true if Vidalia should warn the user when setting Entry
+ * nodes by hand */
+ bool dontWarnEntryNodes() const;
+ /** Sets wether Vidalia should warn the user when setting Entry nodes
+ * by hand */
+ void setDontWarnEntryNodes(bool val);
};
#endif
diff --git a/src/vidalia/config/torrc/Torrc.cpp b/src/vidalia/config/torrc/Torrc.cpp
new file mode 100644
index 0000000..7fa0333
--- /dev/null
+++ b/src/vidalia/config/torrc/Torrc.cpp
@@ -0,0 +1,271 @@
+/*
+** 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 Torrc.cpp
+** \brief Handles the interaction with the torrc file
+*/
+
+#include "Torrc.h"
+#include "Vidalia.h"
+
+#include <QtGlobal>
+
+Torrc::Torrc(const QString &torrcPath, const QString &defaultsPath) :
+ QObject(), _torrcPath(torrcPath), _changed(false)
+{
+ load(torrcPath, defaultsPath);
+}
+
+void
+Torrc::load(const QString &torrcPath, const QString &defaultsPath)
+{
+ _torrcMap.clear();
+ _defaultsMap.clear();
+
+ _lines = _parser.parse(torrcPath, _torrcMap);
+
+ if(not defaultsPath.isEmpty())
+ _parser.parse(defaultsPath, _defaultsMap);
+}
+
+bool
+Torrc::apply(TorControl *tc, QString *errmsg)
+{
+ if(not _changed)
+ return true;
+
+ QFile torrc(_torrcPath);
+ QFileInfo torrc_info(torrc);
+
+ if(!torrc.open(QIODevice::WriteOnly)) {
+ if (errmsg)
+ *errmsg = "Couldn't open torrc file";
+ return false;
+ }
+
+ QString torrc_contents = "";
+ QString current_line;
+
+ foreach(TorrcLine *line, _lines) {
+ if (line->content().trimmed().length() > 0) {
+ TorOpt currentOpt = _parser.getTorOpt(line->content().split(" ")[0]);
+ // Skip default values
+ if(not currentOpt.isMultilined() and currentOpt.defaultValue() == _torrcMap.value(currentOpt.name()).first)
+ continue;
+ }
+ torrc_contents += QString("%1 %2")
+ .arg(line->content())
+ .arg(line->comment()).trimmed();
+ torrc_contents += "\n";
+ }
+
+ if(torrc_info.isWritable())
+ torrc.write(torrc_contents.trimmed().toLatin1());
+ else
+ vWarn("Torrc is not writable!");
+
+ torrc.close();
+
+ clearAll();
+ load(_torrcPath);
+
+ _changed = false;
+
+ bool ret = true;
+ if(tc && tc->isConnected()) {
+ if(!tc->loadConf(torrc_contents, errmsg)) {
+ vWarn(QObject::tr("There were some settings that Vidalia "
+ "wasn't able to apply together"));
+ vWarn("Trying to apply them one at a time...");
+ QPair<QString, TorOpt> value;
+ QString ferrmsg;
+ ControlReply reply;
+ bool somefailed = false;
+ foreach(QString key, _torrcMap.keys()) {
+ foreach(value, _torrcMap.values(key)) {
+ if(not tc->setConf(key, value.first, &ferrmsg, &reply)) {
+ if(reply.getStatus() == "553") {
+ vWarn(QObject::tr("Failed to set %1:\nReason: %2")
+ .arg(key).arg(ferrmsg));
+ somefailed = true;
+ } else {
+ if (errmsg)
+ *errmsg = ferrmsg;
+ return false;
+ }
+ }
+ }
+ }
+ if(somefailed) {
+ if(torrc_info.isWritable())
+ vWarn(QObject::tr("The failed options were saved in your torrc "
+ "and will be applied when you restart."));
+ else
+ vWarn(QObject::tr("The failed options were NOT saved in your torrc "
+ "and will be applied when you restart."));
+ }
+ if(not torrc_info.isWritable())
+ vWarn(QObject::tr("Vidalia was unable to save the options to the torrc file."));
+ }
+ }
+ return true;
+}
+
+QStringList
+Torrc::value(const QString &key) const
+{
+ QStringList ret;
+ QPair<QString,TorOpt> value;
+ if(_torrcMap.contains(key)) {
+ foreach(value, _torrcMap.values(key))
+ ret << value.first;
+ return ret;
+ }
+
+ if(_defaultsMap.contains(key)) {
+ foreach(value, _defaultsMap.values(key))
+ ret << value.first;
+ return ret;
+ }
+
+ return ret;
+}
+
+void
+Torrc::setValue(const QString &key, const QString &value, const QString &comment)
+{
+ // Prevent possible bugs
+ if(not key.isEmpty() and value.isEmpty())
+ return;
+
+ TorOpt currentOpt = _parser.getTorOpt(key);
+ if(currentOpt.isNull())
+ return;
+
+ if(_defaultsMap.contains(key)) {
+ QPair<QString,TorOpt> defvalue;
+ foreach(defvalue, _defaultsMap.values(key)) {
+ if(defvalue.first == value) {
+ if(not currentOpt.isMultivalued())
+ clear(QStringList() << key);
+ return;
+ }
+ }
+ } else if(currentOpt.defaultValue() == value) {
+ if(not currentOpt.isMultivalued())
+ clear(QStringList() << key);
+ return;
+ }
+
+ if(_torrcMap.contains(key)) {
+ QPair<QString,TorOpt> val;
+ foreach(val, _torrcMap.values(key)) {
+ if(not val.second.isMultilined() and val.first != value) {
+ val.second.line()->setContent(QString("%1 %2")
+ .arg(key)
+ .arg(value));
+ if(not comment.isEmpty() and val.second.line()->comment().isEmpty())
+ val.second.line()->setComment(comment);
+ _changed = true;
+ return;
+ } else if(not val.second.isMultilined() and val.first == value) {
+ // if it's the same, leave it like that
+ return;
+ } // else it's multilined, in which case we just add a new entry
+ }
+ }
+
+ _changed = true;
+
+ TorrcLine *line = new TorrcLine(QString("%1 %2")
+ .arg(key)
+ .arg(value).trimmed(),
+ comment.trimmed());
+ if(key.isEmpty()) {
+ _lines << line;
+ return;
+ }
+
+ TorOpt opt(_parser.getTorOpt(key));
+
+ if(opt.isMultivalued()) {
+ bool found = false;
+ QPair<QString,TorOpt> val;
+ foreach(val, _torrcMap.values(key)) {
+ if(val.first == value) {
+ found = true;
+ break;
+ }
+ }
+
+ opt.setLine(line);
+
+ if(!found)
+ _torrcMap.insertMulti(key, QPair<QString,TorOpt>(value, opt));
+ else
+ return;
+ } else
+ _torrcMap.insert(key, QPair<QString,TorOpt>(value, opt));
+
+ _lines << line;
+}
+
+void
+Torrc::clear(QStringList &keys)
+{
+ QPair<QString, TorOpt> value;
+ foreach(const QString key, keys) {
+ foreach(value, _torrcMap.values(key)) {
+ if(value.second.line()) {
+ value.second.line()->setContent("");
+ if(value.second.line()->comment().isEmpty())
+ _lines.removeAll(value.second.line());
+ }
+ }
+ _torrcMap.remove(key);
+ _changed = true;
+ }
+}
+
+bool
+Torrc::isValid(const QString &key, const QString &value)
+{
+ if(not _parser.getTorOpt(key).isNull())
+ return true;
+ // TODO: check value
+ return false;
+}
+
+void
+Torrc::clearAll()
+{
+ _torrcMap.clear();
+ _lines.clear();
+}
+
+bool
+Torrc::setRawContents(const QString &contents, QString *errmsg, TorControl *tc)
+{
+ clearAll();
+
+ QFile torrc(_torrcPath);
+ if(!torrc.open(QIODevice::WriteOnly)) {
+ *errmsg = "Couldn't open torrc file";
+ return false;
+ }
+
+ torrc.write(contents.trimmed().toLatin1());
+ torrc.close();
+
+ load(_torrcPath);
+
+ return apply(tc, errmsg);
+}
diff --git a/src/vidalia/config/torrc/Torrc.h b/src/vidalia/config/torrc/Torrc.h
new file mode 100644
index 0000000..9d45742
--- /dev/null
+++ b/src/vidalia/config/torrc/Torrc.h
@@ -0,0 +1,77 @@
+/*
+** 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 Torrc.h
+** \brief Handles the interaction with the torrc file
+*/
+
+#ifndef TORRC_H
+#define TORRC_H
+
+#include <QtCore>
+
+#include "TorControl.h"
+#include "TorrcParser.h"
+
+class Torrc : public QObject
+{
+ Q_OBJECT
+ public:
+ /** Constructor */
+ Torrc(const QString &torrcPath, const QString &defaultsPath = "");
+
+ /** Loads the torrc from the path provided and its defaults if provided */
+ void load(const QString &torrcPath, const QString &defaultsPath = "");
+
+ /** Applies the changes in configuration to the torrc file */
+ bool apply(TorControl *tc = 0, QString *errmsg = 0);
+ /** Clears the keys provided in the list */
+ void clear(QStringList &keys);
+ /** Clears the _torrcMap and _lines values */
+ void clearAll();
+
+ /** Returns a list of values associated with the given key */
+ QStringList value(const QString &key) const;
+ /** Sets the value to the given key with a optional
+ * comment that will appear in the file */
+ void setValue(const QString &key, const QString &value, const QString &comment = "");
+
+ /** Returns the used torrc path */
+ QString getTorrcPath() const
+ { return _torrcPath; }
+
+ /** Returns true if the key=value is a valid config option */
+ bool isValid(const QString &key, const QString &value);
+
+ /** Resets the config values as if the torrc file contained the
+ * string in contents, and applies it. */
+ bool setRawContents(const QString &contents, QString *errmsg, TorControl *tc = 0);
+
+ private:
+ /** Map that contains the key=value config options and a
+ representation to the actual line in the torrc file */
+ QMap<QString, QPair<QString,TorOpt> > _torrcMap;
+ /** Map that contains the key=value config options and a
+ representation to the actual line in the defaults torrc file */
+ QMap<QString, QPair<QString,TorOpt> > _defaultsMap;
+ /** List of torrc lines */
+ QList<TorrcLine *> _lines;
+ /** Parser used to analyze the torrc and defaults files */
+ TorrcParser _parser;
+
+ /** Path to the used torrc file */
+ QString _torrcPath;
+
+ /** True if the config options have been changed */
+ bool _changed;
+};
+
+#endif
diff --git a/src/vidalia/config/torrc/TorrcParser.cpp b/src/vidalia/config/torrc/TorrcParser.cpp
new file mode 100644
index 0000000..bdcd618
--- /dev/null
+++ b/src/vidalia/config/torrc/TorrcParser.cpp
@@ -0,0 +1,430 @@
+/*
+** 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 TorrcParser.cpp
+** \brief Parser for the torrc file and other data representations for the file
+*/
+
+#include "TorrcParser.h"
+#include "Vidalia.h"
+
+TorrcParser::TorrcParser()
+{
+ _torOpts << TorOpt("AccountingMax", TorOpt::DataSize, "0 bytes");
+ _torOpts << TorOpt("AccountingStart", TorOpt::String, "");
+ _torOpts << TorOpt("Address", TorOpt::String, "");
+ _torOpts << TorOpt("AllowDotExit", TorOpt::Boolean, "0");
+ _torOpts << TorOpt("AllowInvalidNodes", TorOpt::CommaList, "middle,rendezvous");
+ _torOpts << TorOpt("AllowNonRFC953Hostnames", TorOpt::Boolean, "0");
+ _torOpts << TorOpt("AllowSingleHopCircuits", TorOpt::Boolean, "0");
+ _torOpts << TorOpt("AllowSingleHopExits", TorOpt::Boolean, "0");
+ _torOpts << TorOpt("AlternateBridgeAuthority", TorOpt::LineList, "");
+ _torOpts << TorOpt("AlternateDirAuthority", TorOpt::LineList, "");
+ _torOpts << TorOpt("AlternateHSAuthority", TorOpt::LineList, "");
+ _torOpts << TorOpt("AssumeReachable", TorOpt::Boolean, "0");
+ _torOpts << TorOpt("AuthDirBadDir", TorOpt::LineList, "");
+ _torOpts << TorOpt("AuthDirBadExit", TorOpt::LineList, "");
+ _torOpts << TorOpt("AuthDirInvalid", TorOpt::LineList, "");
+ _torOpts << TorOpt("AuthDirReject", TorOpt::LineList, "");
+ _torOpts << TorOpt("AuthDirRejectUnlisted", TorOpt::Boolean, "0");
+ _torOpts << TorOpt("AuthDirListBadDirs", TorOpt::Boolean, "0");
+ _torOpts << TorOpt("AuthDirListBadExits", TorOpt::Boolean, "0");
+ _torOpts << TorOpt("AuthDirMaxServersPerAddr", TorOpt::Integer, "2");
+ _torOpts << TorOpt("AuthDirMaxServersPerAuthAddr", TorOpt::Integer, "5");
+ _torOpts << TorOpt("AuthoritativeDirectory", TorOpt::Boolean, "0");
+ _torOpts << TorOpt("AutomapHostsOnResolve", TorOpt::Boolean, "0");
+ _torOpts << TorOpt("AutomapHostsSuffixes", TorOpt::CommaList, ".onion,.exit");
+ _torOpts << TorOpt("AvoidDiskWrites", TorOpt::Boolean, "0");
+ _torOpts << TorOpt("BandwidthBurst", TorOpt::DataSize, "10 MB");
+ _torOpts << TorOpt("BandwidthRate", TorOpt::DataSize, "5 MB");
+ _torOpts << TorOpt("BridgeAuthoritativeDir", TorOpt::Boolean, "0");
+ _torOpts << TorOpt("Bridge", TorOpt::LineList, "");
+ _torOpts << TorOpt("BridgePassword", TorOpt::String, "");
+ _torOpts << TorOpt("BridgeRecordUsageByCountry", TorOpt::Boolean, "1");
+ _torOpts << TorOpt("BridgeRelay", TorOpt::Boolean, "0");
+ _torOpts << TorOpt("CellStatistics", TorOpt::Boolean, "0");
+ _torOpts << TorOpt("LearnCircuitBuildTimeout", TorOpt::Boolean, "1");
+ _torOpts << TorOpt("CircuitBuildTimeout", TorOpt::TimeInterval, "0");
+ _torOpts << TorOpt("CircuitIdleTimeout", TorOpt::TimeInterval, "1 hour");
+ _torOpts << TorOpt("CircuitStreamTimeout", TorOpt::TimeInterval, "0");
+ _torOpts << TorOpt("CircuitPriorityHalflife", TorOpt::Float, "-100.0");
+ _torOpts << TorOpt("ClientDNSRejectInternalAddresses", TorOpt::Boolean, "1");
+ _torOpts << TorOpt("ClientOnly", TorOpt::Boolean, "0");
+ _torOpts << TorOpt("ClientRejectInternalAddresses", TorOpt::Boolean, "1");
+ _torOpts << TorOpt("ClientTransportPlugin", TorOpt::LineList, "");
+ _torOpts << TorOpt("ConsensusParams", TorOpt::String, "");
+ _torOpts << TorOpt("ConnLimit", TorOpt::Integer, "1000");
+ _torOpts << TorOpt("ConnDirectionStatistics", TorOpt::Boolean, "0");
+ _torOpts << TorOpt("ConstrainedSockets", TorOpt::Boolean, "0");
+ _torOpts << TorOpt("ConstrainedSockSize", TorOpt::DataSize, "8192");
+ _torOpts << TorOpt("ContactInfo", TorOpt::String, "");
+ _torOpts << TorOpt("ControlListenAddress", TorOpt::LineList, "");
+ _torOpts << TorOpt("ControlPort", TorOpt::Port, "0");
+ _torOpts << TorOpt("ControlPortFileGroupReadable", TorOpt::Boolean, "0");
+ _torOpts << TorOpt("ControlPortWriteToFile", TorOpt::Filename, "");
+ _torOpts << TorOpt("ControlSocket", TorOpt::LineList, "");
+ _torOpts << TorOpt("ControlSocketsGroupWritable", TorOpt::Boolean, "0");
+ _torOpts << TorOpt("CookieAuthentication", TorOpt::Boolean, "0");
+ _torOpts << TorOpt("CookieAuthFileGroupReadable", TorOpt::Boolean, "0");
+ _torOpts << TorOpt("CookieAuthFile", TorOpt::String, "");
+ _torOpts << TorOpt("CountPrivateBandwidth", TorOpt::Boolean, "0");
+ _torOpts << TorOpt("DataDirectory", TorOpt::Filename, "");
+ _torOpts << TorOpt("DirAllowPrivateAddresses", TorOpt::Boolean, "");
+ _torOpts << TorOpt("TestingAuthDirTimeToLearnReachability", TorOpt::TimeInterval, "30 minutes");
+ _torOpts << TorOpt("DirListenAddress", TorOpt::LineList, "");
+ _torOpts << TorOpt("DirPolicy", TorOpt::LineList, "");
+ _torOpts << TorOpt("DirPort", TorOpt::Port, "0");
+ _torOpts << TorOpt("DirPortFrontPage", TorOpt::Filename, "");
+ _torOpts << TorOpt("DirReqStatistics", TorOpt::Boolean, "1");
+ _torOpts << TorOpt("DirServer", TorOpt::LineList, "");
+ _torOpts << TorOpt("DisableAllSwap", TorOpt::Boolean, "0");
+ _torOpts << TorOpt("DisableIOCP", TorOpt::Boolean, "1");
+ _torOpts << TorOpt("DisableNetwork", TorOpt::Boolean, "0");
+ _torOpts << TorOpt("DNSPort", TorOpt::LineList, "");
+ _torOpts << TorOpt("DNSListenAddress", TorOpt::LineList, "");
+ _torOpts << TorOpt("DownloadExtraInfo", TorOpt::Boolean, "0");
+ _torOpts << TorOpt("EnforceDistinctSubnets", TorOpt::Boolean, "1");
+ _torOpts << TorOpt("EntryNodes", TorOpt::RouterList, "");
+ _torOpts << TorOpt("EntryStatistics", TorOpt::Boolean, "0");
+ _torOpts << TorOpt("TestingEstimatedDescriptorPropagationTime", TorOpt::TimeInterval, "10 minutes");
+ _torOpts << TorOpt("ExcludeNodes", TorOpt::RouterList, "");
+ _torOpts << TorOpt("ExcludeExitNodes", TorOpt::RouterList, "");
+ _torOpts << TorOpt("ExcludeSingleHopRelays", TorOpt::Boolean, "1");
+ _torOpts << TorOpt("ExitNodes", TorOpt::RouterList, "");
+ _torOpts << TorOpt("ExitPolicy", TorOpt::LineList, "");
+ _torOpts << TorOpt("ExitPolicyRejectPrivate", TorOpt::Boolean, "1");
+ _torOpts << TorOpt("ExitPortStatistics", TorOpt::Boolean, "0");
+ _torOpts << TorOpt("ExtraInfoStatistics", TorOpt::Boolean, "1");
+ _torOpts << TorOpt("FallbackNetworkstatusFile", TorOpt::Filename, "/usr/local/share/tor/fallback-consensus");
+ _torOpts << TorOpt("FascistFirewall", TorOpt::Boolean, "0");
+ _torOpts << TorOpt("FirewallPorts", TorOpt::CommaList, "");
+ _torOpts << TorOpt("FastFirstHopPK", TorOpt::Boolean, "1");
+ _torOpts << TorOpt("FetchDirInfoEarly", TorOpt::Boolean, "0");
+ _torOpts << TorOpt("FetchDirInfoExtraEarly", TorOpt::Boolean, "0");
+ _torOpts << TorOpt("FetchServerDescriptors", TorOpt::Boolean, "1");
+ _torOpts << TorOpt("FetchHidServDescriptors", TorOpt::Boolean, "1");
+ _torOpts << TorOpt("FetchUselessDescriptors", TorOpt::Boolean, "0");
+ _torOpts << TorOpt("FetchV2Networkstatus", TorOpt::Boolean, "0");
+ _torOpts << TorOpt("GeoIPFile", TorOpt::Filename, "/usr/local/share/tor/geoip");
+ _torOpts << TorOpt("GiveGuardFlagTo_CVE_2011_2768_VulnerableRelays", TorOpt::Boolean, "0");
+ _torOpts << TorOpt("HardwareAccel", TorOpt::Boolean, "0");
+ _torOpts << TorOpt("HeartbeatPeriod", TorOpt::TimeInterval, "6 hours");
+ _torOpts << TorOpt("AccelName", TorOpt::String, "");
+ _torOpts << TorOpt("AccelDir", TorOpt::Filename, "");
+ // HashedControlPassword will only use one value, the salt prevents
+ // treat it like the rest of the LineLists
+ _torOpts << TorOpt("HashedControlPassword", TorOpt::String, "");
+ _torOpts << TorOpt("HidServDirectoryV2", TorOpt::Boolean, "1");
+ _torOpts << TorOpt("HiddenServiceDir", TorOpt::Dependant, "");
+ _torOpts << TorOpt("HiddenServiceOptions", TorOpt::Virtual, "");
+ _torOpts << TorOpt("HiddenServicePort", TorOpt::Dependant, "");
+ _torOpts << TorOpt("HiddenServiceVersion", TorOpt::Dependant, "");
+ _torOpts << TorOpt("HiddenServiceAuthorizeClient", TorOpt::Dependant, "");
+ _torOpts << TorOpt("HidServAuth", TorOpt::LineList, "");
+ _torOpts << TorOpt("HSAuthoritativeDir", TorOpt::Boolean, "0");
+ _torOpts << TorOpt("HTTPProxy", TorOpt::String, "");
+ _torOpts << TorOpt("HTTPProxyAuthenticator", TorOpt::String, "");
+ _torOpts << TorOpt("HTTPSProxy", TorOpt::String, "");
+ _torOpts << TorOpt("HTTPSProxyAuthenticator", TorOpt::String, "");
+ _torOpts << TorOpt("ServerTransportPlugin", TorOpt::LineList, "");
+ _torOpts << TorOpt("Socks4Proxy", TorOpt::String, "");
+ _torOpts << TorOpt("Socks5Proxy", TorOpt::String, "");
+ _torOpts << TorOpt("Socks5ProxyUsername", TorOpt::String, "");
+ _torOpts << TorOpt("Socks5ProxyPassword", TorOpt::String, "");
+ _torOpts << TorOpt("KeepalivePeriod", TorOpt::TimeInterval, "5 minutes");
+ _torOpts << TorOpt("Log", TorOpt::LineList, "");
+ _torOpts << TorOpt("LogMessageDomains", TorOpt::Boolean, "0");
+ _torOpts << TorOpt("LogTimeGranularity", TorOpt::TimeMsecInterval, "1 second");
+ _torOpts << TorOpt("LongLivedPorts", TorOpt::CommaList, "21,22,706,1863,5050,5190,5222,5223,6523,6667,6697,8300");
+ _torOpts << TorOpt("MapAddress", TorOpt::LineList, "");
+ _torOpts << TorOpt("MaxAdvertisedBandwidth", TorOpt::DataSize, "1 GB");
+ _torOpts << TorOpt("MaxCircuitDirtiness", TorOpt::TimeInterval, "10 minutes");
+ _torOpts << TorOpt("MaxClientCircuitsPending", TorOpt::Integer, "32");
+ _torOpts << TorOpt("MaxOnionsPending", TorOpt::Integer, "100");
+ _torOpts << TorOpt("MyFamily", TorOpt::String, "");
+ _torOpts << TorOpt("NewCircuitPeriod", TorOpt::TimeInterval, "30 seconds");
+ _torOpts << TorOpt("NamingAuthoritativeDirectory", TorOpt::Boolean, "0");
+ _torOpts << TorOpt("NATDListenAddress", TorOpt::LineList, "");
+ _torOpts << TorOpt("NATDPort", TorOpt::LineList, "");
+ _torOpts << TorOpt("Nickname", TorOpt::String, "");
+ _torOpts << TorOpt("WarnUnsafeSocks", TorOpt::Boolean, "1");
+ _torOpts << TorOpt("NodeFamily", TorOpt::LineList, "");
+ _torOpts << TorOpt("NumCPUs", TorOpt::Integer, "0");
+ _torOpts << TorOpt("NumEntryGuards", TorOpt::Integer, "3");
+ _torOpts << TorOpt("ORListenAddress", TorOpt::LineList, "");
+ _torOpts << TorOpt("ORPort", TorOpt::Port, "0");
+ _torOpts << TorOpt("OutboundBindAddress", TorOpt::String, "");
+ _torOpts << TorOpt("PerConnBWBurst", TorOpt::DataSize, "0");
+ _torOpts << TorOpt("PerConnBWRate", TorOpt::DataSize, "0");
+ _torOpts << TorOpt("PidFile", TorOpt::String, "");
+ _torOpts << TorOpt("TestingTorNetwork", TorOpt::Boolean, "0");
+ _torOpts << TorOpt("OptimisticData", TorOpt::BooleanAuto, "auto");
+ _torOpts << TorOpt("PortForwarding", TorOpt::Boolean, "0");
+ _torOpts << TorOpt("PortForwardingHelper", TorOpt::Filename, "tor-fw-helper");
+ _torOpts << TorOpt("PreferTunneledDirConns", TorOpt::Boolean, "1");
+ _torOpts << TorOpt("ProtocolWarnings", TorOpt::Boolean, "0");
+ _torOpts << TorOpt("PublishServerDescriptor", TorOpt::CommaList, "1");
+ _torOpts << TorOpt("PublishHidServDescriptors", TorOpt::Boolean, "1");
+ _torOpts << TorOpt("ReachableAddresses", TorOpt::LineList, "");
+ _torOpts << TorOpt("ReachableDirAddresses", TorOpt::LineList, "");
+ _torOpts << TorOpt("ReachableORAddresses", TorOpt::LineList, "");
+ _torOpts << TorOpt("RecommendedVersions", TorOpt::LineList, "");
+ _torOpts << TorOpt("RecommendedClientVersions", TorOpt::LineList, "");
+ _torOpts << TorOpt("RecommendedServerVersions", TorOpt::LineList, "");
+ _torOpts << TorOpt("RefuseUnknownExits", TorOpt::BooleanAuto, "auto");
+ _torOpts << TorOpt("RejectPlaintextPorts", TorOpt::CommaList, "");
+ _torOpts << TorOpt("RelayBandwidthBurst", TorOpt::DataSize, "0");
+ _torOpts << TorOpt("RelayBandwidthRate", TorOpt::DataSize, "0");
+ _torOpts << TorOpt("RendPostPeriod", TorOpt::TimeInterval, "1 hour");
+ _torOpts << TorOpt("RephistTrackTime", TorOpt::TimeInterval, "24 hours");
+ _torOpts << TorOpt("RunAsDaemon", TorOpt::Boolean, "0");
+ _torOpts << TorOpt("SafeLogging", TorOpt::String, "1");
+ _torOpts << TorOpt("SafeSocks", TorOpt::Boolean, "0");
+ _torOpts << TorOpt("ServerDNSAllowBrokenConfig", TorOpt::Boolean, "1");
+ _torOpts << TorOpt("ServerDNSAllowNonRFC953Hostnames", TorOpt::Boolean, "0");
+ _torOpts << TorOpt("ServerDNSDetectHijacking", TorOpt::Boolean, "1");
+ _torOpts << TorOpt("ServerDNSRandomizeCase", TorOpt::Boolean, "1");
+ _torOpts << TorOpt("ServerDNSResolvConfFile", TorOpt::String, "");
+ _torOpts << TorOpt("ServerDNSSearchDomains", TorOpt::Boolean, "0");
+ _torOpts << TorOpt("ServerDNSTestAddresses", TorOpt::CommaList, "www.google.com,www.mit.edu,www.yahoo.com,www.slashdot.org");
+ _torOpts << TorOpt("ShutdownWaitLength", TorOpt::TimeInterval, "30 seconds");
+ _torOpts << TorOpt("SocksListenAddress", TorOpt::LineList, "");
+ _torOpts << TorOpt("SocksPolicy", TorOpt::LineList, "");
+ _torOpts << TorOpt("SocksPort", TorOpt::LineList, "");
+ _torOpts << TorOpt("SocksTimeout", TorOpt::TimeInterval, "2 minutes");
+ _torOpts << TorOpt("StrictNodes", TorOpt::Boolean, "0");
+ _torOpts << TorOpt("TestSocks", TorOpt::Boolean, "0");
+ _torOpts << TorOpt("TokenBucketRefillInterval", TorOpt::TimeMsecInterval, "100 msec");
+ _torOpts << TorOpt("TrackHostExits", TorOpt::CommaList, "");
+ _torOpts << TorOpt("TrackHostExitsExpire", TorOpt::TimeInterval, "30 minutes");
+ _torOpts << TorOpt("TransListenAddress", TorOpt::LineList, "");
+ _torOpts << TorOpt("TransPort", TorOpt::LineList, "");
+ _torOpts << TorOpt("TunnelDirConns", TorOpt::Boolean, "1");
+ _torOpts << TorOpt("UpdateBridgesFromAuthority", TorOpt::Boolean, "0");
+ _torOpts << TorOpt("UseBridges", TorOpt::Boolean, "0");
+ _torOpts << TorOpt("UseEntryGuards", TorOpt::Boolean, "1");
+ _torOpts << TorOpt("UseMicrodescriptors", TorOpt::BooleanAuto, "auto");
+ _torOpts << TorOpt("User", TorOpt::String, "");
+ _torOpts << TorOpt("V1AuthoritativeDirectory", TorOpt::Boolean, "0");
+ _torOpts << TorOpt("V2AuthoritativeDirectory", TorOpt::Boolean, "0");
+ _torOpts << TorOpt("V3AuthoritativeDirectory", TorOpt::Boolean, "0");
+ _torOpts << TorOpt("TestingV3AuthInitialVotingInterval", TorOpt::TimeInterval, "30 minutes");
+ _torOpts << TorOpt("TestingV3AuthInitialVoteDelay", TorOpt::TimeInterval, "5 minutes");
+ _torOpts << TorOpt("TestingV3AuthInitialDistDelay", TorOpt::TimeInterval, "5 minutes");
+ _torOpts << TorOpt("V3AuthVotingInterval", TorOpt::TimeInterval, "1 hour");
+ _torOpts << TorOpt("V3AuthVoteDelay", TorOpt::TimeInterval, "5 minutes");
+ _torOpts << TorOpt("V3AuthDistDelay", TorOpt::TimeInterval, "5 minutes");
+ _torOpts << TorOpt("V3AuthNIntervalsValid", TorOpt::Integer, "3");
+ _torOpts << TorOpt("V3AuthUseLegacyKey", TorOpt::Boolean, "0");
+ _torOpts << TorOpt("V3BandwidthsFile", TorOpt::Filename, "");
+ _torOpts << TorOpt("VersioningAuthoritativeDirectory", TorOpt::Boolean, "0");
+ _torOpts << TorOpt("VirtualAddrNetwork", TorOpt::String, "127.192.0.0/10");
+ _torOpts << TorOpt("WarnPlaintextPorts", TorOpt::CommaList, "23,109,110,143");
+ _torOpts << TorOpt("_UseFilteringSSLBufferevents", TorOpt::Boolean, "0");
+ _torOpts << TorOpt("__ReloadTorrcOnSIGHUP", TorOpt::Boolean, "1");
+ _torOpts << TorOpt("__AllDirActionsPrivate", TorOpt::Boolean, "0");
+ _torOpts << TorOpt("__DisablePredictedCircuits", TorOpt::Boolean, "0");
+ _torOpts << TorOpt("__LeaveStreamsUnattached", TorOpt::Boolean, "0");
+ _torOpts << TorOpt("__HashedControlSessionPassword", TorOpt::LineList, "");
+ _torOpts << TorOpt("__OwningControllerProcess", TorOpt::String, "");
+ _torOpts << TorOpt("MinUptimeHidServDirectoryV2", TorOpt::TimeInterval, "25 hours");
+ _torOpts << TorOpt("VoteOnHidServDirectoriesV2", TorOpt::Boolean, "1");
+ _torOpts << TorOpt("_UsingTestNetworkDefaults", TorOpt::Boolean, "0");
+
+ _regexp = createRegExp();
+}
+
+QRegExp
+TorrcParser::createRegExp()
+{
+ QString reg = "";
+ foreach(TorOpt opt, _torOpts) {
+ reg += opt.name();
+ reg += "|";
+ }
+ reg = reg.remove(reg.size() - 1, 1);
+
+ return QRegExp(reg, Qt::CaseInsensitive);
+}
+
+TorOpt
+TorrcParser::getTorOpt(const QString &name)
+{
+ foreach(const TorOpt &opt, _torOpts) {
+ if(opt.name() == name)
+ return opt;
+ }
+
+ return TorOpt::null();
+}
+
+QList<TorrcLine *>
+TorrcParser::parse(const QString &path,
+ QMap<QString, QPair<QString, TorOpt> > &map)
+{
+ QFile torrc(path);
+ QFileInfo torrc_info;
+ QList<TorrcLine *> lines;
+ torrc_info.setFile(torrc);
+
+ if(not torrc_info.isReadable()) {
+ vWarn("Can't read torrc file, aborting parsing.");
+ return lines;
+ }
+
+ if(not torrc.open(QIODevice::ReadOnly)) {
+ vWarn("Can't open torrc file, aborting parsing.");
+ return lines;
+ }
+
+ QString raw_contents(torrc.readAll());
+ torrc.close();
+
+ lines = toTorrcLines(raw_contents);
+
+ QString key, value;
+ int sp_pos = -1;
+
+ foreach(TorrcLine *line, lines) {
+ sp_pos = line->content().indexOf(" ");
+ if(sp_pos == -1)
+ continue;
+
+ key = line->content().mid(0, sp_pos);
+ value = "";
+ if(line->isMultilined()) {
+ QList<TorrcLine *> valueLines = findValueLines(line, lines);
+ foreach(TorrcLine *valueLine, valueLines) {
+ if(valueLine->isMultilined()) {
+ value += valueLine->content().remove(valueLine->content().lastIndexOf("\\"), 1);
+ } else
+ // Last line, doesn't have \ at the end
+ value += valueLine->content();
+ // remove the contents, since they will live in the first line only
+ valueLine->setContent("");
+ }
+ line->setContent(QString("%1 %2").arg(key).arg(value));
+ } else {
+ value = line->content().mid(sp_pos+1, line->content().size());
+ }
+
+ TorOpt opt(getTorOpt(key));
+ opt.setLine(line);
+
+ if(map.contains(key) and opt.isMultivalued())
+ map.insertMulti(key, QPair<QString, TorOpt>(value, opt));
+ else
+ map.insert(key, QPair<QString, TorOpt>(value, opt));
+ }
+
+ return lines;
+}
+
+QString
+TorrcParser::stripContents(QString contents)
+{
+ QString stripped_contents = "", current_line = "";
+ int comment_pos = -1;
+
+ foreach(QString line, contents.split("\n")) {
+ comment_pos = line.indexOf("#");
+ if(comment_pos == -1) {
+ stripped_contents += line.trimmed();
+ stripped_contents += "\n";
+ continue;
+ }
+
+ current_line = line.mid(0, comment_pos).trimmed();
+ if(current_line.size() == 0)
+ continue;
+ stripped_contents += current_line;
+ stripped_contents += "\n";
+ }
+
+ return stripped_contents.replace("\t", " ");
+}
+
+QList<TorrcLine *>
+TorrcParser::toTorrcLines(QString contents)
+{
+ QList<TorrcLine *> lines;
+ QString stripped_contents = "", current_line = "";
+ int comment_pos = -1;
+
+ foreach(QString line, contents.split("\n")) {
+ comment_pos = line.indexOf("#");
+ if(comment_pos == -1) {
+ lines << new TorrcLine(line.trimmed());
+ continue;
+ }
+
+ current_line = line.mid(0, comment_pos).trimmed().replace("\t", " ");
+ if(current_line.size() == 0) {
+ // The line is just a comment
+ lines << new TorrcLine("", line.trimmed());
+ continue;
+ }
+ lines << new TorrcLine(current_line, line.mid(comment_pos, line.size()).trimmed());
+ }
+
+ return lines;
+}
+
+QList<TorrcLine *>
+TorrcParser::findValueLines(TorrcLine *line,
+ const QList<TorrcLine *> &lines) const
+{
+ QList<TorrcLine *> collected;
+
+ int index = -1;
+ index = lines.indexOf(line) + 1;
+ if(index >= lines.size())
+ return collected;
+
+ for(int i = index; i<lines.size(); i++) {
+ if(lines.at(i)->isMultilined())
+ collected << lines.at(i);
+ else {
+ collected << lines.at(i);
+ break;
+ }
+ }
+
+ return collected;
+}
+
+bool
+TorrcParser::isKeyword(const QString &contents, int pos)
+{
+ while(contents.at(pos) != '\n') {
+ pos--;
+ if(pos < 0 or contents.at(pos) == '\n')
+ return true;
+ if(contents.at(pos) != ' ')
+ return false;
+ }
+ return true;
+}
+
+QDebug
+operator<<(QDebug dbg, const TorOpt &opt) {
+ dbg.nospace() << qPrintable(QString("TorOpt(%1)")
+ .arg(opt.name()));
+ return dbg;
+}
+
+QDebug
+operator<<(QDebug dbg, TorrcLine *line) {
+ dbg.nospace() << qPrintable(QString("TorLine(%1, %2)")
+ .arg(line->content())
+ .arg(line->comment()));
+ return dbg;
+}
diff --git a/src/vidalia/config/torrc/TorrcParser.h b/src/vidalia/config/torrc/TorrcParser.h
new file mode 100644
index 0000000..94ef148
--- /dev/null
+++ b/src/vidalia/config/torrc/TorrcParser.h
@@ -0,0 +1,189 @@
+/*
+** 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 TorrcParser.h
+** \brief Parser for the torrc file and other data representations for the file
+*/
+
+#ifndef TORRCPARSER_H
+#define TORRCPARSER_H
+
+#include <QtCore>
+
+/** Rpresents a line in the torrc file that respects the formatting
+ * the user gave it */
+class TorrcLine
+{
+ public:
+ /** Constructor */
+ TorrcLine(const QString &content = "", const QString &comment = "")
+ : _content(content), _comment(comment) {}
+
+ /** Returns the content for this line */
+ QString content()
+ { return _content; }
+ /** Sets the contents for this line */
+ void setContent(const QString &content)
+ { _content = content; }
+
+ /** Returns the comment for this line */
+ QString comment()
+ { return _comment; }
+ /** Sets the comment for this line */
+ void setComment(const QString &comment)
+ { _comment = comment; }
+
+ /** Returns true if the line's content is divided into other
+ * subsequent lines */
+ bool isMultilined()
+ {
+ int index = -1;
+ index = _content.lastIndexOf("\\") + 1;
+ if(index == -1)
+ return false;
+ for(int i = index; i<_content.size(); i++) {
+ if(_content.at(i) != ' ')
+ return false;
+ }
+ return true;
+ }
+
+ private:
+ /** Strings that hold the content and comment for the line */
+ QString _content, _comment;
+};
+
+/** Represents an possible option in the torrc file. This is used to
+ * handle the different type of values that may be associated with
+ * each option */
+class TorOpt
+{
+ public:
+ /** Possible value types */
+ enum OptType {
+ TimeInterval = 0,
+ TimeMsecInterval,
+ String,
+ RouterList,
+ LineList,
+ Float,
+ Dependant,
+ Virtual,
+ Filename,
+ CommaList,
+ Boolean,
+ BooleanAuto,
+ Integer,
+ DataSize,
+ Port,
+ NIL
+ };
+
+ /** Default constructor */
+ TorOpt()
+ { TorOpt("", NIL); }
+ /** Constructor */
+ TorOpt(const QString &name, OptType type, QString defaultValue = "")
+ : _name(name), _type(type), _default(defaultValue), _line(0) {}
+ /** Copy constructor */
+ TorOpt(const TorOpt &opt)
+ : _name(opt.name()), _type(opt.type()), _default(opt.defaultValue()), _line(opt.line()) {}
+
+ /** Returns true if this option can be defined with multiple lines */
+ bool isMultilined()
+ { return _type == LineList or _type == Dependant or _type == Virtual; }
+
+ /** Returns true if this option can be defined multiple times with
+ * different values */
+ bool isMultivalued()
+ { return _type == LineList; }
+
+ /** Returns the name for this option */
+ QString name() const
+ { return _name; }
+
+ /** Returns the type for this option*/
+ OptType type() const
+ { return _type; }
+
+ /** Returns the default value that tor assumes for this option */
+ QString defaultValue() const
+ { return _default; }
+
+ /** Returns a pointer to the TorrcLine for this option */
+ TorrcLine *line() const
+ { return _line; }
+
+ /** Sets the line for this option */
+ void setLine(TorrcLine *line)
+ { _line = line; }
+
+ /** Returns true if it's a null TorOpt */
+ bool isNull() const
+ { return _type == NIL; }
+
+ /** Creates a null TorOpt*/
+ static TorOpt null()
+ { return TorOpt("Nil", NIL); }
+
+ private:
+ /** Name for this option */
+ QString _name;
+ /** Type for this option */
+ OptType _type;
+ /** Default value for this option */
+ QString _default;
+ /** Pointer to the line that represents this option */
+ TorrcLine *_line;
+};
+
+/** Parser for the torrc file and any other torrc structured file */
+class TorrcParser
+{
+ public:
+ /** Default constructor */
+ TorrcParser();
+
+ /** Parses the torrc file provided in the path and returns the
+ * TorrcLine list for the file and the map of key=value */
+ QList<TorrcLine *> parse(const QString &path,
+ QMap<QString, QPair<QString, TorOpt> > &map);
+ /** Returns the TorOpt for a given option name */
+ TorOpt getTorOpt(const QString &name);
+
+ private:
+ /** List with all the current valid options for the torrc */
+ QList<TorOpt> _torOpts;
+ /** Regular expression used in the parsing based on _torOpts */
+ QRegExp _regexp;
+
+ /** Strips the torrc contents passed from comments an empty lines */
+ QString stripContents(QString contents);
+ /** Given the contents of a torrc file, it returns a list of
+ * TorrcLines representing it */
+ QList<TorrcLine *> toTorrcLines(QString contents);
+ /** Given a TorrcLine and the line list where it belongs, it returns
+ * the set of lines that define the multilined value */
+ QList<TorrcLine *> findValueLines(TorrcLine *line,
+ const QList<TorrcLine *> &lines) const;
+ /** Creates the regular expression used in parsing */
+ QRegExp createRegExp();
+ /** Returns true if there's a keyword in the contents at the given
+ * pos */
+ bool isKeyword(const QString &contents, int pos);
+};
+
+/** Debug output methods */
+QDebug operator<<(QDebug dbg, const TorOpt &opt);
+QDebug operator<<(QDebug dbg, TorrcLine *line);
+
+#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/en/contents.xml b/src/vidalia/help/content/en/contents.xml
index ae42116..87bf9ce 100644
--- a/src/vidalia/help/content/en/contents.xml
+++ b/src/vidalia/help/content/en/contents.xml
@@ -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.
-->
@@ -39,6 +39,8 @@
<Topic id="bandwidth" name="Bandwidth Limits" html="server.html" section="bandwidth"/>
<Topic id="exitpolicy" name="Exit Policies" html="server.html" section="exitpolicy"/>
<Topic id="upnp" name="Port Forwarding" html="server.html" section="upnp"/>
+ <Topic id="offline" name="Relay Offline" html="server.html" section="offline"/>
+ <Topic id="consensus" name="Relay not in the Consensus" html="server.html" section="consensus"/>
</Topic>
<Topic id="bridges" name="Bridge Relays" html="bridges.html">
<Topic id="about" name="What are bridge relays?" html="bridges.html" section="about"/>
diff --git a/src/vidalia/help/content/en/server.html b/src/vidalia/help/content/en/server.html
index ccfedd8..91b9005 100644
--- a/src/vidalia/help/content/en/server.html
+++ b/src/vidalia/help/content/en/server.html
@@ -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.
-->
@@ -94,7 +94,7 @@ 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
+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.
@@ -112,16 +112,16 @@ labeled <i>Mirror the relay directory</i>.
<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.
+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>
+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>
@@ -193,7 +193,7 @@ 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.
+connect to your relay through your home router or firewall.
</p>
<p>
@@ -237,6 +237,28 @@ Port</i>. The <i>Directory Port</i> is set to port 9030 by default on all
operating systems.
</p>
+<a name="offline"/>
+<h3>Relay offline</h3>
+<p>
+The first time you configure a relay, if you immediately go to the
+Network Map you may encounter that your relay is listed as Offline
+(the flag is a red cross). This means that your relay does not have
+the Running flag even though it is running. This is expected behavior,
+it may take around four hours to be marked as online.
+</p>
+
+<a name="consensus"/>
+<h3>Relay not in the consensus</h3>
+<p>
+For security reasons, the Tor network has what is called
+a <i>consensus</i>. This consensus contains the list of all the relays
+that form the network as seen from an odd number of
+trusted <i>Directory Authorities</i>, and these are the routers you
+can see in the Network Map. For a new relay to reach the consensus it
+takes around four hours, so you may not see your relay listed in the
+Network Map, and that is because it is not in the consensus yet.
+</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 ab7d8cf..b94ee77 100755
--- a/src/vidalia/help/content/po2html.sh
+++ b/src/vidalia/help/content/po2html.sh
@@ -6,12 +6,12 @@
# This is Free Software (GPLv3)
# http://www.gnu.org/licenses/gpl-3.0.txt
#
-# This script will convert translated po files back to html.
+# This script will convert translated po files back to html.
#
### Start config ###
-# Location of the translated po files. Do not add the trailing slash.
+# Location of the translated po files. Do not add the trailing slash.
translated="/home/runa/tor/vidalia/src/vidalia/help/content/po"
# Location of the original and translated html files. Do not add the
@@ -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 dcbaeb9..7ec3bda 100644
--- a/src/vidalia/i18n/CMakeLists.txt
+++ b/src/vidalia/i18n/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,34 +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/my/vidalia_my.po
- po/eu/vidalia_eu.po
- po/hr_HR/vidalia_hr_HR.po
- po/sr/vidalia_sr.po
+ po/zh_TW/vidalia_zh_TW.po
)
vidalia_add_po(vidalia_QMS ${vidalia_PO})
@@ -50,34 +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/my/qt_my.po
- po/eu/qt_eu.po
- po/hr_HR/qt_hr_HR.po
- po/sr/qt_sr.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/qt_af.po b/src/vidalia/i18n/po/af/qt_af.po
index b5f5ffb..2ab4636 100644
--- a/src/vidalia/i18n/po/af/qt_af.po
+++ b/src/vidalia/i18n/po/af/qt_af.po
@@ -1,11 +1,10 @@
#
-# Translators:
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-08-20 03:25+0000\n"
-"PO-Revision-Date: 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"
@@ -431,5 +430,3 @@ msgstr ""
msgctxt "QFileSystemModel"
msgid "%1 bytes"
msgstr ""
-
-
diff --git a/src/vidalia/i18n/po/af/vidalia_af.po b/src/vidalia/i18n/po/af/vidalia_af.po
index 6cf46f2..6b31647 100755
--- a/src/vidalia/i18n/po/af/vidalia_af.po
+++ b/src/vidalia/i18n/po/af/vidalia_af.po
@@ -1,11 +1,10 @@
#
-# Translators:
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-09-07 14:40+0000\n"
-"PO-Revision-Date: 2010-12-05 20:03+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"
@@ -193,10 +192,6 @@ 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"
@@ -236,10 +231,6 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr ""
-
-msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -279,6 +270,10 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr ""
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -432,17 +427,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"
@@ -1266,44 +1270,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"
@@ -1331,10 +1342,6 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr ""
-
-msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1362,6 +1369,10 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr ""
+
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1644,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 ""
@@ -1680,10 +1663,6 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1796,10 +1775,6 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1882,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 ""
@@ -1934,82 +1897,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 ""
@@ -2057,19 +1949,39 @@ 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)"
+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"
@@ -2091,17 +2003,35 @@ msgid ""
msgstr ""
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"
@@ -2357,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"
@@ -2412,10 +2334,6 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2515,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 ""
@@ -2840,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 ""
@@ -3088,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 ""
@@ -3132,10 +3070,6 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
-msgid "Form"
-msgstr ""
-
-msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3424,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 ""
@@ -3460,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 ""
@@ -3538,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 ""
@@ -3666,6 +3646,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 ""
@@ -3759,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 ""
@@ -3812,5 +3796,3 @@ msgstr ""
msgctxt "stringutil.h"
msgid "%1 mins"
msgstr ""
-
-
diff --git a/src/vidalia/i18n/po/ak/qt_ak.po b/src/vidalia/i18n/po/ak/qt_ak.po
index 22f6acf..1c3c55f 100644
--- a/src/vidalia/i18n/po/ak/qt_ak.po
+++ b/src/vidalia/i18n/po/ak/qt_ak.po
@@ -1,11 +1,10 @@
#
-# Translators:
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-08-20 03:25+0000\n"
-"PO-Revision-Date: 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"
@@ -431,5 +430,3 @@ msgstr ""
msgctxt "QFileSystemModel"
msgid "%1 bytes"
msgstr ""
-
-
diff --git a/src/vidalia/i18n/po/ak/vidalia_ak.po b/src/vidalia/i18n/po/ak/vidalia_ak.po
index 5647b86..020ac5e 100644
--- a/src/vidalia/i18n/po/ak/vidalia_ak.po
+++ b/src/vidalia/i18n/po/ak/vidalia_ak.po
@@ -1,11 +1,10 @@
#
-# Translators:
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-09-07 14:40+0000\n"
-"PO-Revision-Date: 2010-12-05 20:03+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"
@@ -193,10 +192,6 @@ 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"
@@ -236,10 +231,6 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr ""
-
-msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -279,6 +270,10 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr ""
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -432,17 +427,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"
@@ -1266,44 +1270,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"
@@ -1331,10 +1342,6 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr ""
-
-msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1362,6 +1369,10 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr ""
+
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1644,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 ""
@@ -1680,10 +1663,6 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1796,10 +1775,6 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1882,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 ""
@@ -1934,82 +1897,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 ""
@@ -2057,19 +1949,39 @@ 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)"
+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"
@@ -2091,17 +2003,35 @@ msgid ""
msgstr ""
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"
@@ -2357,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"
@@ -2412,10 +2334,6 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2515,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 ""
@@ -2840,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 ""
@@ -3088,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 ""
@@ -3132,10 +3070,6 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
-msgid "Form"
-msgstr ""
-
-msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3424,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 ""
@@ -3460,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 ""
@@ -3538,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 ""
@@ -3666,6 +3646,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 ""
@@ -3759,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 ""
@@ -3812,5 +3796,3 @@ msgstr ""
msgctxt "stringutil.h"
msgid "%1 mins"
msgstr ""
-
-
diff --git a/src/vidalia/i18n/po/am/qt_am.po b/src/vidalia/i18n/po/am/qt_am.po
index 7214fd3..2fdc094 100644
--- a/src/vidalia/i18n/po/am/qt_am.po
+++ b/src/vidalia/i18n/po/am/qt_am.po
@@ -1,11 +1,10 @@
#
-# Translators:
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-08-20 03:25+0000\n"
-"PO-Revision-Date: 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"
@@ -431,5 +430,3 @@ msgstr ""
msgctxt "QFileSystemModel"
msgid "%1 bytes"
msgstr ""
-
-
diff --git a/src/vidalia/i18n/po/am/vidalia_am.po b/src/vidalia/i18n/po/am/vidalia_am.po
index 2cd8ed0..2f64a87 100644
--- a/src/vidalia/i18n/po/am/vidalia_am.po
+++ b/src/vidalia/i18n/po/am/vidalia_am.po
@@ -1,11 +1,10 @@
#
-# Translators:
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-09-07 14:40+0000\n"
-"PO-Revision-Date: 2010-12-05 20:03+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"
@@ -193,10 +192,6 @@ 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"
@@ -236,10 +231,6 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr ""
-
-msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -279,6 +270,10 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr ""
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -432,17 +427,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"
@@ -1266,44 +1270,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"
@@ -1331,10 +1342,6 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr ""
-
-msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1362,6 +1369,10 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr ""
+
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1644,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 ""
@@ -1680,10 +1663,6 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1796,10 +1775,6 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1882,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 ""
@@ -1934,82 +1897,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 ""
@@ -2057,19 +1949,39 @@ 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)"
+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"
@@ -2091,17 +2003,35 @@ msgid ""
msgstr ""
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"
@@ -2357,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"
@@ -2412,10 +2334,6 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2515,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 ""
@@ -2840,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 ""
@@ -3088,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 ""
@@ -3132,10 +3070,6 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
-msgid "Form"
-msgstr ""
-
-msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3424,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 ""
@@ -3460,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 ""
@@ -3538,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 ""
@@ -3666,6 +3646,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 ""
@@ -3759,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 ""
@@ -3812,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 7688207..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:
-# 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: 2012-02-14 09:46+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"
@@ -202,7 +199,9 @@ msgctxt "QFileDialog"
msgid ""
"%1 already exists.\n"
"Do you want to replace it?"
-msgstr "%1 موجود فعلا.\nهل ترغب باستبداله؟"
+msgstr ""
+"%1 موجود فعلا.\n"
+"هل ترغب باستبداله؟"
#: qfiledialog.cpp:1690
msgctxt "QFileDialog"
@@ -210,7 +209,10 @@ msgid ""
"%1\n"
"File not found.\n"
"Please verify the correct file name was given."
-msgstr "%1\nملف غير موجود.\nرجاءاً تأكد من صحة سم الملف."
+msgstr ""
+"%1\n"
+"ملف غير موجود.\n"
+"رجاءاً تأكد من صحة سم الملف."
#: qdirmodel.cpp:833
msgctxt "QFileDialog"
@@ -268,14 +270,19 @@ msgid ""
"%1\n"
"Directory not found.\n"
"Please verify the correct directory name was given."
-msgstr "%1\nمجلد غير موجود.\nرجاءاً تأكد من صحة إسم المجلد."
+msgstr ""
+"%1\n"
+"مجلد غير موجود.\n"
+"رجاءاً تأكد من صحة إسم المجلد."
#: qfiledialog.cpp:2281
msgctxt "QFileDialog"
msgid ""
"'%1' is write protected.\n"
"Do you want to delete it anyway?"
-msgstr "'%1' محمي من الكتابة.\nهل تريد حذفه علي أي حال؟"
+msgstr ""
+"'%1' محمي من الكتابة.\n"
+"هل تريد حذفه علي أي حال؟"
#: qfiledialog.cpp:2286
msgctxt "QFileDialog"
@@ -372,7 +379,9 @@ msgctxt "QFileSystemModel"
msgid ""
"<b>The name \"%1\" can not be used.</b><p>Try using another name, with fewer"
" characters or no punctuations marks."
-msgstr "<b>لايمكن إستعمال الاسم \"%1\".</b>حاول استخدام اسم أخر مع تقليل عدد المحارف أو دون استخدام علامات التنقيط<p>"
+msgstr ""
+"<b>لايمكن إستعمال الاسم \"%1\".</b>حاول استخدام اسم أخر مع تقليل عدد المحارف"
+" أو دون استخدام علامات التنقيط<p>"
#: qfilesystemmodel.cpp:832
msgctxt "QFileSystemModel"
diff --git a/src/vidalia/i18n/po/ar/vidalia_ar.po b/src/vidalia/i18n/po/ar/vidalia_ar.po
index 6065c82..acad6c9 100644
--- a/src/vidalia/i18n/po/ar/vidalia_ar.po
+++ b/src/vidalia/i18n/po/ar/vidalia_ar.po
@@ -1,21 +1,16 @@
#
# Translators:
-# Ahmad LuvSy <donotplay at hotmail.ca>, 2012.
-# Ahmad Mohammad <>, 2012.
-# IBRAHIM <mradonadiego at hotmail.fr>, 2011.
-# <manmacdeath at gmail.com>, 2011.
-# <moazbaghdadi at gmail.com>, 2011.
-# 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.
-# Yehia Badawy <the1legend_2010 at yahoo.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2012-03-21 17:52+0000\n"
-"PO-Revision-Date: 2012-04-17 16:48+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"
@@ -160,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."
@@ -178,13 +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"
@@ -196,22 +191,11 @@ 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 "جهز محطة التحكم آليًّا"
-
-msgctxt "AdvancedPage"
-msgid ""
-"You've checked the autoconfiguration option for the ControlPort, but "
-"provided no Data Directory. Please add one, or uncheck the \"Configure "
-"ControlPort automatically\" option."
-msgstr "لقد تفحصت خيار الإعداد الأوتوماتيكي لمنفذ التحكم, لكنه لم يتوصل لمعلومات, من فضلك أضف واحداً, أو أزل علامة الأختيار من على \" ضبط منفذ التحكم أوتوماتيكياً\""
+msgstr "حدد ملف لاستخدامه في مسار مقبس تور"
msgctxt "AdvancedPage"
msgid ""
@@ -240,23 +224,6 @@ msgctxt "AppearancePage"
msgid "Vidalia was unable to load the selected language translation."
msgstr "ڤيداليا لم يتمكن من تحميل ملف ترجمة اللغة المحدد."
-msgctxt "AppearancePage"
-msgid ""
-"System Icon Preferences (changes will take effect when you restart Vidalia)"
-msgstr "ضع الأيكونه ضمن تفضيلات أيكونات النظام ( تحتاج لإعادة تشغيل فيداليا لتفعيل الإعداد ) "
-
-msgctxt "AppearancePage"
-msgid "Show the Tray Icon and Dock Icon (default)"
-msgstr " اظهار الايقونة بسلة و شريط البرامج"
-
-msgctxt "AppearancePage"
-msgid "Hide the Tray Icon"
-msgstr "اخفاء الايقونة من سلة البرامج"
-
-msgctxt "AppearancePage"
-msgid "Hide the Dock Icon"
-msgstr "اخفاء الايقونة من شريط البرامج"
-
msgctxt "BandwidthGraph"
msgid "Since:"
msgstr "منذ:"
@@ -270,10 +237,6 @@ msgid "Show Settings"
msgstr "أظهر الإعدادات"
msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr "استخدام تور لعرض النطاق"
-
-msgctxt "BandwidthGraph"
msgid "Reset"
msgstr "أعد الضبط"
@@ -313,6 +276,10 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr "ألغِ"
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr "رسم بياني للباندويدث"
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr "بدء طلب جسر HTTPS..."
@@ -466,18 +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."
@@ -1300,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 "إعادة تشغيل فيداليا"
@@ -1317,28 +1311,17 @@ msgid ""
"manually."
msgstr "لم نتمكن من إعادة تشغيل فيداليا تلقائيا. الرجاء إعادة تشغيله يدويا."
-msgctxt "CrashReportDialog"
-msgid "Please fill a ticket in:"
-msgstr "يرجى ملء تذكرة :"
-
-msgctxt "CrashReportDialog"
-msgid ""
-"<a "
-"href=\"https://trac.torproject.org/projects/tor/newticket\">https://trac.torproject.org/projects/tor/newticket</a>"
-msgstr "<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."
-msgstr "تم كتابة إخطار فشل تستطيع إرساله إلى مبرمجي فيداليا لكي يساعدهم على إيجاد وحل المشكلة. لا يحتوي على أي معلومات شخصية."
+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:"
-msgstr "بوصف لما كنت تفعل قبل فشل البرنامج، مع الملفات الآتية التي تتصل بالإخطار:"
+msgctxt "CrashReportUploader"
+msgid "Receiving response..."
+msgstr "يتلقى الجواب..."
msgctxt "GeneralPage"
msgid "Executables (*.exe)"
@@ -1365,10 +1348,6 @@ msgid "Browse"
msgstr "تصفّح"
msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr "ابدأ عمل برمجية تور مع بدء تشغيل ڤيداليا"
-
-msgctxt "GeneralPage"
msgid "Tor"
msgstr "تور"
@@ -1396,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 ك.ب/ثا"
@@ -1678,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 "تور"
@@ -1714,10 +1669,6 @@ msgid "View"
msgstr "اعرض"
msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr "مساعدة ڤيداليا"
-
-msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr "خطأ في إطلاق متصفح الإنترنت"
@@ -1782,6 +1733,10 @@ msgid "Connected to the Tor network!"
msgstr "تم الاتصال بشبكة تور"
msgctxt "MainWindow"
+msgid "Unrecognized startup status"
+msgstr "لم بتم التعرف على حالة بدء التشغيل"
+
+msgctxt "MainWindow"
msgid "miscellaneous"
msgstr "متفرقات"
@@ -1826,10 +1781,6 @@ msgid "Tor is shutting down"
msgstr "جارٍ إغلاق تور"
msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr "أوقف تور الآن"
-
-msgctxt "MainWindow"
msgid "Stop Tor"
msgstr "أوقف تور"
@@ -1912,18 +1863,6 @@ msgid ""
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 "يتوفر تحديث لتور"
@@ -1964,82 +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 "النسخة المنصبة حالياً من تور قديمة أو لا يوصى بها بعد الآن."
@@ -2087,53 +1955,44 @@ 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 "Bootstrapping torrc from %1 to %2"
-msgstr "يتم تشغيل torrc من %1 إلى %2"
+msgid "toolBar"
+msgstr "شريط الأدوات"
msgctxt "MainWindow"
-msgid "(probably Telnet)"
-msgstr "(عميل تلنت على ما يبدو)"
+msgid "Start"
+msgstr "ابدأ"
msgctxt "MainWindow"
-msgid "(probably an email client)"
-msgstr "(عميل بريد إلكتروني على ما يبدو)"
+msgid "Stop"
+msgstr "توقف"
msgctxt "MainWindow"
-msgid ""
-"One of your applications %1 appears to be making a potentially unencrypted "
-"and unsafe connection to port %2."
-msgstr "يبدو أن أحد برامجك %1 يتصل بطريقة غير مشفرة ولا آمنة بالمحطة %2."
-
-msgctxt "MainWindow"
-msgid "failed (%1)"
-msgstr "فشل (%1)"
+msgid "Restart"
+msgstr "إعادة تشغيل"
msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
-msgstr "جار إيقاف تحويلتك.\nيرجى النقر على \"إيقاف\" مرة أخرى لتوقف تحويلتك الآن."
+msgid "Reload Tor's config"
+msgstr "تحديث اعدادات تور"
msgctxt "MainWindow"
-msgid ""
-"Vidalia can't find out how to talk to Tor because it can't access this file: %1\n"
-"\n"
-"Here's the last error message:\n"
-"%2"
-msgstr "فيداليا غير قادر على التحدث الى شبكة تور لأنه غير قادر على الدخول لهذا الملف: %1\n\nهنا آخر شرح للخطأ:\n%2"
+msgid "Actions"
+msgstr "الإجراءات"
msgctxt "MainWindow"
-msgid ""
-"It seems Tor has stopped running since Vidalia started it.\n"
-"\n"
-"See the Advanced Message Log for more information."
-msgstr "إذا كان فيداليا غير قادر على إيقاف تور, سوف يقوم فيداليا بعرض رسالة خطأ تخبرك عن الخطأ الذي حدث. يمكنك أيضا إلقاء نظرة على <a href=\"log.html\">سجل الاحداث</a> لمعرفة ما إذا قام تور بإصدار المزيد من المعلومات حول ما الخطأ الذي حدث."
+msgid "Bootstrapping torrc from %1 to %2"
+msgstr "إنشاء torrc من %1 إلى %2"
msgctxt "MainWindow"
msgid ""
@@ -2149,6 +2008,38 @@ msgid ""
"Please check the message log for recent warning or error messages."
msgstr "وجد ڤيداليا أن برمجية تور توقفت عن العمل بشكل مفاجئ.\n\nيرجى التحقق من سجل الرسائل لتحذيرات أو رسائل خطأ حديثة."
+msgctxt "MainWindow"
+msgid ""
+"Vidalia tried to restart Tor, but was not able to. Please check your Task "
+"Manager to ensure there are no other Tor processes running."
+msgstr "حاولت فيداليا أن تعيد تشغيل تور، ولكنها لم تنجح. الرجاء مراجعة مدير المهام للتأكد أنه لا يوجد هناك إجرائيات تور أخرى"
+
+msgctxt "MainWindow"
+msgid "failed (%1)"
+msgstr "فشل (%1)"
+
+msgctxt "MainWindow"
+msgid ", probably Telnet,"
+msgstr "، غالباً Telnet، "
+
+msgctxt "MainWindow"
+msgid ", probably an email client,"
+msgstr "، غالباً عميل بريد إلكتروني، "
+
+msgctxt "MainWindow"
+msgid ""
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
+msgstr "جار إيقاف تحويلتك.\nيرجى النقر على \"إيقاف\" مرة أخرى لتوقف تحويلتك الآن."
+
+msgctxt "MainWindow"
+msgid "Error reloading configuration"
+msgstr "إعادة تكوين الخطأ"
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to reload Tor's configuration."
+msgstr "فيداليا غير قادرة على تحديث اعدادات تور"
+
msgctxt "MessageLog"
msgid "Error Setting Filter"
msgstr "عُطل في ضبط المُرشِّح"
@@ -2402,22 +2293,14 @@ 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."
@@ -2457,10 +2340,6 @@ msgid ""
msgstr "لا يمكن كتابة الملف %1\n\n%2."
msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr "خريطة شبكة تور"
-
-msgctxt "NetViewer"
msgid "Refresh"
msgstr "تحديث"
@@ -2560,6 +2439,30 @@ 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 "جسر عاطل"
+
+msgctxt "NetworkPage"
+msgid "The specified bridge identifier is not valid."
+msgstr "معرف الجسر المحدد عاطل"
+
msgctxt "NetworkPage"
msgid "Copy (Ctrl+C)"
msgstr "نسخ (Ctrl+C)"
@@ -2693,12 +2596,12 @@ msgid "SOCKS 5"
msgstr "SOCKS 5"
msgctxt "NetworkPage"
-msgid "HTTP / HTTPS"
-msgstr "HTTP / HTTPS"
+msgid "HTTP"
+msgstr "HTTP"
msgctxt "NetworkPage"
-msgid "You must specify one or more bridges."
-msgstr "يجب أن تحدد منفذًا واحدًا يسمح لك الجدار الناري بالاتصال به أو أكثر."
+msgid "HTTP / HTTPS"
+msgstr "HTTP / HTTPS"
msgctxt "Policy"
msgid "accept"
@@ -3121,14 +3024,14 @@ msgid "Automatically distribute my bridge address"
msgstr "انشر عنوان الجسر الخاص بي تلقائيا"
msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network (exit relay)"
-msgstr "تمرير تدفقات شبكة تور"
-
-msgctxt "ServerPage"
msgid "Relay traffic inside the Tor network (non-exit relay)"
msgstr "تتابع حركة المرور داخل الشبكة تور (غير الخروج التتابع)"
msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network (exit relay)"
+msgstr "تتابع الحركة لشبكة تور (ترحيل الخروج)"
+
+msgctxt "ServerPage"
msgid "Mirror the Relay Directory"
msgstr "عكس (mirror) دليل التحويلات"
@@ -3173,10 +3076,6 @@ msgid "Directory already in use by another service."
msgstr "الدليل مستعمل بشكل مسبق في خدمة أخرى"
msgctxt "ServicePage"
-msgid "Form"
-msgstr "استمارة"
-
-msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr "الخدمات الموفرة المخفية"
@@ -3241,7 +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 ""
@@ -3249,7 +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 ""
@@ -3257,7 +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"
@@ -3281,7 +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 ""
@@ -3289,7 +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 ""
@@ -3297,7 +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"
@@ -3309,14 +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!"
@@ -3328,7 +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"
@@ -3339,7 +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"
@@ -3350,7 +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"
@@ -3361,48 +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 ""
@@ -3410,30 +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 ""
@@ -3441,17 +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"
@@ -3463,7 +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"
@@ -3501,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]"
@@ -3519,13 +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"
@@ -3561,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"
@@ -3577,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"
@@ -3707,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 "موافق"
@@ -3800,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 "كود اللغة المحدد غير صحيح:"
diff --git a/src/vidalia/i18n/po/arn/qt_arn.po b/src/vidalia/i18n/po/arn/qt_arn.po
index 6370310..a92ebb7 100644
--- a/src/vidalia/i18n/po/arn/qt_arn.po
+++ b/src/vidalia/i18n/po/arn/qt_arn.po
@@ -1,11 +1,10 @@
#
-# Translators:
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-08-20 03:25+0000\n"
-"PO-Revision-Date: 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"
@@ -431,5 +430,3 @@ msgstr ""
msgctxt "QFileSystemModel"
msgid "%1 bytes"
msgstr ""
-
-
diff --git a/src/vidalia/i18n/po/arn/vidalia_arn.po b/src/vidalia/i18n/po/arn/vidalia_arn.po
index f9a6900..5e975be 100644
--- a/src/vidalia/i18n/po/arn/vidalia_arn.po
+++ b/src/vidalia/i18n/po/arn/vidalia_arn.po
@@ -1,11 +1,10 @@
#
-# Translators:
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-09-07 14:40+0000\n"
-"PO-Revision-Date: 2010-12-05 20:03+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"
@@ -193,10 +192,6 @@ 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"
@@ -236,10 +231,6 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr ""
-
-msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -279,6 +270,10 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr ""
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -432,17 +427,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"
@@ -1266,44 +1270,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"
@@ -1331,10 +1342,6 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr ""
-
-msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1362,6 +1369,10 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr ""
+
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1644,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 ""
@@ -1680,10 +1663,6 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1796,10 +1775,6 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1882,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 ""
@@ -1934,82 +1897,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 ""
@@ -2057,19 +1949,39 @@ 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)"
+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"
@@ -2091,17 +2003,35 @@ msgid ""
msgstr ""
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"
@@ -2357,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"
@@ -2412,10 +2334,6 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2515,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 ""
@@ -2840,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 ""
@@ -3088,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 ""
@@ -3132,10 +3070,6 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
-msgid "Form"
-msgstr ""
-
-msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3424,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 ""
@@ -3460,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 ""
@@ -3538,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 ""
@@ -3666,6 +3646,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 ""
@@ -3759,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 ""
@@ -3812,5 +3796,3 @@ msgstr ""
msgctxt "stringutil.h"
msgid "%1 mins"
msgstr ""
-
-
diff --git a/src/vidalia/i18n/po/ast/qt_ast.po b/src/vidalia/i18n/po/ast/qt_ast.po
index 09651ed..a5d7b07 100644
--- a/src/vidalia/i18n/po/ast/qt_ast.po
+++ b/src/vidalia/i18n/po/ast/qt_ast.po
@@ -1,11 +1,10 @@
#
-# Translators:
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-08-20 03:25+0000\n"
-"PO-Revision-Date: 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"
@@ -431,5 +430,3 @@ msgstr ""
msgctxt "QFileSystemModel"
msgid "%1 bytes"
msgstr ""
-
-
diff --git a/src/vidalia/i18n/po/ast/vidalia_ast.po b/src/vidalia/i18n/po/ast/vidalia_ast.po
index 9499eec..b93bc21 100644
--- a/src/vidalia/i18n/po/ast/vidalia_ast.po
+++ b/src/vidalia/i18n/po/ast/vidalia_ast.po
@@ -1,11 +1,10 @@
#
-# Translators:
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-09-07 14:40+0000\n"
-"PO-Revision-Date: 2010-12-05 20:03+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"
@@ -193,10 +192,6 @@ 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"
@@ -236,10 +231,6 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr ""
-
-msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -279,6 +270,10 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr ""
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -432,17 +427,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"
@@ -1266,44 +1270,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"
@@ -1331,10 +1342,6 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr ""
-
-msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1362,6 +1369,10 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr ""
+
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1644,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 ""
@@ -1680,10 +1663,6 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1796,10 +1775,6 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1882,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 ""
@@ -1934,82 +1897,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 ""
@@ -2057,19 +1949,39 @@ 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)"
+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"
@@ -2091,17 +2003,35 @@ msgid ""
msgstr ""
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"
@@ -2357,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"
@@ -2412,10 +2334,6 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2515,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 ""
@@ -2840,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 ""
@@ -3088,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 ""
@@ -3132,10 +3070,6 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
-msgid "Form"
-msgstr ""
-
-msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3424,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 ""
@@ -3460,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 ""
@@ -3538,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 ""
@@ -3666,6 +3646,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 ""
@@ -3759,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 ""
@@ -3812,5 +3796,3 @@ msgstr ""
msgctxt "stringutil.h"
msgid "%1 mins"
msgstr ""
-
-
diff --git a/src/vidalia/i18n/po/az/qt_az.po b/src/vidalia/i18n/po/az/qt_az.po
index 4ad26a2..919fbbd 100644
--- a/src/vidalia/i18n/po/az/qt_az.po
+++ b/src/vidalia/i18n/po/az/qt_az.po
@@ -1,11 +1,10 @@
#
-# Translators:
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-08-20 03:25+0000\n"
-"PO-Revision-Date: 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"
@@ -431,5 +430,3 @@ msgstr ""
msgctxt "QFileSystemModel"
msgid "%1 bytes"
msgstr ""
-
-
diff --git a/src/vidalia/i18n/po/az/vidalia_az.po b/src/vidalia/i18n/po/az/vidalia_az.po
index 3f3d016..f1a9ee6 100644
--- a/src/vidalia/i18n/po/az/vidalia_az.po
+++ b/src/vidalia/i18n/po/az/vidalia_az.po
@@ -1,11 +1,10 @@
#
-# Translators:
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-09-07 14:40+0000\n"
-"PO-Revision-Date: 2010-12-05 20:03+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"
@@ -193,10 +192,6 @@ 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"
@@ -236,10 +231,6 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr ""
-
-msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -279,6 +270,10 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr ""
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -432,17 +427,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"
@@ -1266,44 +1270,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"
@@ -1331,10 +1342,6 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr ""
-
-msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1362,6 +1369,10 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr ""
+
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1644,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 ""
@@ -1680,10 +1663,6 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1796,10 +1775,6 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1882,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 ""
@@ -1934,82 +1897,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 ""
@@ -2057,19 +1949,39 @@ 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)"
+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"
@@ -2091,17 +2003,35 @@ msgid ""
msgstr ""
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"
@@ -2357,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"
@@ -2412,10 +2334,6 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2515,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 ""
@@ -2840,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 ""
@@ -3088,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 ""
@@ -3132,10 +3070,6 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
-msgid "Form"
-msgstr ""
-
-msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3424,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 ""
@@ -3460,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 ""
@@ -3538,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 ""
@@ -3666,6 +3646,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 ""
@@ -3759,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 ""
@@ -3812,5 +3796,3 @@ msgstr ""
msgctxt "stringutil.h"
msgid "%1 mins"
msgstr ""
-
-
diff --git a/src/vidalia/i18n/po/be/qt_be.po b/src/vidalia/i18n/po/be/qt_be.po
index 77153ab..5df13a3 100644
--- a/src/vidalia/i18n/po/be/qt_be.po
+++ b/src/vidalia/i18n/po/be/qt_be.po
@@ -1,11 +1,10 @@
#
-# Translators:
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-08-20 03:25+0000\n"
-"PO-Revision-Date: 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"
@@ -431,5 +430,3 @@ msgstr ""
msgctxt "QFileSystemModel"
msgid "%1 bytes"
msgstr ""
-
-
diff --git a/src/vidalia/i18n/po/be/vidalia_be.po b/src/vidalia/i18n/po/be/vidalia_be.po
index bc08489..22b0f4e 100644
--- a/src/vidalia/i18n/po/be/vidalia_be.po
+++ b/src/vidalia/i18n/po/be/vidalia_be.po
@@ -1,18 +1,15 @@
-#
-# Translators:
+#, fuzzy
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: 2010-12-05 20:03+0000\n"
-"Last-Translator: \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: 2009-05-19 23:56+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
+"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: be\n"
-"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
"X-Generator: Vidalia ts2po 0.2\n"
msgctxt "AboutDialog"
@@ -35,13 +32,28 @@ msgctxt "AboutDialog"
msgid "Qt 4.4.2"
msgstr ""
+msgctxt "AboutDialog"
+msgid "Vidalia"
+msgstr ""
+
+msgctxt "AboutDialog"
+msgid "Tor"
+msgstr ""
+
+msgctxt "AboutDialog"
+msgid "Qt"
+msgstr ""
+
+msgctxt "AboutDialog"
+msgid "version"
+msgstr ""
+
msgctxt "AdvancedPage"
msgid "'%1' is not a valid IP address."
msgstr ""
msgctxt "AdvancedPage"
-msgid ""
-"You selected 'Password' authentication, but did not specify a password."
+msgid "You selected 'Password' authentication, but did not specify a password."
msgstr ""
msgctxt "AdvancedPage"
@@ -81,6 +93,10 @@ msgid "Vidalia was unable to install the Tor service."
msgstr ""
msgctxt "AdvancedPage"
+msgid "Control Port"
+msgstr ""
+
+msgctxt "AdvancedPage"
msgid "Authentication:"
msgstr ""
@@ -137,68 +153,7 @@ msgid "Select the directory used to store data for the Tor software"
msgstr ""
msgctxt "AdvancedPage"
-msgid "Tor Control"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "Use TCP connection (ControlPort)"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "Path:"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "Use Unix domain socket (ControlSocket)"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "Edit current torrc"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "NOTE: this will edit the currently loaded torrc"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "ControlSocket path doesn't exist."
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid ""
-"The specified Tor configuration file location contains characters that "
-"cannot be represented in your system's current 8-bit character encoding."
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid ""
-"The specified Tor data directory location contains characters that cannot be"
-" represented in your system's current 8-bit character encoding."
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "Warning"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "You changed torrc path, would you like to restart Tor?"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "Tor Configuration File (torrc);;All Files (*)"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "Select a file to use for Tor socket path"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "Configure ControlPort automatically"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid ""
-"Vidalia was unable to remove the Tor service.\n"
+msgid "Vidalia was unable to remove the Tor service.\n"
"\n"
"You may need to remove it manually."
msgstr ""
@@ -440,9 +395,7 @@ msgid "Remember my password"
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid ""
-"Vidalia has connected to a running Tor process that requires a password. "
-"Please enter your control password:"
+msgid "Vidalia has connected to a running Tor process that requires a password. Please enter your control password:"
msgstr ""
msgctxt "ControlSocket"
@@ -1158,10 +1111,6 @@ msgid "Zimbabwe"
msgstr ""
msgctxt "CountryInfo"
-msgid "Zaire"
-msgstr ""
-
-msgctxt "CountryInfo"
msgid "Albania"
msgstr ""
@@ -1257,55 +1206,6 @@ msgctxt "CountryInfo"
msgid "Taiwan"
msgstr ""
-msgctxt "CrashReportDialog"
-msgid "Submit a Crash Report"
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid "Vidalia encountered an error and needed to close"
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid "Restart Vidalia"
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid "Don't Restart"
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid "Unable to restart Vidalia"
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid ""
-"We were unable to automatically restart Vidalia. Please restart Vidalia "
-"manually."
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid "Please fill a ticket in:"
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid ""
-"<a "
-"href=\"https://trac.torproject.org/projects/tor/newticket\">https://trac.torproject.org/projects/tor/newticket</a>"
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid ""
-"A crash report has been created that you can send to the Vidalia developers "
-"to help identify and fix the problem. The submitted report does not contain "
-"any personally identifying information."
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid ""
-"with a description of what you were doing before the application crashed, "
-"along with the following files corresponding to the crash report:"
-msgstr ""
-
msgctxt "GeneralPage"
msgid "Executables (*.exe)"
msgstr ""
@@ -1323,6 +1223,10 @@ msgid "You must specify the name of your Tor executable."
msgstr ""
msgctxt "GeneralPage"
+msgid "The proxy arguments specified are not properly formatted."
+msgstr ""
+
+msgctxt "GeneralPage"
msgid "Start Vidalia when my system starts"
msgstr ""
@@ -1519,10 +1423,7 @@ msgid "Opening External Link"
msgstr ""
msgctxt "HelpTextBrowser"
-msgid ""
-"Vidalia can open the link you selected in your default Web browser. If your "
-"browser is not currently configured to use Tor then the request will not be "
-"anonymous."
+msgid "Vidalia can open the link you selected in your default Web browser. If your browser is not currently configured to use Tor then the request will not be anonymous."
msgstr ""
msgctxt "HelpTextBrowser"
@@ -1534,9 +1435,7 @@ msgid "Unable to Open Link"
msgstr ""
msgctxt "HelpTextBrowser"
-msgid ""
-"Vidalia was unable to open the selected link in your Web browser. You can "
-"still copy the URL and paste it into your browser."
+msgid "Vidalia was unable to open the selected link in your Web browser. You can still copy the URL and paste it into your browser."
msgstr ""
msgctxt "HelpTextBrowser"
@@ -1579,30 +1478,6 @@ msgctxt "LogEvent"
msgid "Unknown"
msgstr ""
-msgctxt "LogTreeItem"
-msgid "Debug"
-msgstr ""
-
-msgctxt "LogTreeItem"
-msgid "Info"
-msgstr ""
-
-msgctxt "LogTreeItem"
-msgid "Notice"
-msgstr ""
-
-msgctxt "LogTreeItem"
-msgid "Warning"
-msgstr ""
-
-msgctxt "LogTreeItem"
-msgid "Error"
-msgstr ""
-
-msgctxt "LogTreeItem"
-msgid "Unknown"
-msgstr ""
-
msgctxt "MainWindow"
msgid "Start Tor"
msgstr ""
@@ -1816,9 +1691,7 @@ msgid "Error Starting Tor"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Vidalia was unable to start Tor. Check your settings to ensure the correct "
-"name and location of your Tor executable is specified."
+msgid "Vidalia was unable to start Tor. Check your settings to ensure the correct name and location of your Tor executable is specified."
msgstr ""
msgctxt "MainWindow"
@@ -1854,9 +1727,7 @@ msgid "Cookie Authentication Required"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"The Tor software requires Vidalia to send the contents of an authentication "
-"cookie, but Vidalia was unable to find one."
+msgid "The Tor software requires Vidalia to send the contents of an authentication cookie, but Vidalia was unable to find one."
msgstr ""
msgctxt "MainWindow"
@@ -1876,9 +1747,7 @@ msgid "Error Registering for Events"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Vidalia was unable to register for some events. Many of Vidalia's features "
-"may be unavailable."
+msgid "Vidalia was unable to register for some events. Many of Vidalia's features may be unavailable."
msgstr ""
msgctxt "MainWindow"
@@ -1898,9 +1767,7 @@ msgid "Tor Update Available"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended. Please visit the Tor website to download the latest version."
+msgid "The currently installed version of Tor is out of date or no longer recommended. Please visit the Tor website to download the latest version."
msgstr ""
msgctxt "MainWindow"
@@ -1908,9 +1775,7 @@ msgid "Tor website: %1"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"All subsequent connections will appear to be different than your old "
-"connections."
+msgid "All subsequent connections will appear to be different than your old connections."
msgstr ""
msgctxt "MainWindow"
@@ -2002,21 +1867,15 @@ msgid "Password Reset Failed"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Vidalia tried to reset Tor's control password, but was not able to restart "
-"the Tor software. Please check your Task Manager to ensure there are no "
-"other Tor processes running."
+msgid "Vidalia tried to reset Tor's control password, but was not able to restart the Tor software. Please check your Task Manager to ensure there are no other Tor processes running."
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended."
+msgid "The currently installed version of Tor is out of date or no longer recommended."
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Would you like to check if a newer package is available for installation?"
+msgid "Would you like to check if a newer package is available for installation?"
msgstr ""
msgctxt "MainWindow"
@@ -2024,9 +1883,11 @@ msgid "Potentially Unsafe Connection"
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 ""
msgctxt "MainWindow"
@@ -2038,9 +1899,7 @@ msgid "Your software is up to date"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"There are no new Tor software packages available for your computer at this "
-"time."
+msgid "There are no new Tor software packages available for your computer at this time."
msgstr ""
msgctxt "MainWindow"
@@ -2056,52 +1915,52 @@ msgid "The following error occurred:"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Anything sent over this connection could be monitored. Please check your "
-"application's configuration and use only encrypted protocols, such as SSL, "
-"if possible."
-msgstr ""
-
-msgctxt "MainWindow"
msgid "failed (%1)"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
+msgid "Your relay is shutting down.\n"
"Click 'Stop' again to stop your relay now."
msgstr ""
msgctxt "MainWindow"
-msgid "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 ""
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 ""
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 ""
+
+msgctxt "MainWindow"
+msgid "File"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "About Vidalia"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Home"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Check For Updates"
msgstr ""
msgctxt "MessageLog"
@@ -2345,68 +2204,50 @@ 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"
+msgid "Always Save New Log Messages"
msgstr ""
msgctxt "MessageLog"
-msgid "Tor Status"
+msgid "Browse"
msgstr ""
msgctxt "MessageLog"
-msgid "Advanced"
+msgid "Enable automatically saving all new log messages to a file"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
+msgid "Automatically save new log messages to a file"
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 ""
msgctxt "MessageLog"
-msgid ""
-"Messages that only appear when \n"
+msgid "Messages that only appear when \n"
"something has gone wrong with Tor."
msgstr ""
msgctxt "MessageLog"
-msgid ""
-"Messages that appear infrequently \n"
+msgid "Messages that appear infrequently \n"
"during normal Tor operation and are \n"
"not considered errors, but you may \n"
"care about."
msgstr ""
msgctxt "MessageLog"
-msgid ""
-"Messages that appear frequently \n"
+msgid "Messages that appear frequently \n"
"during normal Tor operation."
msgstr ""
msgctxt "MessageLog"
-msgid ""
-"Hyper-verbose messages primarily of \n"
+msgid "Hyper-verbose messages primarily of \n"
"interest to Tor developers."
msgstr ""
msgctxt "MessageLog"
-msgid ""
-"Cannot write file %1\n"
+msgid "Cannot write file %1\n"
"\n"
"%2."
msgstr ""
@@ -2528,15 +2369,11 @@ msgid "Copy (Ctrl+C)"
msgstr ""
msgctxt "NetworkPage"
-msgid ""
-"You must specify both an IP address or hostname and a port number to "
-"configure Tor to use a proxy to access the Internet."
+msgid "You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet."
msgstr ""
msgctxt "NetworkPage"
-msgid ""
-"You must specify one or more ports to which your firewall allows you to "
-"connect."
+msgid "You must specify one or more ports to which your firewall allows you to connect."
msgstr ""
msgctxt "NetworkPage"
@@ -2556,10 +2393,18 @@ msgid "Proxy Settings"
msgstr ""
msgctxt "NetworkPage"
+msgid "HTTP Proxy:"
+msgstr ""
+
+msgctxt "NetworkPage"
msgid "Username:"
msgstr ""
msgctxt "NetworkPage"
+msgid "Use this proxy for HTTPS also"
+msgstr ""
+
+msgctxt "NetworkPage"
msgid "Password:"
msgstr ""
@@ -2588,9 +2433,7 @@ msgid "80, 443"
msgstr ""
msgctxt "NetworkPage"
-msgid ""
-"Check to encrypt directory requests and, optionally, use bridge relays to "
-"access the Tor network"
+msgid "Check to encrypt directory requests and, optionally, use bridge relays to access the Tor network"
msgstr ""
msgctxt "NetworkPage"
@@ -2602,10 +2445,18 @@ msgid "Bridge Settings"
msgstr ""
msgctxt "NetworkPage"
+msgid "The Tor software you are currently running does not support bridges. <br>Directory connections will still be encrypted."
+msgstr ""
+
+msgctxt "NetworkPage"
msgid "Add a Bridge:"
msgstr ""
msgctxt "NetworkPage"
+msgid "<a href=\"bridges.finding\">How do I find a bridge?</a>"
+msgstr ""
+
+msgctxt "NetworkPage"
msgid "Remove the selected bridges from the list"
msgstr ""
@@ -2626,43 +2477,13 @@ msgid "<a href=\"bridges.finding\">How can I find bridges?</a>"
msgstr ""
msgctxt "NetworkPage"
-msgid ""
-"No new bridges are currently available. You can either wait a while and try "
-"again, or try another method of finding new bridges."
+msgid "No new bridges are currently available. You can either wait a while and try again, or try another method of finding new bridges."
msgstr ""
msgctxt "NetworkPage"
msgid "Click Help to see other methods of finding new bridges."
msgstr ""
-msgctxt "NetworkPage"
-msgid "Address:"
-msgstr ""
-
-msgctxt "NetworkPage"
-msgid "Type:"
-msgstr ""
-
-msgctxt "NetworkPage"
-msgid "You must select the proxy type."
-msgstr ""
-
-msgctxt "NetworkPage"
-msgid "SOCKS 4"
-msgstr ""
-
-msgctxt "NetworkPage"
-msgid "SOCKS 5"
-msgstr ""
-
-msgctxt "NetworkPage"
-msgid "HTTP"
-msgstr ""
-
-msgctxt "NetworkPage"
-msgid "HTTP / HTTPS"
-msgstr ""
-
msgctxt "Policy"
msgid "accept"
msgstr ""
@@ -2816,15 +2637,11 @@ msgid "Bridge Support Unavailable"
msgstr ""
msgctxt "ServerPage"
-msgid ""
-"You have configured Tor to act as a bridge relay for censored users, but "
-"your version of Tor does not support bridges."
+msgid "You have configured Tor to act as a bridge relay for censored users, but your version of Tor does not support bridges."
msgstr ""
msgctxt "ServerPage"
-msgid ""
-"Please upgrade your Tor software or configure Tor to act as a normal Tor "
-"relay."
+msgid "Please upgrade your Tor software or configure Tor to act as a normal Tor relay."
msgstr ""
msgctxt "ServerPage"
@@ -2892,9 +2709,7 @@ msgid "Basic Settings"
msgstr ""
msgctxt "ServerPage"
-msgid ""
-"For Internet connections with fast download speed but slow upload, please "
-"list your upload speed here."
+msgid "For Internet connections with fast download speed but slow upload, please list your upload speed here."
msgstr ""
msgctxt "ServerPage"
@@ -2950,9 +2765,7 @@ msgid "Peak bandwidth rate limit"
msgstr ""
msgctxt "ServerPage"
-msgid ""
-"Your maximum bandwidth rate must be greater than or equal to your average "
-"bandwidth rate. Both values must be at least 20 KB/s."
+msgid "Your maximum bandwidth rate must be greater than or equal to your average bandwidth rate. Both values must be at least 20 KB/s."
msgstr ""
msgctxt "ServerPage"
@@ -3012,14 +2825,11 @@ msgid "Show help topic on exit policies"
msgstr ""
msgctxt "ServerPage"
-msgid ""
-"What Internet resources should users be able to access from your relay?"
+msgid "What Internet resources should users be able to access from your relay?"
msgstr ""
msgctxt "ServerPage"
-msgid ""
-"Tor will still block some outgoing mail and file sharing applications by "
-"default to reduce spam and other abuse."
+msgid "Tor will still block some outgoing mail and file sharing applications by default to reduce spam and other abuse."
msgstr ""
msgctxt "ServerPage"
@@ -3031,8 +2841,7 @@ msgid "Let others access your bridge by giving them this line:"
msgstr ""
msgctxt "ServerPage"
-msgid ""
-"This is the identity of your bridge relay that you can give to other people"
+msgid "This is the identity of your bridge relay that you can give to other people"
msgstr ""
msgctxt "ServerPage"
@@ -3048,9 +2857,7 @@ msgid "No clients have used your relay recently."
msgstr ""
msgctxt "ServerPage"
-msgid ""
-"Leave your relay running so clients have a better chance of finding and "
-"using it."
+msgid "Leave your relay running so clients have a better chance of finding and using it."
msgstr ""
msgctxt "ServerPage"
@@ -3062,9 +2869,7 @@ msgid "Vidalia was unable to retrieve your bridge's usage history."
msgstr ""
msgctxt "ServerPage"
-msgid ""
-"Tor returned an improperly formatted response when Vidalia requested your "
-"bridge's usage history."
+msgid "Tor returned an improperly formatted response when Vidalia requested your bridge's usage history."
msgstr ""
msgctxt "ServerPage"
@@ -3080,20 +2885,11 @@ msgid "<a href=\"#bridgeUsage\">Who has used my bridge?</a>"
msgstr ""
msgctxt "ServerPage"
-msgid "<a href=\"#bridgeHelp\">What's this?</a>"
-msgstr ""
-
-msgctxt "ServerPage"
-msgid "Automatically distribute my bridge address"
-msgstr ""
-
-msgctxt "ServerPage"
msgid "Mirror the Relay Directory"
msgstr ""
msgctxt "ServerPage"
-msgid ""
-"Email address at which you may be reached if there is a\n"
+msgid "Email address at which you may be reached if there is a\n"
"problem with your relay. You might also include your PGP or GPG fingerprint."
msgstr ""
@@ -3102,9 +2898,7 @@ msgid "Error while trying to unpublish all services"
msgstr ""
msgctxt "ServicePage"
-msgid ""
-"Please configure at least a service directory and a virtual port for each "
-"service you want to save. Remove the other ones."
+msgid "Please configure at least a service directory and a virtual port for each service you want to save. Remove the other ones."
msgstr ""
msgctxt "ServicePage"
@@ -3179,251 +2973,6 @@ msgctxt "ServicePage"
msgid "Created by Tor"
msgstr ""
-msgctxt "StatusEventWidget"
-msgid "Copy to Clipboard"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "The Tor Software is Running"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "You are currently running version \"%1\" of the Tor software."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "The Tor Software is not Running"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Click \"Start Tor\" in the Vidalia Control Panel to restart the Tor "
-"software. If Tor exited unexpectedly, select the \"Advanced\" tab above for "
-"details about any errors encountered."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"You are currently running version \"%1\" of the Tor software, which is no "
-"longer recommended. Please upgrade to the most recent version of the "
-"software, which may contain important security, reliability and performance "
-"fixes."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"You are currently running version \"%1\" of the Tor software, which may no "
-"longer work with the current Tor network. Please upgrade to the most recent "
-"version of the software, which may contain important security, reliability "
-"and performance fixes."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Your Tor Software is Out-of-date"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Connected to the Tor Network"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"We were able to successfully establish a connection to the Tor network. You "
-"can now configure your applications to use the Internet anonymously."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Tor Software Error"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"The Tor software encountered an internal bug. Please report the following "
-"error message to the Tor developers at bugs.torproject.org: \"%1\""
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Tor has determined that your computer's clock may be set to %1 seconds in "
-"the past compared to the source \"%2\". If your clock is not correct, Tor "
-"will not be able to function. Please verify your computer displays the "
-"correct time."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Tor has determined that your computer's clock may be set to %1 seconds in "
-"the future compared to the source \"%2\". If your clock is not correct, Tor "
-"will not be able to function. Please verify your computer displays the "
-"correct time."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Your Computer's Clock is Potentially Incorrect"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"One of the applications on your computer may have attempted to make an "
-"unencrypted connection through Tor to port %1. Sending unencrypted "
-"information over the Tor network is dangerous and not recommended. For your "
-"protection, Tor has automatically closed this connection."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"One of the applications on your computer may have attempted to make an "
-"unencrypted connection through Tor to port %1. Sending unencrypted "
-"information over the Tor network is dangerous and not recommended."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Potentially Dangerous Connection!"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"One of your applications established a connection through Tor to \"%1\" "
-"using a protocol that may leak information about your destination. Please "
-"ensure you configure your applications to use only SOCKS4a or SOCKS5 with "
-"remote hostname resolution."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Unknown SOCKS Protocol"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"One of your applications tried to establish a connection through Tor using a"
-" protocol that Tor does not understand. Please ensure you configure your "
-"applications to use only SOCKS4a or SOCKS5 with remote hostname resolution."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Invalid Destination Hostname"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"One of your applications tried to establish a connection through Tor to "
-"\"%1\", which Tor does not recognize as a valid hostname. Please check your "
-"application's configuration."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "External IP Address Changed"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Tor has determined your relay's public IP address is currently %1%2. If that"
-" is not correct, please consider setting the 'Address' option in your "
-"relay's configuration."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "DNS Hijacking Detected"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Tor detected that your DNS provider is providing false responses for domains"
-" that do not exist. Some ISPs and other DNS providers, such as OpenDNS, are "
-"known to do this in order to display their own search or advertising pages."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Tor detected that your DNS provider is providing false responses for well "
-"known domains. Since clients rely on Tor network relays to provide accurate "
-"DNS repsonses, your relay will not be configured as an exit relay."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Checking Server Port Reachability"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Tor is trying to determine if your relay's server port is reachable from the"
-" Tor network by connecting to itself at %1:%2. This test could take several "
-"minutes."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Server Port Reachability Test Successful!"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Your relay's server port is reachable from the Tor network!"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Server Port Reachability Test Failed"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Your relay's server port is not reachable by other Tor clients. This can "
-"happen if you are behind a router or firewall that requires you to set up "
-"port forwarding. If %1:%2 is not your correct IP address and server port, "
-"please check your relay's configuration."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Checking Directory Port Reachability"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Tor is trying to determine if your relay's directory port is reachable from "
-"the Tor network by connecting to itself at %1:%2. This test could take "
-"several minutes."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Directory Port Reachability Test Successful!"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Your relay's directory port is reachable from the Tor network!"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Directory Port Reachability Test Failed"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Your relay's directory port is not reachable by other Tor clients. This can "
-"happen if you are behind a router or firewall that requires you to set up "
-"port forwarding. If %1:%2 is not your correct IP address and directory port,"
-" please check your relay's configuration."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Relay Descriptor Rejected"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Your relay's descriptor, which enables clients to connect to your relay, was"
-" rejected by the directory server at %1:%2. The reason given was: %3"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Your Relay is Online"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Your relay is now online and available for Tor clients to use. You should "
-"see an increase in network traffic shown by the Bandwidth Graph within a few"
-" hours as more clients learn about your relay. Thank you for contributing to"
-" the Tor network!"
-msgstr ""
-
msgctxt "Stream"
msgid "New"
msgstr ""
@@ -3476,68 +3025,6 @@ msgctxt "TorSettings"
msgid "Failed to hash the control password."
msgstr ""
-msgctxt "TorrcDialog"
-msgid "Editing torrc"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid ""
-"Save settings. If unchecked it will only apply settings to the current Tor "
-"instance."
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Cut"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Copy"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Paste"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Undo"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Redo"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Select All"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Apply all"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Apply selection only"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Error connecting to Tor"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Selection is empty. Please select some text, or check \"Apply all\""
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Error at line %1: \"%2\""
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Error"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "An error ocurred while opening torrc file"
-msgstr ""
-
msgctxt "UPNPControl"
msgid "Success"
msgstr ""
@@ -3595,15 +3082,11 @@ msgid "Testing Universal Plug & Play Support"
msgstr ""
msgctxt "UpdateProcess"
-msgid ""
-"Vidalia was unable to check for available software updates because it could "
-"not find '%1'."
+msgid "Vidalia was unable to check for available software updates because it could not find '%1'."
msgstr ""
msgctxt "UpdateProcess"
-msgid ""
-"Vidalia was unable to check for available software updates because Tor's "
-"update process exited unexpectedly."
+msgid "Vidalia was unable to check for available software updates because Tor's update process exited unexpectedly."
msgstr ""
msgctxt "UpdateProgressDialog"
@@ -3759,10 +3242,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 ""
@@ -3775,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 ""
@@ -3812,5 +3290,3 @@ msgstr ""
msgctxt "stringutil.h"
msgid "%1 mins"
msgstr ""
-
-
diff --git a/src/vidalia/i18n/po/bg/qt_bg.po b/src/vidalia/i18n/po/bg/qt_bg.po
index 2590852..e87f075 100644
--- a/src/vidalia/i18n/po/bg/qt_bg.po
+++ b/src/vidalia/i18n/po/bg/qt_bg.po
@@ -1,11 +1,10 @@
#
-# Translators:
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-08-20 03:25+0000\n"
-"PO-Revision-Date: 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"
@@ -431,5 +430,3 @@ msgstr ""
msgctxt "QFileSystemModel"
msgid "%1 bytes"
msgstr ""
-
-
diff --git a/src/vidalia/i18n/po/bg/vidalia_bg.po b/src/vidalia/i18n/po/bg/vidalia_bg.po
index 28d1b0a..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: 2012-03-21 17:52+0000\n"
-"PO-Revision-Date: 2012-03-22 08:51+0000\n"
-"Last-Translator: raymen <svilen79 at gmail.com>\n"
+"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,12 +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 "Вие избрахте удостоверяване чрез \"Парола\", но не сте упоменали изрично някаква парола."
+msgstr ""
msgctxt "AdvancedPage"
msgid "Select Tor Configuration File"
@@ -68,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:"
@@ -92,7 +91,7 @@ msgstr "Адрес:"
msgctxt "AdvancedPage"
msgid "None"
-msgstr "Нищо"
+msgstr ""
msgctxt "AdvancedPage"
msgid "Cookie"
@@ -108,7 +107,7 @@ msgstr "Случайно генериране"
msgctxt "AdvancedPage"
msgid ":"
-msgstr ":"
+msgstr ""
msgctxt "AdvancedPage"
msgid "Tor Configuration File"
@@ -128,81 +127,70 @@ 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 "Изберете директорията, използвана за съхранение на данни за Тор софтуеъра. "
+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 файл"
+msgstr ""
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-битовото символно разкодиране на системата Ви."
+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 ""
msgctxt "AdvancedPage"
msgid "Warning"
-msgstr "Внимание"
+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 "Тор конфигурационен файл (torrc);;All Files (*)"
+msgstr ""
msgctxt "AdvancedPage"
msgid "Select a file to use for Tor socket path"
-msgstr "Избери файл за ползване, за пътя на Тор сокета"
-
-msgctxt "AdvancedPage"
-msgid "Configure ControlPort automatically"
-msgstr "Автоматично настройване на КонтролнияПорт"
-
-msgctxt "AdvancedPage"
-msgid ""
-"You've checked the autoconfiguration option for the ControlPort, but "
-"provided no Data Directory. Please add one, or uncheck the \"Configure "
-"ControlPort automatically\" option."
msgstr ""
msgctxt "AdvancedPage"
@@ -210,7 +198,7 @@ msgid ""
"Vidalia was unable to remove the Tor service.\n"
"\n"
"You may need to remove it manually."
-msgstr "Видалия не можа да премахне Тор услугите.\n\nЩе Ви се наложи да ги премахнете самостоятелно."
+msgstr ""
msgctxt "AppearancePage"
msgid "Language"
@@ -230,23 +218,6 @@ msgstr "Избери интерфейсен стил на Видалиа"
msgctxt "AppearancePage"
msgid "Vidalia was unable to load the selected language translation."
-msgstr "Видалия не успя да зареди избраният езиков пакет."
-
-msgctxt "AppearancePage"
-msgid ""
-"System Icon Preferences (changes will take effect when you restart Vidalia)"
-msgstr ""
-
-msgctxt "AppearancePage"
-msgid "Show the Tray Icon and Dock Icon (default)"
-msgstr ""
-
-msgctxt "AppearancePage"
-msgid "Hide the Tray Icon"
-msgstr ""
-
-msgctxt "AppearancePage"
-msgid "Hide the Dock Icon"
msgstr ""
msgctxt "BandwidthGraph"
@@ -262,10 +233,6 @@ msgid "Show Settings"
msgstr "Покажи опции"
msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr "Използван трафик от Тор"
-
-msgctxt "BandwidthGraph"
msgid "Reset"
msgstr "Ресет"
@@ -305,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..."
@@ -315,43 +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"
+msgstr ""
msgctxt "BridgeUsageDialog"
msgid "Bridge Usage Summary"
-msgstr "Извлечение за Мостово Използване"
+msgstr ""
msgctxt "BridgeUsageDialog"
msgid "Client Summary"
-msgstr "Клиентско извлечение"
+msgstr ""
msgctxt "Circuit"
msgid "New"
@@ -391,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"
@@ -407,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"
@@ -431,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"
@@ -451,29 +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 ""
+"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 "Видалия се свърза с активен Тор процес който изисква парола.\nМоля, въведете Вашата контролна парола:"
+"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]"
@@ -489,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"
@@ -697,640 +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 "Моля, попълнете квитанция в:"
+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 "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."
-msgstr "Създаден бе доклад за претърпяно поражение, който може да изпратите на развойчиците на Видалия, за да им помогнете да идентифицират и поправят проблема. Приложеният доклад не съдържа никаква Ваша персонална идентифицираща информация. "
+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:"
-msgstr "с описание на какво сте правили преди програмата да претърпи поражение, заедно със следните файлове, съответствуващи на доклада за претърпяно поражение:"
+msgctxt "CrashReportUploader"
+msgid "Receiving response..."
+msgstr ""
msgctxt "GeneralPage"
msgid "Executables (*.exe)"
@@ -1342,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"
@@ -1406,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."
@@ -1510,7 +1497,7 @@ msgstr "Намери Следващ"
msgctxt "HelpBrowser"
msgid "Case sensitive"
-msgstr "Чувствителен в случай на големи и малки букви"
+msgstr "Case sensitive"
msgctxt "HelpBrowser"
msgid "Whole words only"
@@ -1518,7 +1505,7 @@ msgstr "Само цели думи"
msgctxt "HelpBrowser"
msgid "Help Topics"
-msgstr "Помощни Теми"
+msgstr "Помощ Теми"
msgctxt "HelpBrowser"
msgid "Contents"
@@ -1530,7 +1517,7 @@ msgstr "Търси"
msgctxt "HelpBrowser"
msgid "Searching for:"
-msgstr "Търсене за:"
+msgstr "Търси за:"
msgctxt "HelpBrowser"
msgid "Found Documents"
@@ -1538,48 +1525,48 @@ msgstr "Намерени Документи"
msgctxt "HelpBrowser"
msgid "Error Loading Help Contents:"
-msgstr "Грешка при зареждане на помощното съдържание:"
+msgstr ""
msgctxt "HelpTextBrowser"
msgid "Opening External Link"
-msgstr "Отваряне на външна връзка"
+msgstr ""
msgctxt "HelpTextBrowser"
msgid ""
"Vidalia can open the link you selected in your default Web browser. If your "
"browser is not currently configured to use Tor then the request will not be "
"anonymous."
-msgstr "Видалия може да отвори избраната връзка в браузъра Ви по подразбиране. Ако браузъра Ви не е конфигуриран в момента да използва Тор, то тогава заявката няма да бъде анонимна."
+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 адреса и да го поставите във Вашия браузър."
+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"
@@ -1607,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"
@@ -1651,7 +1638,7 @@ msgstr "Карта Мрежа"
msgctxt "MainWindow"
msgid "Control Panel"
-msgstr "Контролен панел"
+msgstr ""
msgctxt "MainWindow"
msgid "Settings"
@@ -1670,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 "Тор"
@@ -1706,132 +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 ""
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"
@@ -1845,211 +1800,128 @@ 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 "Тор софтуеърът изисква Видалия да изпрати съдържанието на бисквитката за автентичност, но Видалия не можа да открие такава."
+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 "Моля, проверете Вашите настройки за автентичност на контролния порт"
+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 "Понастоящем инсталираната Тор версия не е актуална или не се препоръчва. Моля, посетете страницата на Тор за да свалите най-последната версия."
+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 "Видалия опита да нулира контролната парола на Тор, но не успя да рестартира Тор софтуеъра. Моля, проверете в Диспечер на задачите за да се подсигурите, че няма други активни Тор процеси. "
+msgstr ""
msgctxt "MainWindow"
msgid ""
"The currently installed version of Tor is out of date or no longer "
"recommended."
-msgstr "Понастоящем инсталираната версия на Тор е остаряла или не се препоръчва повече."
+msgstr ""
msgctxt "MainWindow"
msgid ""
"Would you like to check if a newer package is available for installation?"
-msgstr "Бихте ли желали да проверите за наличие на по-нов инсталационен пакет?"
+msgstr ""
msgctxt "MainWindow"
msgid "Potentially Unsafe Connection"
-msgstr "Потенциално несигурна връзка"
+msgstr ""
msgctxt "MainWindow"
msgid ""
"Tor has automatically closed your connection in order to protect your "
"anonymity."
-msgstr "Тор автоматично затвори връзката, с оглед на това да предпази Вашата анонимност."
+msgstr ""
msgctxt "MainWindow"
msgid "Update Failed"
@@ -2057,17 +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 "На този момент няма нови софтуеърни пакети от Тор за инсталиране на компютъра Ви."
+msgstr ""
msgctxt "MainWindow"
msgid "Installation Failed"
-msgstr "Инсталацията се провали"
+msgstr ""
msgctxt "MainWindow"
msgid "Vidalia was unable to install your software updates."
@@ -2075,56 +1947,47 @@ 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 ""
"Anything sent over this connection could be monitored. Please check your "
"application's configuration and use only encrypted protocols, such as SSL, "
"if possible."
-msgstr "Каквото и да е изпратено по тази връзка може да бъде следено. Моля, провери настройките на програмата и ползвай ако е възможно само криптирани протоколи, като SSH."
-
-msgctxt "MainWindow"
-msgid "Bootstrapping torrc from %1 to %2"
-msgstr "Начално стартиране на torrc от %1 до %2"
+msgstr ""
msgctxt "MainWindow"
-msgid "(probably Telnet)"
-msgstr "(вероятно Телнет)"
+msgid "toolBar"
+msgstr ""
msgctxt "MainWindow"
-msgid "(probably an email client)"
-msgstr "(вероятно Е-мейл потребител)"
+msgid "Start"
+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"
+msgid "Stop"
+msgstr ""
msgctxt "MainWindow"
-msgid "failed (%1)"
-msgstr "пропаднал (%1)"
+msgid "Restart"
+msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
-msgstr "Препредаването Ви се изключва.\nНатиснете 'Стоп' отново за да спрете препредаването сега."
+msgid "Reload Tor's config"
+msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Vidalia can't find out how to talk to Tor because it can't access this file: %1\n"
-"\n"
-"Here's the last error message:\n"
-"%2"
+msgid "Actions"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"It seems Tor has stopped running since Vidalia started it.\n"
-"\n"
-"See the Advanced Message Log for more information."
+msgid "Bootstrapping torrc from %1 to %2"
msgstr ""
msgctxt "MainWindow"
@@ -2132,14 +1995,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 ""
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 ""
+
+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 ""
+
+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"
@@ -2159,11 +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 "Трябва да въведете име на файла за да може да съхраните съобщения с данни във файл."
+msgstr ""
msgctxt "MessageLog"
msgid "Select Log File"
@@ -2291,7 +2186,7 @@ msgstr "Покажи помощен броузър"
msgctxt "MessageLog"
msgid "F1"
-msgstr "F1"
+msgstr ""
msgctxt "MessageLog"
msgid "Close"
@@ -2371,15 +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 "Брой съобщения, които да бъдат показани в прозореца със съобщенията с данни"
+msgstr ""
msgctxt "MessageLog"
msgid "messages"
-msgstr "съобщения"
+msgstr ""
msgctxt "MessageLog"
msgid "Browse"
@@ -2387,39 +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 "Състояние на Тор"
+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 "Съобщения, появяващи се когато нещо \nмного се обърка с Тор."
+msgstr ""
msgctxt "MessageLog"
msgid ""
@@ -2427,30 +2314,26 @@ msgid ""
"during normal Tor operation and are \n"
"not considered errors, but you may \n"
"care about."
-msgstr "Съобщения появяващи се рядко\nпо време на нормалната работа на Тор и \nне са считани за грешки, но може да се проверят."
+msgstr ""
msgctxt "MessageLog"
msgid ""
"Messages that appear frequently \n"
"during normal Tor operation."
-msgstr "Съобщения появяващи се често\nпо време на нормалната работа на Тор."
+msgstr ""
msgctxt "MessageLog"
msgid ""
"Hyper-verbose messages primarily of \n"
"interest to Tor developers."
-msgstr "Многословни съобщения, преди всичко от\nинтерес за Тор разработчиците."
+msgstr ""
msgctxt "MessageLog"
msgid ""
"Cannot write file %1\n"
"\n"
"%2."
-msgstr "Не може да запише файл %1\n\n%2."
-
-msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr "Тор мрежова карта"
+msgstr ""
msgctxt "NetViewer"
msgid "Refresh"
@@ -2458,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"
@@ -2478,7 +2361,7 @@ msgstr "Показва помоща за мрежовата карта"
msgctxt "NetViewer"
msgid "F1"
-msgstr "F1"
+msgstr ""
msgctxt "NetViewer"
msgid "Close"
@@ -2502,7 +2385,7 @@ msgstr "Приближи върху мрежовата карта"
msgctxt "NetViewer"
msgid "+"
-msgstr "+"
+msgstr ""
msgctxt "NetViewer"
msgid "Zoom Out"
@@ -2526,7 +2409,7 @@ msgstr "Нагоди изгледада показва всички вериги
msgctxt "NetViewer"
msgid "Ctrl+Z"
-msgstr "Ctrl+Z"
+msgstr ""
msgctxt "NetViewer"
msgid "Relay Not Found"
@@ -2534,7 +2417,7 @@ msgstr "Файлът не е намерен"
msgctxt "NetViewer"
msgid "No details on the selected relay are available."
-msgstr "Няма данни на разположение за избраните препредавания."
+msgstr ""
msgctxt "NetViewer"
msgid "Unknown"
@@ -2542,75 +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 ""
+
+msgctxt "NetworkPage"
+msgid "The specified bridge identifier is not valid."
+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 адрес или хост име и номер на порта, за да настроите Тор да използва прокси достъп до интернет."
+msgstr ""
msgctxt "NetworkPage"
msgid ""
"You must specify one or more ports to which your firewall allows you to "
"connect."
-msgstr "Трябва да определите един или повече портове, до които защитната Ви стена позволява да се свържете."
+msgstr ""
msgctxt "NetworkPage"
msgid "'%1' is not a valid port number."
-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 "Избери само за да се свърже с препращания използващи позволени портове от защитната стена"
+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"
@@ -2620,76 +2527,76 @@ msgctxt "NetworkPage"
msgid ""
"Check to encrypt directory requests and, optionally, use bridge relays to "
"access the Tor network"
-msgstr "Избери за да криптира заявки за достъп до директорията и по избор използвай мостово препращане за достъп до Тор мрежата"
+msgstr ""
msgctxt "NetworkPage"
msgid "My ISP blocks connections to the Tor network"
-msgstr "Моят доставчик на интернет услуги блокира връзките с Тор мрежата"
+msgstr ""
msgctxt "NetworkPage"
msgid "Bridge Settings"
-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 "В момента няма нови мостове на разположение. Можете или да изчакате за малко и да опитате отново или да опитате друг метод за намиране на нови мостове."
+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"
-msgstr "SOCKS 5"
+msgstr ""
msgctxt "NetworkPage"
-msgid "HTTP / HTTPS"
-msgstr "HTTP / HTTPS"
+msgid "HTTP"
+msgstr ""
msgctxt "NetworkPage"
-msgid "You must specify one or more bridges."
+msgid "HTTP / HTTPS"
msgstr ""
msgctxt "Policy"
@@ -2758,11 +2665,11 @@ msgstr "Неизвестен"
msgctxt "RouterInfoDialog"
msgid "Relay Details"
-msgstr "Подрбности на препращането"
+msgstr ""
msgctxt "RouterInfoDialog"
msgid "Summary"
-msgstr "Резюме"
+msgstr ""
msgctxt "RouterInfoDialog"
msgid "Name:"
@@ -2802,7 +2709,7 @@ msgstr "Последен Ъпдейт:"
msgctxt "RouterInfoDialog"
msgid "Descriptor"
-msgstr "Чертожник"
+msgstr ""
msgctxt "RouterListItem"
msgid "Offline"
@@ -2818,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"
@@ -2834,59 +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 "Вие настроихте Тор да действа като мостов препращач, но Тор версията Ви не подържа мостове."
+msgstr ""
msgctxt "ServerPage"
msgid ""
"Please upgrade your Tor software or configure Tor to act as a normal Tor "
"relay."
-msgstr "Моля, обновете Вашия Тор софтуеър или настройте Тор да действа като нормален Тор препращач."
+msgstr ""
msgctxt "ServerPage"
msgid "Your bridge relay is not running."
-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 "Действай само като потребител"
+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:"
@@ -2902,11 +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 "Портове на които потребители и други препращания могат да осъществят диалог със твоето препращане"
+msgstr ""
msgctxt "ServerPage"
msgid "Nickname:"
@@ -2914,41 +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 "За интернет връзки с бърза скорост на сваляне, но бавно качване, моля впишете тук скоростта си на качване."
+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"
@@ -2978,59 +2885,59 @@ 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 ""
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"
@@ -3039,13 +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 "Тор въпреки всичко ще блокира някои изходящи писма и програми за споделяне на файлове по подразбиране, за да намали спам или друга злоупотреба."
+msgstr ""
msgctxt "ServerPage"
msgid "Exit Policies"
@@ -3053,34 +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 "Това е идентичността на твоя препредаващ мост, който може да дадете на други хора"
+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 "Не спирай твоето препредаване за да може потребителите да имат по-голям шанс да го намерят и използват."
+msgstr ""
msgctxt "ServerPage"
msgid "Bridge History"
-msgstr "История на моста"
+msgstr ""
msgctxt "ServerPage"
msgid "Vidalia was unable to retrieve your bridge's usage history."
@@ -3090,55 +2997,55 @@ 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"
-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 for the Tor network (exit relay)"
+msgid "Relay traffic inside the Tor network (non-exit relay)"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic inside the Tor network (non-exit relay)"
+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 отпечатък."
+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 "Моля, конфугирирайте най-малко директория на услугите и виртуален порт за всяка услуга, която искате да съхраните. Отстранете другите."
+msgstr ""
msgctxt "ServicePage"
msgid "Error"
@@ -3146,94 +3053,90 @@ 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 "Разгледай локалната система от файлове и избери директория за избраните услуги"
+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 ""
"Click \"Start Tor\" in the Vidalia Control Panel to restart the Tor "
"software. If Tor exited unexpectedly, select the \"Advanced\" tab above for "
"details about any errors encountered."
-msgstr "Натисни \"Стартиране на Тор\" в контролния панел на Видалия за да се рестартира Тор програмата. Ако Тор излезне неочаквано, избери по-горе раздел \"Напреднал\" за подробности за неочаквани грешки."
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
@@ -3241,7 +3144,7 @@ msgid ""
"longer recommended. Please upgrade to the most recent version of the "
"software, which may contain important security, reliability and performance "
"fixes."
-msgstr "В момента ползвате версия \"%1\" на Тор програмата, която не се препоръчва повече. Моля, обновете до най-съвременната версия на софтуеъра, която може да съдържа важни поправки в сигурността, надежността и производителността."
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
@@ -3249,31 +3152,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 "В момента ползвате версия \"%1\" на Тор програмата, която може да не работи повече с настоящата Тор мрежа. Моля, обновете до най-съвременната версия на софтуеъра, която може да съдържа важни поправки в сигурността, надежността и производителността."
+msgstr ""
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 "Успешно осъществихме връзка с Тор мрежата. Сега можете да настроите Вашите програми да използват Интернет анонимно."
+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\""
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
@@ -3281,7 +3184,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 ""
msgctxt "StatusEventWidget"
msgid ""
@@ -3289,11 +3192,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 "Тор установи, че Вашия копютърен часовник може би е нагласен на %1 секунди напред, в сравнение с източника \"%2\". Ако часовникът не е верен, Тор нама да може да работи. Моля, проверете дали компютъра Ви показва точното време."
+msgstr ""
msgctxt "StatusEventWidget"
msgid "Your Computer's Clock is Potentially Incorrect"
-msgstr "Часовника на Вашият компютър вероятно е настроен погрешно."
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
@@ -3301,18 +3204,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 "Една от програмите на Вашия компютър може да е опитала да осъществи некриптирана връзка през Тор до порт %1. Изпращане на некриптирана информация през Тор мрежата е опасно и не се препоръчва. С оглед на Вашата безопасност, Тор автоматично затвори тази връзка."
+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 "Една от програмите на Вашия компютър може да е опитала да осъществи некриптирана връзка през Тор до порт %1. Изпращане на некриптирана информация през Тор мрежата е опасно и не се препоръчва."
+msgstr ""
msgctxt "StatusEventWidget"
msgid "Potentially Dangerous Connection!"
-msgstr "Потенциално опасна връзка!"
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
@@ -3320,81 +3223,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 "Една от програмите на Вашия компютър е осъществила връзка през Тор до порт %1 използвайки протокол, който може да изпуска информация за Вашата дестинация. Моля, уверете се, че сте настроили програмите си да ползват само SOCKS4a или SOCKS5 със отдалечен анализ на хост името."
+msgstr ""
msgctxt "StatusEventWidget"
msgid "Unknown SOCKS Protocol"
-msgstr "Непознат SOCKS Протокол"
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
"One of your applications tried to establish a connection through Tor using a"
" protocol that Tor does not understand. Please ensure you configure your "
"applications to use only SOCKS4a or SOCKS5 with remote hostname resolution."
-msgstr "Една от програмите на Вашия компютър е опитала да осъществи връзка през Тор използвайки протокол, който Тор не разбира. Моля, уверете се, че сте настроили програмите си да ползват само SOCKS4a или SOCKS5 със отдалечен анализ на хост името."
+msgstr ""
msgctxt "StatusEventWidget"
msgid "Invalid Destination Hostname"
-msgstr "Хост име с невалидно предназначение"
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
"One of your applications tried to establish a connection through Tor to "
"\"%1\", which Tor does not recognize as a valid hostname. Please check your "
"application's configuration."
-msgstr "Една от програмите, които ползвате се е опитала да осъществи връзка през Тор до порт \"%1\", който Тор не разпознава като валидно хост име. Моля, проверете настройките на програмите си."
+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 "Тор установи, че в момента препращащия публичен IP адрес е %1%2. Ако не е правилен, моля, вземете под внимание настройката на \"Адрес\" опцията в конфигурацията на препращането."
+msgstr ""
msgctxt "StatusEventWidget"
msgid "DNS Hijacking Detected"
-msgstr "Засечена е DNS измама"
+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 "Тор установи, че DNS доставчика подава лъжливи отговори за домейни които не съществуват. Известно е, че някои доставчици на интернет услуги и други доставчици на услуги за домейн имена, като OpenDNS правят това за да показват своите собствени рекламни страници или търсачки."
+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 "Тор установи, че твоя DNS доставчика подава лъжливи отговори за добре известни домейни. Тъй като потребителите разчитат на Тор мржовите препращания да предоставят точни DNS отговори,твоето препращане няма да бъде настроено като изходящо препращане."
+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 ""
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 ""
@@ -3402,30 +3305,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 не е вашия правилен IP адрес и порт на сървъра, моля, проверете настройките на препращането."
+msgstr ""
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 ""
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 ""
@@ -3433,21 +3336,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 "Вашият порт на препращащата директория не е достъпен от други потребители на Тор. Това може да се получи ако се намирате зад рутер или ако защитната стена изисква да се настрои прехвърляне на портове. Ако %1:%2 не е Вашият правилен IP адрес и порт на директория, моля проверете настройките на препращането си."
+msgstr ""
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 ""
msgctxt "StatusEventWidget"
msgid "Your Relay is Online"
-msgstr "Твоето препращане е онлайн"
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
@@ -3455,7 +3358,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 "Твоето препращане сега е онлайн и на разположение за ползване на потребителите на Тор. Би следвало да видиш завишение на мрежовия трафик, изобразен на графата за потреблението в рамките на няколко часа, докато повече потребители научават за твоето препращане. Благодаря за приноса към Тор мрежата! "
+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"
@@ -3487,177 +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 "Съхрани настройките. Ако не е отбелязано ще приложи настройки само за настоящия Тор случай."
+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 "Селектираното е празно. Моля, избери някакъв текст или отбележи \"Приложи всичко\""
+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'."
+msgstr ""
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..."
-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"
@@ -3665,11 +3614,11 @@ msgstr "ОК"
msgctxt "UpdateProgressDialog"
msgid "Software Updates"
-msgstr "Обновления за програмата"
+msgstr ""
msgctxt "UpdateProgressDialog"
msgid "Checking for updates..."
-msgstr "проверяване за обновления..."
+msgstr ""
msgctxt "UpdateProgressDialog"
msgid "Cancel"
@@ -3677,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"
@@ -3697,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"
@@ -3733,11 +3690,11 @@ msgstr "Покажи опции"
msgctxt "VMessageBox"
msgid "Continue"
-msgstr "Продължи"
+msgstr ""
msgctxt "VMessageBox"
msgid "Quit"
-msgstr "Край"
+msgstr ""
msgctxt "VMessageBox"
msgid "Browse"
@@ -3745,7 +3702,7 @@ msgstr "Разлисти"
msgctxt "Vidalia"
msgid "Invalid Argument"
-msgstr "Невалидна стойност"
+msgstr ""
msgctxt "Vidalia"
msgid "Vidalia is already running"
@@ -3753,70 +3710,66 @@ 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 "Недействително установяване на стила, на графичната потребителска среда:"
+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 "По всяка вероятност друг процес на Видалия вече е в ход. Ако наистина няма друг работещ процес, може да изберете да продължите.\n\nИскате ли да продължите стартирането на Видалия?"
+msgstr ""
msgctxt "stringutil.h"
msgid "%1 secs"
-msgstr "%1 секунди"
+msgstr ""
msgctxt "stringutil.h"
msgid "%1 B/s"
@@ -3836,12 +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/qt_bn.po b/src/vidalia/i18n/po/bn/qt_bn.po
index fb0dc79..8b90f23 100644
--- a/src/vidalia/i18n/po/bn/qt_bn.po
+++ b/src/vidalia/i18n/po/bn/qt_bn.po
@@ -1,11 +1,10 @@
#
-# Translators:
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-08-20 03:25+0000\n"
-"PO-Revision-Date: 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"
@@ -431,5 +430,3 @@ msgstr ""
msgctxt "QFileSystemModel"
msgid "%1 bytes"
msgstr ""
-
-
diff --git a/src/vidalia/i18n/po/bn/vidalia_bn.po b/src/vidalia/i18n/po/bn/vidalia_bn.po
index d60b5c7..22b0f4e 100644
--- a/src/vidalia/i18n/po/bn/vidalia_bn.po
+++ b/src/vidalia/i18n/po/bn/vidalia_bn.po
@@ -1,18 +1,15 @@
-#
-# Translators:
+#, fuzzy
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: 2010-12-05 20:03+0000\n"
-"Last-Translator: \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: 2009-05-19 23:56+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
+"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: bn\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
"X-Generator: Vidalia ts2po 0.2\n"
msgctxt "AboutDialog"
@@ -35,13 +32,28 @@ msgctxt "AboutDialog"
msgid "Qt 4.4.2"
msgstr ""
+msgctxt "AboutDialog"
+msgid "Vidalia"
+msgstr ""
+
+msgctxt "AboutDialog"
+msgid "Tor"
+msgstr ""
+
+msgctxt "AboutDialog"
+msgid "Qt"
+msgstr ""
+
+msgctxt "AboutDialog"
+msgid "version"
+msgstr ""
+
msgctxt "AdvancedPage"
msgid "'%1' is not a valid IP address."
msgstr ""
msgctxt "AdvancedPage"
-msgid ""
-"You selected 'Password' authentication, but did not specify a password."
+msgid "You selected 'Password' authentication, but did not specify a password."
msgstr ""
msgctxt "AdvancedPage"
@@ -81,6 +93,10 @@ msgid "Vidalia was unable to install the Tor service."
msgstr ""
msgctxt "AdvancedPage"
+msgid "Control Port"
+msgstr ""
+
+msgctxt "AdvancedPage"
msgid "Authentication:"
msgstr ""
@@ -137,68 +153,7 @@ msgid "Select the directory used to store data for the Tor software"
msgstr ""
msgctxt "AdvancedPage"
-msgid "Tor Control"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "Use TCP connection (ControlPort)"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "Path:"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "Use Unix domain socket (ControlSocket)"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "Edit current torrc"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "NOTE: this will edit the currently loaded torrc"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "ControlSocket path doesn't exist."
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid ""
-"The specified Tor configuration file location contains characters that "
-"cannot be represented in your system's current 8-bit character encoding."
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid ""
-"The specified Tor data directory location contains characters that cannot be"
-" represented in your system's current 8-bit character encoding."
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "Warning"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "You changed torrc path, would you like to restart Tor?"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "Tor Configuration File (torrc);;All Files (*)"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "Select a file to use for Tor socket path"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "Configure ControlPort automatically"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid ""
-"Vidalia was unable to remove the Tor service.\n"
+msgid "Vidalia was unable to remove the Tor service.\n"
"\n"
"You may need to remove it manually."
msgstr ""
@@ -440,9 +395,7 @@ msgid "Remember my password"
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid ""
-"Vidalia has connected to a running Tor process that requires a password. "
-"Please enter your control password:"
+msgid "Vidalia has connected to a running Tor process that requires a password. Please enter your control password:"
msgstr ""
msgctxt "ControlSocket"
@@ -1158,10 +1111,6 @@ msgid "Zimbabwe"
msgstr ""
msgctxt "CountryInfo"
-msgid "Zaire"
-msgstr ""
-
-msgctxt "CountryInfo"
msgid "Albania"
msgstr ""
@@ -1257,55 +1206,6 @@ msgctxt "CountryInfo"
msgid "Taiwan"
msgstr ""
-msgctxt "CrashReportDialog"
-msgid "Submit a Crash Report"
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid "Vidalia encountered an error and needed to close"
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid "Restart Vidalia"
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid "Don't Restart"
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid "Unable to restart Vidalia"
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid ""
-"We were unable to automatically restart Vidalia. Please restart Vidalia "
-"manually."
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid "Please fill a ticket in:"
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid ""
-"<a "
-"href=\"https://trac.torproject.org/projects/tor/newticket\">https://trac.torproject.org/projects/tor/newticket</a>"
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid ""
-"A crash report has been created that you can send to the Vidalia developers "
-"to help identify and fix the problem. The submitted report does not contain "
-"any personally identifying information."
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid ""
-"with a description of what you were doing before the application crashed, "
-"along with the following files corresponding to the crash report:"
-msgstr ""
-
msgctxt "GeneralPage"
msgid "Executables (*.exe)"
msgstr ""
@@ -1323,6 +1223,10 @@ msgid "You must specify the name of your Tor executable."
msgstr ""
msgctxt "GeneralPage"
+msgid "The proxy arguments specified are not properly formatted."
+msgstr ""
+
+msgctxt "GeneralPage"
msgid "Start Vidalia when my system starts"
msgstr ""
@@ -1519,10 +1423,7 @@ msgid "Opening External Link"
msgstr ""
msgctxt "HelpTextBrowser"
-msgid ""
-"Vidalia can open the link you selected in your default Web browser. If your "
-"browser is not currently configured to use Tor then the request will not be "
-"anonymous."
+msgid "Vidalia can open the link you selected in your default Web browser. If your browser is not currently configured to use Tor then the request will not be anonymous."
msgstr ""
msgctxt "HelpTextBrowser"
@@ -1534,9 +1435,7 @@ msgid "Unable to Open Link"
msgstr ""
msgctxt "HelpTextBrowser"
-msgid ""
-"Vidalia was unable to open the selected link in your Web browser. You can "
-"still copy the URL and paste it into your browser."
+msgid "Vidalia was unable to open the selected link in your Web browser. You can still copy the URL and paste it into your browser."
msgstr ""
msgctxt "HelpTextBrowser"
@@ -1579,30 +1478,6 @@ msgctxt "LogEvent"
msgid "Unknown"
msgstr ""
-msgctxt "LogTreeItem"
-msgid "Debug"
-msgstr ""
-
-msgctxt "LogTreeItem"
-msgid "Info"
-msgstr ""
-
-msgctxt "LogTreeItem"
-msgid "Notice"
-msgstr ""
-
-msgctxt "LogTreeItem"
-msgid "Warning"
-msgstr ""
-
-msgctxt "LogTreeItem"
-msgid "Error"
-msgstr ""
-
-msgctxt "LogTreeItem"
-msgid "Unknown"
-msgstr ""
-
msgctxt "MainWindow"
msgid "Start Tor"
msgstr ""
@@ -1816,9 +1691,7 @@ msgid "Error Starting Tor"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Vidalia was unable to start Tor. Check your settings to ensure the correct "
-"name and location of your Tor executable is specified."
+msgid "Vidalia was unable to start Tor. Check your settings to ensure the correct name and location of your Tor executable is specified."
msgstr ""
msgctxt "MainWindow"
@@ -1854,9 +1727,7 @@ msgid "Cookie Authentication Required"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"The Tor software requires Vidalia to send the contents of an authentication "
-"cookie, but Vidalia was unable to find one."
+msgid "The Tor software requires Vidalia to send the contents of an authentication cookie, but Vidalia was unable to find one."
msgstr ""
msgctxt "MainWindow"
@@ -1876,9 +1747,7 @@ msgid "Error Registering for Events"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Vidalia was unable to register for some events. Many of Vidalia's features "
-"may be unavailable."
+msgid "Vidalia was unable to register for some events. Many of Vidalia's features may be unavailable."
msgstr ""
msgctxt "MainWindow"
@@ -1898,9 +1767,7 @@ msgid "Tor Update Available"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended. Please visit the Tor website to download the latest version."
+msgid "The currently installed version of Tor is out of date or no longer recommended. Please visit the Tor website to download the latest version."
msgstr ""
msgctxt "MainWindow"
@@ -1908,9 +1775,7 @@ msgid "Tor website: %1"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"All subsequent connections will appear to be different than your old "
-"connections."
+msgid "All subsequent connections will appear to be different than your old connections."
msgstr ""
msgctxt "MainWindow"
@@ -2002,21 +1867,15 @@ msgid "Password Reset Failed"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Vidalia tried to reset Tor's control password, but was not able to restart "
-"the Tor software. Please check your Task Manager to ensure there are no "
-"other Tor processes running."
+msgid "Vidalia tried to reset Tor's control password, but was not able to restart the Tor software. Please check your Task Manager to ensure there are no other Tor processes running."
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended."
+msgid "The currently installed version of Tor is out of date or no longer recommended."
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Would you like to check if a newer package is available for installation?"
+msgid "Would you like to check if a newer package is available for installation?"
msgstr ""
msgctxt "MainWindow"
@@ -2024,9 +1883,11 @@ msgid "Potentially Unsafe Connection"
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 ""
msgctxt "MainWindow"
@@ -2038,9 +1899,7 @@ msgid "Your software is up to date"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"There are no new Tor software packages available for your computer at this "
-"time."
+msgid "There are no new Tor software packages available for your computer at this time."
msgstr ""
msgctxt "MainWindow"
@@ -2056,52 +1915,52 @@ msgid "The following error occurred:"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Anything sent over this connection could be monitored. Please check your "
-"application's configuration and use only encrypted protocols, such as SSL, "
-"if possible."
-msgstr ""
-
-msgctxt "MainWindow"
msgid "failed (%1)"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
+msgid "Your relay is shutting down.\n"
"Click 'Stop' again to stop your relay now."
msgstr ""
msgctxt "MainWindow"
-msgid "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 ""
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 ""
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 ""
+
+msgctxt "MainWindow"
+msgid "File"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "About Vidalia"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Home"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Check For Updates"
msgstr ""
msgctxt "MessageLog"
@@ -2345,68 +2204,50 @@ 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"
+msgid "Always Save New Log Messages"
msgstr ""
msgctxt "MessageLog"
-msgid "Tor Status"
+msgid "Browse"
msgstr ""
msgctxt "MessageLog"
-msgid "Advanced"
+msgid "Enable automatically saving all new log messages to a file"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
+msgid "Automatically save new log messages to a file"
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 ""
msgctxt "MessageLog"
-msgid ""
-"Messages that only appear when \n"
+msgid "Messages that only appear when \n"
"something has gone wrong with Tor."
msgstr ""
msgctxt "MessageLog"
-msgid ""
-"Messages that appear infrequently \n"
+msgid "Messages that appear infrequently \n"
"during normal Tor operation and are \n"
"not considered errors, but you may \n"
"care about."
msgstr ""
msgctxt "MessageLog"
-msgid ""
-"Messages that appear frequently \n"
+msgid "Messages that appear frequently \n"
"during normal Tor operation."
msgstr ""
msgctxt "MessageLog"
-msgid ""
-"Hyper-verbose messages primarily of \n"
+msgid "Hyper-verbose messages primarily of \n"
"interest to Tor developers."
msgstr ""
msgctxt "MessageLog"
-msgid ""
-"Cannot write file %1\n"
+msgid "Cannot write file %1\n"
"\n"
"%2."
msgstr ""
@@ -2528,15 +2369,11 @@ msgid "Copy (Ctrl+C)"
msgstr ""
msgctxt "NetworkPage"
-msgid ""
-"You must specify both an IP address or hostname and a port number to "
-"configure Tor to use a proxy to access the Internet."
+msgid "You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet."
msgstr ""
msgctxt "NetworkPage"
-msgid ""
-"You must specify one or more ports to which your firewall allows you to "
-"connect."
+msgid "You must specify one or more ports to which your firewall allows you to connect."
msgstr ""
msgctxt "NetworkPage"
@@ -2556,10 +2393,18 @@ msgid "Proxy Settings"
msgstr ""
msgctxt "NetworkPage"
+msgid "HTTP Proxy:"
+msgstr ""
+
+msgctxt "NetworkPage"
msgid "Username:"
msgstr ""
msgctxt "NetworkPage"
+msgid "Use this proxy for HTTPS also"
+msgstr ""
+
+msgctxt "NetworkPage"
msgid "Password:"
msgstr ""
@@ -2588,9 +2433,7 @@ msgid "80, 443"
msgstr ""
msgctxt "NetworkPage"
-msgid ""
-"Check to encrypt directory requests and, optionally, use bridge relays to "
-"access the Tor network"
+msgid "Check to encrypt directory requests and, optionally, use bridge relays to access the Tor network"
msgstr ""
msgctxt "NetworkPage"
@@ -2602,10 +2445,18 @@ msgid "Bridge Settings"
msgstr ""
msgctxt "NetworkPage"
+msgid "The Tor software you are currently running does not support bridges. <br>Directory connections will still be encrypted."
+msgstr ""
+
+msgctxt "NetworkPage"
msgid "Add a Bridge:"
msgstr ""
msgctxt "NetworkPage"
+msgid "<a href=\"bridges.finding\">How do I find a bridge?</a>"
+msgstr ""
+
+msgctxt "NetworkPage"
msgid "Remove the selected bridges from the list"
msgstr ""
@@ -2626,43 +2477,13 @@ msgid "<a href=\"bridges.finding\">How can I find bridges?</a>"
msgstr ""
msgctxt "NetworkPage"
-msgid ""
-"No new bridges are currently available. You can either wait a while and try "
-"again, or try another method of finding new bridges."
+msgid "No new bridges are currently available. You can either wait a while and try again, or try another method of finding new bridges."
msgstr ""
msgctxt "NetworkPage"
msgid "Click Help to see other methods of finding new bridges."
msgstr ""
-msgctxt "NetworkPage"
-msgid "Address:"
-msgstr ""
-
-msgctxt "NetworkPage"
-msgid "Type:"
-msgstr ""
-
-msgctxt "NetworkPage"
-msgid "You must select the proxy type."
-msgstr ""
-
-msgctxt "NetworkPage"
-msgid "SOCKS 4"
-msgstr ""
-
-msgctxt "NetworkPage"
-msgid "SOCKS 5"
-msgstr ""
-
-msgctxt "NetworkPage"
-msgid "HTTP"
-msgstr ""
-
-msgctxt "NetworkPage"
-msgid "HTTP / HTTPS"
-msgstr ""
-
msgctxt "Policy"
msgid "accept"
msgstr ""
@@ -2816,15 +2637,11 @@ msgid "Bridge Support Unavailable"
msgstr ""
msgctxt "ServerPage"
-msgid ""
-"You have configured Tor to act as a bridge relay for censored users, but "
-"your version of Tor does not support bridges."
+msgid "You have configured Tor to act as a bridge relay for censored users, but your version of Tor does not support bridges."
msgstr ""
msgctxt "ServerPage"
-msgid ""
-"Please upgrade your Tor software or configure Tor to act as a normal Tor "
-"relay."
+msgid "Please upgrade your Tor software or configure Tor to act as a normal Tor relay."
msgstr ""
msgctxt "ServerPage"
@@ -2892,9 +2709,7 @@ msgid "Basic Settings"
msgstr ""
msgctxt "ServerPage"
-msgid ""
-"For Internet connections with fast download speed but slow upload, please "
-"list your upload speed here."
+msgid "For Internet connections with fast download speed but slow upload, please list your upload speed here."
msgstr ""
msgctxt "ServerPage"
@@ -2950,9 +2765,7 @@ msgid "Peak bandwidth rate limit"
msgstr ""
msgctxt "ServerPage"
-msgid ""
-"Your maximum bandwidth rate must be greater than or equal to your average "
-"bandwidth rate. Both values must be at least 20 KB/s."
+msgid "Your maximum bandwidth rate must be greater than or equal to your average bandwidth rate. Both values must be at least 20 KB/s."
msgstr ""
msgctxt "ServerPage"
@@ -3012,14 +2825,11 @@ msgid "Show help topic on exit policies"
msgstr ""
msgctxt "ServerPage"
-msgid ""
-"What Internet resources should users be able to access from your relay?"
+msgid "What Internet resources should users be able to access from your relay?"
msgstr ""
msgctxt "ServerPage"
-msgid ""
-"Tor will still block some outgoing mail and file sharing applications by "
-"default to reduce spam and other abuse."
+msgid "Tor will still block some outgoing mail and file sharing applications by default to reduce spam and other abuse."
msgstr ""
msgctxt "ServerPage"
@@ -3031,8 +2841,7 @@ msgid "Let others access your bridge by giving them this line:"
msgstr ""
msgctxt "ServerPage"
-msgid ""
-"This is the identity of your bridge relay that you can give to other people"
+msgid "This is the identity of your bridge relay that you can give to other people"
msgstr ""
msgctxt "ServerPage"
@@ -3048,9 +2857,7 @@ msgid "No clients have used your relay recently."
msgstr ""
msgctxt "ServerPage"
-msgid ""
-"Leave your relay running so clients have a better chance of finding and "
-"using it."
+msgid "Leave your relay running so clients have a better chance of finding and using it."
msgstr ""
msgctxt "ServerPage"
@@ -3062,9 +2869,7 @@ msgid "Vidalia was unable to retrieve your bridge's usage history."
msgstr ""
msgctxt "ServerPage"
-msgid ""
-"Tor returned an improperly formatted response when Vidalia requested your "
-"bridge's usage history."
+msgid "Tor returned an improperly formatted response when Vidalia requested your bridge's usage history."
msgstr ""
msgctxt "ServerPage"
@@ -3080,20 +2885,11 @@ msgid "<a href=\"#bridgeUsage\">Who has used my bridge?</a>"
msgstr ""
msgctxt "ServerPage"
-msgid "<a href=\"#bridgeHelp\">What's this?</a>"
-msgstr ""
-
-msgctxt "ServerPage"
-msgid "Automatically distribute my bridge address"
-msgstr ""
-
-msgctxt "ServerPage"
msgid "Mirror the Relay Directory"
msgstr ""
msgctxt "ServerPage"
-msgid ""
-"Email address at which you may be reached if there is a\n"
+msgid "Email address at which you may be reached if there is a\n"
"problem with your relay. You might also include your PGP or GPG fingerprint."
msgstr ""
@@ -3102,9 +2898,7 @@ msgid "Error while trying to unpublish all services"
msgstr ""
msgctxt "ServicePage"
-msgid ""
-"Please configure at least a service directory and a virtual port for each "
-"service you want to save. Remove the other ones."
+msgid "Please configure at least a service directory and a virtual port for each service you want to save. Remove the other ones."
msgstr ""
msgctxt "ServicePage"
@@ -3179,251 +2973,6 @@ msgctxt "ServicePage"
msgid "Created by Tor"
msgstr ""
-msgctxt "StatusEventWidget"
-msgid "Copy to Clipboard"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "The Tor Software is Running"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "You are currently running version \"%1\" of the Tor software."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "The Tor Software is not Running"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Click \"Start Tor\" in the Vidalia Control Panel to restart the Tor "
-"software. If Tor exited unexpectedly, select the \"Advanced\" tab above for "
-"details about any errors encountered."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"You are currently running version \"%1\" of the Tor software, which is no "
-"longer recommended. Please upgrade to the most recent version of the "
-"software, which may contain important security, reliability and performance "
-"fixes."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"You are currently running version \"%1\" of the Tor software, which may no "
-"longer work with the current Tor network. Please upgrade to the most recent "
-"version of the software, which may contain important security, reliability "
-"and performance fixes."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Your Tor Software is Out-of-date"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Connected to the Tor Network"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"We were able to successfully establish a connection to the Tor network. You "
-"can now configure your applications to use the Internet anonymously."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Tor Software Error"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"The Tor software encountered an internal bug. Please report the following "
-"error message to the Tor developers at bugs.torproject.org: \"%1\""
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Tor has determined that your computer's clock may be set to %1 seconds in "
-"the past compared to the source \"%2\". If your clock is not correct, Tor "
-"will not be able to function. Please verify your computer displays the "
-"correct time."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Tor has determined that your computer's clock may be set to %1 seconds in "
-"the future compared to the source \"%2\". If your clock is not correct, Tor "
-"will not be able to function. Please verify your computer displays the "
-"correct time."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Your Computer's Clock is Potentially Incorrect"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"One of the applications on your computer may have attempted to make an "
-"unencrypted connection through Tor to port %1. Sending unencrypted "
-"information over the Tor network is dangerous and not recommended. For your "
-"protection, Tor has automatically closed this connection."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"One of the applications on your computer may have attempted to make an "
-"unencrypted connection through Tor to port %1. Sending unencrypted "
-"information over the Tor network is dangerous and not recommended."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Potentially Dangerous Connection!"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"One of your applications established a connection through Tor to \"%1\" "
-"using a protocol that may leak information about your destination. Please "
-"ensure you configure your applications to use only SOCKS4a or SOCKS5 with "
-"remote hostname resolution."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Unknown SOCKS Protocol"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"One of your applications tried to establish a connection through Tor using a"
-" protocol that Tor does not understand. Please ensure you configure your "
-"applications to use only SOCKS4a or SOCKS5 with remote hostname resolution."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Invalid Destination Hostname"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"One of your applications tried to establish a connection through Tor to "
-"\"%1\", which Tor does not recognize as a valid hostname. Please check your "
-"application's configuration."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "External IP Address Changed"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Tor has determined your relay's public IP address is currently %1%2. If that"
-" is not correct, please consider setting the 'Address' option in your "
-"relay's configuration."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "DNS Hijacking Detected"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Tor detected that your DNS provider is providing false responses for domains"
-" that do not exist. Some ISPs and other DNS providers, such as OpenDNS, are "
-"known to do this in order to display their own search or advertising pages."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Tor detected that your DNS provider is providing false responses for well "
-"known domains. Since clients rely on Tor network relays to provide accurate "
-"DNS repsonses, your relay will not be configured as an exit relay."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Checking Server Port Reachability"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Tor is trying to determine if your relay's server port is reachable from the"
-" Tor network by connecting to itself at %1:%2. This test could take several "
-"minutes."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Server Port Reachability Test Successful!"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Your relay's server port is reachable from the Tor network!"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Server Port Reachability Test Failed"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Your relay's server port is not reachable by other Tor clients. This can "
-"happen if you are behind a router or firewall that requires you to set up "
-"port forwarding. If %1:%2 is not your correct IP address and server port, "
-"please check your relay's configuration."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Checking Directory Port Reachability"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Tor is trying to determine if your relay's directory port is reachable from "
-"the Tor network by connecting to itself at %1:%2. This test could take "
-"several minutes."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Directory Port Reachability Test Successful!"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Your relay's directory port is reachable from the Tor network!"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Directory Port Reachability Test Failed"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Your relay's directory port is not reachable by other Tor clients. This can "
-"happen if you are behind a router or firewall that requires you to set up "
-"port forwarding. If %1:%2 is not your correct IP address and directory port,"
-" please check your relay's configuration."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Relay Descriptor Rejected"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Your relay's descriptor, which enables clients to connect to your relay, was"
-" rejected by the directory server at %1:%2. The reason given was: %3"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Your Relay is Online"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Your relay is now online and available for Tor clients to use. You should "
-"see an increase in network traffic shown by the Bandwidth Graph within a few"
-" hours as more clients learn about your relay. Thank you for contributing to"
-" the Tor network!"
-msgstr ""
-
msgctxt "Stream"
msgid "New"
msgstr ""
@@ -3476,68 +3025,6 @@ msgctxt "TorSettings"
msgid "Failed to hash the control password."
msgstr ""
-msgctxt "TorrcDialog"
-msgid "Editing torrc"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid ""
-"Save settings. If unchecked it will only apply settings to the current Tor "
-"instance."
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Cut"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Copy"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Paste"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Undo"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Redo"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Select All"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Apply all"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Apply selection only"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Error connecting to Tor"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Selection is empty. Please select some text, or check \"Apply all\""
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Error at line %1: \"%2\""
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Error"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "An error ocurred while opening torrc file"
-msgstr ""
-
msgctxt "UPNPControl"
msgid "Success"
msgstr ""
@@ -3595,15 +3082,11 @@ msgid "Testing Universal Plug & Play Support"
msgstr ""
msgctxt "UpdateProcess"
-msgid ""
-"Vidalia was unable to check for available software updates because it could "
-"not find '%1'."
+msgid "Vidalia was unable to check for available software updates because it could not find '%1'."
msgstr ""
msgctxt "UpdateProcess"
-msgid ""
-"Vidalia was unable to check for available software updates because Tor's "
-"update process exited unexpectedly."
+msgid "Vidalia was unable to check for available software updates because Tor's update process exited unexpectedly."
msgstr ""
msgctxt "UpdateProgressDialog"
@@ -3759,10 +3242,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 ""
@@ -3775,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 ""
@@ -3812,5 +3290,3 @@ msgstr ""
msgctxt "stringutil.h"
msgid "%1 mins"
msgstr ""
-
-
diff --git a/src/vidalia/i18n/po/bn_IN/qt_bn_IN.po b/src/vidalia/i18n/po/bn_IN/qt_bn_IN.po
index df79d52..e7479c1 100644
--- a/src/vidalia/i18n/po/bn_IN/qt_bn_IN.po
+++ b/src/vidalia/i18n/po/bn_IN/qt_bn_IN.po
@@ -1,11 +1,10 @@
#
-# Translators:
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-08-20 03:25+0000\n"
-"PO-Revision-Date: 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"
@@ -431,5 +430,3 @@ msgstr ""
msgctxt "QFileSystemModel"
msgid "%1 bytes"
msgstr ""
-
-
diff --git a/src/vidalia/i18n/po/bn_IN/vidalia_bn_IN.po b/src/vidalia/i18n/po/bn_IN/vidalia_bn_IN.po
index 444c242..8e4e29f 100644
--- a/src/vidalia/i18n/po/bn_IN/vidalia_bn_IN.po
+++ b/src/vidalia/i18n/po/bn_IN/vidalia_bn_IN.po
@@ -1,11 +1,10 @@
#
-# Translators:
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-09-07 14:40+0000\n"
-"PO-Revision-Date: 2010-12-05 20:03+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"
@@ -193,10 +192,6 @@ 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"
@@ -236,10 +231,6 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr ""
-
-msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -279,6 +270,10 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr ""
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -432,17 +427,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"
@@ -1266,44 +1270,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"
@@ -1331,10 +1342,6 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr ""
-
-msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1362,6 +1369,10 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr ""
+
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1644,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 ""
@@ -1680,10 +1663,6 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1796,10 +1775,6 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1882,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 ""
@@ -1934,82 +1897,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 ""
@@ -2057,19 +1949,39 @@ 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)"
+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"
@@ -2091,17 +2003,35 @@ msgid ""
msgstr ""
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"
@@ -2357,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"
@@ -2412,10 +2334,6 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2515,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 ""
@@ -2840,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 ""
@@ -3088,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 ""
@@ -3132,10 +3070,6 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
-msgid "Form"
-msgstr ""
-
-msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3424,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 ""
@@ -3460,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 ""
@@ -3538,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 ""
@@ -3666,6 +3646,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 ""
@@ -3759,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 ""
@@ -3812,5 +3796,3 @@ msgstr ""
msgctxt "stringutil.h"
msgid "%1 mins"
msgstr ""
-
-
diff --git a/src/vidalia/i18n/po/bo/qt_bo.po b/src/vidalia/i18n/po/bo/qt_bo.po
index 6a5f7f4..4311227 100644
--- a/src/vidalia/i18n/po/bo/qt_bo.po
+++ b/src/vidalia/i18n/po/bo/qt_bo.po
@@ -1,11 +1,10 @@
#
-# Translators:
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-08-20 03:25+0000\n"
-"PO-Revision-Date: 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"
@@ -431,5 +430,3 @@ msgstr ""
msgctxt "QFileSystemModel"
msgid "%1 bytes"
msgstr ""
-
-
diff --git a/src/vidalia/i18n/po/bo/vidalia_bo.po b/src/vidalia/i18n/po/bo/vidalia_bo.po
index fd72189..cd31a6d 100755
--- a/src/vidalia/i18n/po/bo/vidalia_bo.po
+++ b/src/vidalia/i18n/po/bo/vidalia_bo.po
@@ -1,3816 +1,2682 @@
-#
-# Translators:
+#, fuzzy
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: 2010-12-05 20:03+0000\n"
-"Last-Translator: \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: 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: bo\n"
-"Plural-Forms: nplurals=1; plural=0\n"
"X-Generator: Vidalia ts2po 0.2\n"
+#: aboutdialog.ui:16
msgctxt "AboutDialog"
msgid "About Vidalia"
msgstr ""
+#: aboutdialog.ui:53
msgctxt "AboutDialog"
-msgid "License"
+msgid "Vidalia"
+msgstr ""
+
+#: aboutdialog.ui:88
+msgctxt "AboutDialog"
+msgid "Qt"
+msgstr ""
+
+#: aboutdialog.ui:69
+msgctxt "AboutDialog"
+msgid "Tor"
+msgstr ""
+
+#: aboutdialog.cpp:53
+msgctxt "AboutDialog"
+msgid "Unavailable"
+msgstr ""
+
+#: aboutdialog.cpp:57
+msgctxt "AboutDialog"
+msgid "Not Running"
+msgstr ""
+
+#: aboutdialog.ui:81
+msgctxt "AboutDialog"
+msgid "0.2.0"
+msgstr ""
+
+#: aboutdialog.ui:106
+msgctxt "AboutDialog"
+msgid "0.2.0.31-alpha-dev (r123456)"
msgstr ""
+#: aboutdialog.ui:131
msgctxt "AboutDialog"
-msgid "Vidalia 0.2.0"
+msgid "4.4.2"
msgstr ""
+#: aboutdialog.ui:107
msgctxt "AboutDialog"
-msgid "Tor 0.2.0.32"
+msgid "License"
msgstr ""
+#: aboutdialog.ui:163
msgctxt "AboutDialog"
-msgid "Qt 4.4.2"
+msgid "version"
msgstr ""
+#: advancedpage.cpp:109
msgctxt "AdvancedPage"
msgid "'%1' is not a valid IP address."
msgstr ""
+#: advancedpage.cpp:120
msgctxt "AdvancedPage"
-msgid ""
-"You selected 'Password' authentication, but did not specify a password."
+msgid "You selected 'Password' authentication, but did not specify a password."
msgstr ""
+#: advancedpage.cpp:223
msgctxt "AdvancedPage"
msgid "Select Tor Configuration File"
msgstr ""
+#: advancedpage.cpp:236
msgctxt "AdvancedPage"
msgid "File Not Found"
msgstr ""
+#: advancedpage.cpp:238
msgctxt "AdvancedPage"
msgid "%1 does not exist. Would you like to create it?"
msgstr ""
+#: advancedpage.cpp:249
msgctxt "AdvancedPage"
msgid "Failed to Create File"
msgstr ""
+#: advancedpage.cpp:250
msgctxt "AdvancedPage"
msgid "Unable to create %1 [%2]"
msgstr ""
+#: advancedpage.cpp:265
msgctxt "AdvancedPage"
msgid "Select a Directory to Use for Tor Data"
msgstr ""
+#: advancedpage.cpp:287
msgctxt "AdvancedPage"
msgid "Unable to remove Tor Service"
msgstr ""
+#: advancedpage.cpp:289
+msgctxt "AdvancedPage"
+msgid "Vidalia was unable to remove the Tor service."
+""
+"You may need to remove it manually."
+msgstr ""
+
+#: advancedpage.cpp:298
msgctxt "AdvancedPage"
msgid "Unable to install Tor Service"
msgstr ""
+#: advancedpage.cpp:299
msgctxt "AdvancedPage"
msgid "Vidalia was unable to install the Tor service."
msgstr ""
+#: advancedpage.ui:28
+msgctxt "AdvancedPage"
+msgid "Control Port"
+msgstr ""
+
+#: advancedpage.ui:48
msgctxt "AdvancedPage"
msgid "Authentication:"
msgstr ""
+#: advancedpage.ui:58
msgctxt "AdvancedPage"
msgid "Address:"
msgstr ""
+#: advancedpage.ui:86
msgctxt "AdvancedPage"
msgid "None"
msgstr ""
+#: advancedpage.ui:91
msgctxt "AdvancedPage"
msgid "Cookie"
msgstr ""
+#: advancedpage.ui:96
msgctxt "AdvancedPage"
msgid "Password"
msgstr ""
+#: advancedpage.ui:111
msgctxt "AdvancedPage"
msgid "Randomly Generate"
msgstr ""
+#: advancedpage.ui:157
msgctxt "AdvancedPage"
msgid ":"
msgstr ""
+#: advancedpage.ui:219
msgctxt "AdvancedPage"
msgid "Tor Configuration File"
msgstr ""
+#: advancedpage.ui:240
msgctxt "AdvancedPage"
msgid "Start the Tor software with the specified configuration file (torrc)"
msgstr ""
+#: advancedpage.ui:259
msgctxt "AdvancedPage"
msgid "Select path to your configuration file"
msgstr ""
+#: advancedpage.ui:318
msgctxt "AdvancedPage"
msgid "Browse"
msgstr ""
+#: advancedpage.ui:275
msgctxt "AdvancedPage"
msgid "Data Directory"
msgstr ""
+#: advancedpage.ui:296
msgctxt "AdvancedPage"
msgid "Store data for the Tor software in the following directory"
msgstr ""
+#: advancedpage.ui:315
msgctxt "AdvancedPage"
msgid "Select the directory used to store data for the Tor software"
msgstr ""
-msgctxt "AdvancedPage"
-msgid "Tor Control"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "Use TCP connection (ControlPort)"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "Path:"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "Use Unix domain socket (ControlSocket)"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "Edit current torrc"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "NOTE: this will edit the currently loaded torrc"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "ControlSocket path doesn't exist."
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid ""
-"The specified Tor configuration file location contains characters that "
-"cannot be represented in your system's current 8-bit character encoding."
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid ""
-"The specified Tor data directory location contains characters that cannot be"
-" represented in your system's current 8-bit character encoding."
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "Warning"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "You changed torrc path, would you like to restart Tor?"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "Tor Configuration File (torrc);;All Files (*)"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "Select a file to use for Tor socket path"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "Configure ControlPort automatically"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid ""
-"Vidalia was unable to remove the Tor service.\n"
-"\n"
-"You may need to remove it manually."
-msgstr ""
-
+#: appearancepage.ui:22
msgctxt "AppearancePage"
msgid "Language"
msgstr ""
+#: appearancepage.ui:37
msgctxt "AppearancePage"
msgid "Choose the language used in Vidalia"
msgstr ""
+#: appearancepage.ui:75
msgctxt "AppearancePage"
msgid "Style"
msgstr ""
+#: appearancepage.ui:103
msgctxt "AppearancePage"
msgid "Choose Vidalia's interface style"
msgstr ""
+#: appearancepage.cpp:67
msgctxt "AppearancePage"
msgid "Vidalia was unable to load the selected language translation."
msgstr ""
+#: bwgraph.cpp:166
msgctxt "BandwidthGraph"
msgid "Since:"
msgstr ""
+#: bwgraph.cpp:232
msgctxt "BandwidthGraph"
msgid "Hide Settings"
msgstr ""
+#: bwgraph.ui:40
msgctxt "BandwidthGraph"
msgid "Show Settings"
msgstr ""
+#: bwgraph.ui:16
msgctxt "BandwidthGraph"
msgid "Tor Bandwidth Usage"
msgstr ""
+#: bwgraph.ui:63
msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
+#: bwgraph.ui:151
msgctxt "BandwidthGraph"
msgid "Receive Rate"
msgstr ""
+#: bwgraph.ui:170
msgctxt "BandwidthGraph"
msgid "Send Rate"
msgstr ""
+#: bwgraph.ui:183
msgctxt "BandwidthGraph"
msgid "Always on Top"
msgstr ""
+#: bwgraph.ui:234
msgctxt "BandwidthGraph"
msgid "Style"
msgstr ""
+#: bwgraph.ui:284
msgctxt "BandwidthGraph"
msgid "Changes the transparency of the Bandwidth Graph"
msgstr ""
+#: bwgraph.ui:368
msgctxt "BandwidthGraph"
msgid "100"
msgstr ""
+#: bwgraph.ui:383
msgctxt "BandwidthGraph"
msgid "% Opaque"
msgstr ""
+#: bwgraph.ui:443
msgctxt "BandwidthGraph"
msgid "Save"
msgstr ""
+#: bwgraph.ui:450
msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
-msgctxt "BridgeDownloader"
-msgid "Starting HTTPS bridge request..."
-msgstr ""
-
-msgctxt "BridgeDownloader"
-msgid "Connecting to %1:%2..."
-msgstr ""
-
-msgctxt "BridgeDownloader"
-msgid "Sending an HTTPS request for bridges..."
-msgstr ""
-
-msgctxt "BridgeDownloader"
-msgid "Downloading a list of bridges..."
-msgstr ""
-
-msgctxt "BridgeDownloaderProgressDialog"
-msgid "Downloading Bridges"
-msgstr ""
-
-msgctxt "BridgeDownloaderProgressDialog"
-msgid "Unable to download bridges: %1"
-msgstr ""
-
-msgctxt "BridgeDownloaderProgressDialog"
-msgid "Retrying bridge request..."
-msgstr ""
-
-msgctxt "BridgeUsageDialog"
-msgid "Country"
-msgstr ""
-
-msgctxt "BridgeUsageDialog"
-msgid "# Clients"
-msgstr ""
-
-msgctxt "BridgeUsageDialog"
-msgid "Clients from the following countries have used your relay since %1"
-msgstr ""
-
-msgctxt "BridgeUsageDialog"
-msgid "Bridge Usage Summary"
-msgstr ""
-
-msgctxt "BridgeUsageDialog"
-msgid "Client Summary"
-msgstr ""
-
+#: circuit.cpp:112
msgctxt "Circuit"
msgid "New"
msgstr ""
+#: circuit.cpp:113
msgctxt "Circuit"
msgid "Open"
msgstr ""
+#: circuit.cpp:114
msgctxt "Circuit"
msgid "Building"
msgstr ""
+#: circuit.cpp:115
msgctxt "Circuit"
msgid "Failed"
msgstr ""
+#: circuit.cpp:116
msgctxt "Circuit"
msgid "Closed"
msgstr ""
+#: circuit.cpp:117
msgctxt "Circuit"
msgid "Unknown"
msgstr ""
+#: circuititem.cpp:39
msgctxt "CircuitItem"
msgid "<Path Empty>"
msgstr ""
+#: circuitlistwidget.cpp:55
msgctxt "CircuitListWidget"
msgid "Connection"
msgstr ""
+#: circuitlistwidget.cpp:55
msgctxt "CircuitListWidget"
msgid "Status"
msgstr ""
+#: circuitlistwidget.cpp:87
msgctxt "CircuitListWidget"
msgid "Zoom to Circuit"
msgstr ""
+#: circuitlistwidget.cpp:89
msgctxt "CircuitListWidget"
msgid "Close Circuit (Del)"
msgstr ""
+#: circuitlistwidget.cpp:110
msgctxt "CircuitListWidget"
msgid "Close Stream (Del)"
msgstr ""
+#: configdialog.cpp:77
msgctxt "ConfigDialog"
msgid "General"
msgstr ""
+#: configdialog.cpp:81
msgctxt "ConfigDialog"
msgid "Network"
msgstr ""
+#: configdialog.cpp:85
msgctxt "ConfigDialog"
msgid "Sharing"
msgstr ""
+#: configdialog.cpp:89
msgctxt "ConfigDialog"
msgid "Services"
msgstr ""
+#: configdialog.cpp:93
msgctxt "ConfigDialog"
msgid "Appearance"
msgstr ""
+#: configdialog.cpp:97
msgctxt "ConfigDialog"
msgid "Advanced"
msgstr ""
+#: configdialog.cpp:111
msgctxt "ConfigDialog"
msgid "Help"
msgstr ""
+#: configdialog.cpp:196
msgctxt "ConfigDialog"
msgid "Error Saving Settings"
msgstr ""
+#: configdialog.cpp:198
msgctxt "ConfigDialog"
msgid "Vidalia was unable to save your %1 settings."
msgstr ""
+#: configdialog.cpp:225
msgctxt "ConfigDialog"
msgid "Error Applying Settings"
msgstr ""
+#: configdialog.cpp:227
msgctxt "ConfigDialog"
msgid "Vidalia was unable to apply your %1 settings to Tor."
msgstr ""
+#: configdialog.ui:16
msgctxt "ConfigDialog"
msgid "Settings"
msgstr ""
+#: controlconnection.cpp:134
msgctxt "ControlConnection"
msgid "Vidalia was unable to connect to Tor. (%1)"
msgstr ""
+#: controlconnection.cpp:331
msgctxt "ControlConnection"
msgid "Control socket is not connected."
msgstr ""
+#: controlpasswordinputdialog.ui:28
msgctxt "ControlPasswordInputDialog"
msgid "Password Required"
msgstr ""
+#: controlpasswordinputdialog.ui:80
msgctxt "ControlPasswordInputDialog"
-msgid "Remember my password"
+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:"
+msgid "Remember my password"
msgstr ""
+#: controlsocket.cpp:70
msgctxt "ControlSocket"
msgid "Control socket is not connected."
msgstr ""
+#: controlsocket.cpp:80
msgctxt "ControlSocket"
msgid "Error sending control command. [%1]"
msgstr ""
+#: controlsocket.cpp:117
msgctxt "ControlSocket"
msgid "Socket disconnected while attempting to read a line of data."
msgstr ""
+#: controlsocket.cpp:156
msgctxt "ControlSocket"
msgid "Invalid control reply. [%1]"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Afghanistan"
+#: generalpage.cpp:62
+msgctxt "GeneralPage"
+msgid "Executables (*.exe)"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Andorra"
+#: generalpage.cpp:75
+msgctxt "GeneralPage"
+msgid "Select Path to Tor"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Angola"
+#: generalpage.cpp:85
+msgctxt "GeneralPage"
+msgid "Select Proxy Executable"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Antigua & Barbuda"
+#: generalpage.cpp:98
+msgctxt "GeneralPage"
+msgid "You must specify the name of your Tor executable."
msgstr ""
-msgctxt "CountryInfo"
-msgid "Argentina"
+#: generalpage.cpp:106
+msgctxt "GeneralPage"
+msgid "The proxy arguments specified are not properly formatted."
msgstr ""
-msgctxt "CountryInfo"
-msgid "Armenia"
+#: generalpage.ui:28
+msgctxt "GeneralPage"
+msgid "Start Vidalia when my system starts"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Australia"
+#: generalpage.ui:121
+msgctxt "GeneralPage"
+msgid "Browse"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Azerbaijan"
+#: generalpage.ui:57
+msgctxt "GeneralPage"
+msgid "Start the Tor software when Vidalia starts"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Bahamas"
+#: generalpage.ui:51
+msgctxt "GeneralPage"
+msgid "Tor"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Bangladesh"
+#: generalpage.ui:93
+msgctxt "GeneralPage"
+msgid "Proxy Application (optional)"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Barbados"
+#: generalpage.ui:99
+msgctxt "GeneralPage"
+msgid "Start a proxy application when Tor starts"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Belarus"
+#: generalpage.ui:135
+msgctxt "GeneralPage"
+msgid "Proxy Application Arguments:"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Belgium"
+#: graphframe.cpp:238
+msgctxt "GraphFrame"
+msgid "Recv: "
msgstr ""
-msgctxt "CountryInfo"
-msgid "Belize"
+#: graphframe.cpp:298
+msgctxt "GraphFrame"
+msgid "%1 KB/s"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Bhutan"
+#: graphframe.cpp:247
+msgctxt "GraphFrame"
+msgid "Sent: "
msgstr ""
-msgctxt "CountryInfo"
-msgid "Bolivia"
+#: graphframe.cpp:259
+msgctxt "GraphFrame"
+msgid "%1 KB"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Bosnia & Herzegovina"
+#: graphframe.cpp:262
+msgctxt "GraphFrame"
+msgid "%1 MB"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Botswana"
+#: graphframe.cpp:265
+msgctxt "GraphFrame"
+msgid "%1 GB"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Brazil"
+#: helpbrowser.cpp:135
+msgctxt "HelpBrowser"
+msgid "Error Loading Help Contents: "
msgstr ""
-msgctxt "CountryInfo"
-msgid "Brunei Darussalam"
+#: helpbrowser.cpp:147
+msgctxt "HelpBrowser"
+msgid "Supplied XML file is not a valid Contents document."
msgstr ""
-msgctxt "CountryInfo"
-msgid "Bulgaria"
+#: helpbrowser.cpp:396
+msgctxt "HelpBrowser"
+msgid "Search reached end of document"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Burkina Faso"
+#: helpbrowser.cpp:398
+msgctxt "HelpBrowser"
+msgid "Search reached start of document"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Burundi"
+#: helpbrowser.cpp:400
+msgctxt "HelpBrowser"
+msgid "Text not found in document"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Cambodia"
+#: helpbrowser.cpp:445
+msgctxt "HelpBrowser"
+msgid "Found %1 results"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Cameroon"
+#: helpbrowser.ui:33
+msgctxt "HelpBrowser"
+msgid "Vidalia Help"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Canada"
+#: helpbrowser.ui:484
+msgctxt "HelpBrowser"
+msgid "Back"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Cape Verde"
+#: helpbrowser.ui:487
+msgctxt "HelpBrowser"
+msgid "Move to previous page (Backspace)"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Central African Republic"
+#: helpbrowser.ui:490
+msgctxt "HelpBrowser"
+msgid "Backspace"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Chad"
+#: helpbrowser.ui:498
+msgctxt "HelpBrowser"
+msgid "Forward"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Chile"
+#: helpbrowser.ui:501
+msgctxt "HelpBrowser"
+msgid "Move to next page (Shift+Backspace)"
msgstr ""
-msgctxt "CountryInfo"
-msgid "China"
+#: helpbrowser.ui:504
+msgctxt "HelpBrowser"
+msgid "Shift+Backspace"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Colombia"
+#: helpbrowser.ui:512
+msgctxt "HelpBrowser"
+msgid "Home"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Comoros"
+#: helpbrowser.ui:515
+msgctxt "HelpBrowser"
+msgid "Move to the Home page (Ctrl+H)"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Congo, The Democratic Republic of the"
+#: helpbrowser.ui:518
+msgctxt "HelpBrowser"
+msgid "Ctrl+H"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Congo"
+#: helpbrowser.ui:535
+msgctxt "HelpBrowser"
+msgid "Find"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Costa Rica"
+#: helpbrowser.ui:538
+msgctxt "HelpBrowser"
+msgid "Search for a word or phrase on current page (Ctrl+F)"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Cote d’Ivoire"
+#: helpbrowser.ui:541
+msgctxt "HelpBrowser"
+msgid "Ctrl+F"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Croatia"
+#: helpbrowser.ui:549
+msgctxt "HelpBrowser"
+msgid "Close"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Cuba"
+#: helpbrowser.ui:552
+msgctxt "HelpBrowser"
+msgid "Close Vidalia Help"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Cyprus"
+#: helpbrowser.ui:555
+msgctxt "HelpBrowser"
+msgid "Esc"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Czech Republic"
+#: helpbrowser.ui:152
+msgctxt "HelpBrowser"
+msgid "Find:"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Denmark"
+#: helpbrowser.ui:174
+msgctxt "HelpBrowser"
+msgid "Find Previous"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Djibouti"
+#: helpbrowser.ui:187
+msgctxt "HelpBrowser"
+msgid "Find Next"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Dominica"
+#: helpbrowser.ui:221
+msgctxt "HelpBrowser"
+msgid "Case sensitive"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Dominican Republic"
+#: helpbrowser.ui:231
+msgctxt "HelpBrowser"
+msgid "Whole words only"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Ecuador"
+#: helpbrowser.ui:305
+msgctxt "HelpBrowser"
+msgid "Help Topics"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Egypt"
+#: helpbrowser.ui:260
+msgctxt "HelpBrowser"
+msgid "Contents"
msgstr ""
-msgctxt "CountryInfo"
-msgid "El Salvador"
+#: helpbrowser.ui:350
+msgctxt "HelpBrowser"
+msgid "Search"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Equatorial Guinea"
+#: helpbrowser.ui:362
+msgctxt "HelpBrowser"
+msgid "Searching for:"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Eritrea"
+#: helpbrowser.ui:405
+msgctxt "HelpBrowser"
+msgid "Found Documents"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Estonia"
+#: helptextbrowser.cpp:54
+msgctxt "HelpTextBrowser"
+msgid "Error opening help file: "
msgstr ""
-msgctxt "CountryInfo"
-msgid "France"
+#: helptextbrowser.cpp:72
+msgctxt "HelpTextBrowser"
+msgid "Opening External Link"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Gabon"
+#: 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."
msgstr ""
-msgctxt "CountryInfo"
-msgid "Gambia"
+#: helptextbrowser.cpp:78
+msgctxt "HelpTextBrowser"
+msgid "Do you want Vidalia to open the link in your Web browser?"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Georgia"
+#: helptextbrowser.cpp:88
+msgctxt "HelpTextBrowser"
+msgid "Unable to Open Link"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Germany"
+#: helptextbrowser.cpp:90
+msgctxt "HelpTextBrowser"
+msgid "Vidalia was unable to open the selected link in your Web browser. You can still copy the URL and paste it into your browser."
msgstr ""
-msgctxt "CountryInfo"
-msgid "Ghana"
+#: licensedialog.ui:13
+msgctxt "LicenseDialog"
+msgid "License Information"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Grenada"
+#: licensedialog.ui:43
+msgctxt "LicenseDialog"
+msgid "License"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Guatemala"
+#: licensedialog.ui:76
+msgctxt "LicenseDialog"
+msgid "Credits"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Guinea"
+#: logevent.cpp:57
+msgctxt "LogEvent"
+msgid "Debug"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Guinea-Bissau"
+#: logevent.cpp:58
+msgctxt "LogEvent"
+msgid "Info"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Guyana"
+#: logevent.cpp:59
+msgctxt "LogEvent"
+msgid "Notice"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Hong Kong"
+#: logevent.cpp:60
+msgctxt "LogEvent"
+msgid "Warning"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Haiti"
+#: logevent.cpp:61
+msgctxt "LogEvent"
+msgid "Error"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Honduras"
+#: logevent.cpp:62
+msgctxt "LogEvent"
+msgid "Unknown"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Israel"
+#: mainwindow.ui:233
+msgctxt "MainWindow"
+msgid "Start Tor"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Italy"
+#: mainwindow.ui:443
+msgctxt "MainWindow"
+msgid "Exit"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Jamaica"
+#: mainwindow.ui:304
+msgctxt "MainWindow"
+msgid "Bandwidth Graph"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Japan"
+#: mainwindow.ui:317
+msgctxt "MainWindow"
+msgid "Message Log"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Jordan"
+#: mainwindow.cpp:348
+msgctxt "MainWindow"
+msgid "Network Map"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Kazakhstan"
+#: mainwindow.cpp:354
+msgctxt "MainWindow"
+msgid "Control Panel"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Kenya"
+#: mainwindow.ui:380
+msgctxt "MainWindow"
+msgid "Settings"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Kiribati"
+#: mainwindow.ui:430
+msgctxt "MainWindow"
+msgid "About"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Kuwait"
+#: mainwindow.ui:367
+msgctxt "MainWindow"
+msgid "Help"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Kyrgyzstan"
+#: mainwindow.cpp:1391
+msgctxt "MainWindow"
+msgid "New Identity"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Laos"
+#: mainwindow.cpp:437
+msgctxt "MainWindow"
+msgid "Ctrl+T"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Latvia"
+#: mainwindow.cpp:438
+msgctxt "MainWindow"
+msgid "Ctrl+B"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Lebanon"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Lesotho"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Liberia"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Liechtenstein"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Lithuania"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Luxembourg"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Macedonia"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Madagascar"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Malawi"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Malaysia"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Mali"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Malta"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Marshall Islands"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Mauritania"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Mauritius"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Micronesia"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Moldova"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Monaco"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Mongolia"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Montenegro"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Morocco"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Mozambique"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Namibia"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Nauru"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Nepal"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Netherlands"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "New Zealand"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Nicaragua"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Niger"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Nigeria"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Norway"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Oman"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Pakistan"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Palau"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Palestine"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Panama"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Papua New Guinea"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Paraguay"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Peru"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Philippines"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Poland"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Portugal"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Qatar"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Romania"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Russia"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Rwanda"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Saint Kitts & Nevis"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Saint Lucia"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Saint Vincent & the Grenadines"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Samoa"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "San Marino"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Sao Tome & Principe"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Saudi Arabia"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Senegal"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Serbia"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Seychelles"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Sierra Leone"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Singapore"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Slovakia"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Slovenia"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Solomon Islands"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Somalia"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "South Africa"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Spain"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Sri Lanka"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Sudan"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Suriname"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Swaziland"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Sweden"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Switzerland"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Syria"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Tajikistan"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Tanzania"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Thailand"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Timor-Leste (East Timor)"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Togo"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Tonga"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Trinidad & Tobago"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Tunisia"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Turkey"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Turkmenistan"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Tuvalu"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Uganda"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Ukraine"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "United Arab Emirates"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "United Kingdom"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "United States"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Uruguay"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Uzbekistan"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Vanuatu"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Vatican"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Venezuela"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Vietnam"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Western Sahara"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Yemen"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Zambia"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Zimbabwe"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Zaire"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Albania"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Algeria"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Austria"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Bahrain"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Benin"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Ethiopia"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Fiji"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Finland"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Greece"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Guam"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Hungary"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Iceland"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "India"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Indonesia"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Iran"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Iraq"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Ireland"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Korea, North"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Korea, South"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Libya"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Maldives"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Mexico"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Myanmar"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Taiwan"
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid "Submit a Crash Report"
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid "Vidalia encountered an error and needed to close"
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid "Restart Vidalia"
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid "Don't Restart"
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid "Unable to restart Vidalia"
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid ""
-"We were unable to automatically restart Vidalia. Please restart Vidalia "
-"manually."
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid "Please fill a ticket in:"
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid ""
-"<a "
-"href=\"https://trac.torproject.org/projects/tor/newticket\">https://trac.torproject.org/projects/tor/newticket</a>"
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid ""
-"A crash report has been created that you can send to the Vidalia developers "
-"to help identify and fix the problem. The submitted report does not contain "
-"any personally identifying information."
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid ""
-"with a description of what you were doing before the application crashed, "
-"along with the following files corresponding to the crash report:"
-msgstr ""
-
-msgctxt "GeneralPage"
-msgid "Executables (*.exe)"
-msgstr ""
-
-msgctxt "GeneralPage"
-msgid "Select Path to Tor"
-msgstr ""
-
-msgctxt "GeneralPage"
-msgid "Select Proxy Executable"
-msgstr ""
-
-msgctxt "GeneralPage"
-msgid "You must specify the name of your Tor executable."
-msgstr ""
-
-msgctxt "GeneralPage"
-msgid "Start Vidalia when my system starts"
-msgstr ""
-
-msgctxt "GeneralPage"
-msgid "Browse"
-msgstr ""
-
-msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr ""
-
-msgctxt "GeneralPage"
-msgid "Tor"
-msgstr ""
-
-msgctxt "GeneralPage"
-msgid "Proxy Application (optional)"
-msgstr ""
-
-msgctxt "GeneralPage"
-msgid "Start a proxy application when Tor starts"
-msgstr ""
-
-msgctxt "GeneralPage"
-msgid "Proxy Application Arguments:"
-msgstr ""
-
-msgctxt "GeneralPage"
-msgid "Software Updates"
-msgstr ""
-
-msgctxt "GeneralPage"
-msgid "Check for new software updates automatically"
-msgstr ""
-
-msgctxt "GeneralPage"
-msgid "Check Now"
-msgstr ""
-
-msgctxt "GraphFrame"
-msgid "%1 KB/s"
-msgstr ""
-
-msgctxt "GraphFrame"
-msgid "%1 KB"
-msgstr ""
-
-msgctxt "GraphFrame"
-msgid "%1 MB"
-msgstr ""
-
-msgctxt "GraphFrame"
-msgid "%1 GB"
-msgstr ""
-
-msgctxt "GraphFrame"
-msgid "Recv:"
-msgstr ""
-
-msgctxt "GraphFrame"
-msgid "Sent:"
-msgstr ""
-
-msgctxt "HelpBrowser"
-msgid "Supplied XML file is not a valid Contents document."
-msgstr ""
-
-msgctxt "HelpBrowser"
-msgid "Search reached end of document"
-msgstr ""
-
-msgctxt "HelpBrowser"
-msgid "Search reached start of document"
-msgstr ""
-
-msgctxt "HelpBrowser"
-msgid "Text not found in document"
-msgstr ""
-
-msgctxt "HelpBrowser"
-msgid "Found %1 results"
-msgstr ""
-
-msgctxt "HelpBrowser"
-msgid "Vidalia Help"
-msgstr ""
-
-msgctxt "HelpBrowser"
-msgid "Back"
-msgstr ""
-
-msgctxt "HelpBrowser"
-msgid "Move to previous page (Backspace)"
-msgstr ""
-
-msgctxt "HelpBrowser"
-msgid "Backspace"
-msgstr ""
-
-msgctxt "HelpBrowser"
-msgid "Forward"
-msgstr ""
-
-msgctxt "HelpBrowser"
-msgid "Move to next page (Shift+Backspace)"
-msgstr ""
-
-msgctxt "HelpBrowser"
-msgid "Shift+Backspace"
-msgstr ""
-
-msgctxt "HelpBrowser"
-msgid "Home"
-msgstr ""
-
-msgctxt "HelpBrowser"
-msgid "Move to the Home page (Ctrl+H)"
-msgstr ""
-
-msgctxt "HelpBrowser"
-msgid "Ctrl+H"
-msgstr ""
-
-msgctxt "HelpBrowser"
-msgid "Find"
-msgstr ""
-
-msgctxt "HelpBrowser"
-msgid "Search for a word or phrase on current page (Ctrl+F)"
-msgstr ""
-
-msgctxt "HelpBrowser"
-msgid "Ctrl+F"
-msgstr ""
-
-msgctxt "HelpBrowser"
-msgid "Close"
-msgstr ""
-
-msgctxt "HelpBrowser"
-msgid "Close Vidalia Help"
-msgstr ""
-
-msgctxt "HelpBrowser"
-msgid "Esc"
-msgstr ""
-
-msgctxt "HelpBrowser"
-msgid "Find:"
-msgstr ""
-
-msgctxt "HelpBrowser"
-msgid "Find Previous"
-msgstr ""
-
-msgctxt "HelpBrowser"
-msgid "Find Next"
-msgstr ""
-
-msgctxt "HelpBrowser"
-msgid "Case sensitive"
-msgstr ""
-
-msgctxt "HelpBrowser"
-msgid "Whole words only"
-msgstr ""
-
-msgctxt "HelpBrowser"
-msgid "Help Topics"
-msgstr ""
-
-msgctxt "HelpBrowser"
-msgid "Contents"
-msgstr ""
-
-msgctxt "HelpBrowser"
-msgid "Search"
-msgstr ""
-
-msgctxt "HelpBrowser"
-msgid "Searching for:"
-msgstr ""
-
-msgctxt "HelpBrowser"
-msgid "Found Documents"
-msgstr ""
-
-msgctxt "HelpBrowser"
-msgid "Error Loading Help Contents:"
-msgstr ""
-
-msgctxt "HelpTextBrowser"
-msgid "Opening External Link"
-msgstr ""
-
-msgctxt "HelpTextBrowser"
-msgid ""
-"Vidalia can open the link you selected in your default Web browser. If your "
-"browser is not currently configured to use Tor then the request will not be "
-"anonymous."
-msgstr ""
-
-msgctxt "HelpTextBrowser"
-msgid "Do you want Vidalia to open the link in your Web browser?"
-msgstr ""
-
-msgctxt "HelpTextBrowser"
-msgid "Unable to Open Link"
-msgstr ""
-
-msgctxt "HelpTextBrowser"
-msgid ""
-"Vidalia was unable to open the selected link in your Web browser. You can "
-"still copy the URL and paste it into your browser."
-msgstr ""
-
-msgctxt "HelpTextBrowser"
-msgid "Error opening help file:"
-msgstr ""
-
-msgctxt "LicenseDialog"
-msgid "License Information"
-msgstr ""
-
-msgctxt "LicenseDialog"
-msgid "License"
-msgstr ""
-
-msgctxt "LicenseDialog"
-msgid "Credits"
-msgstr ""
-
-msgctxt "LogEvent"
-msgid "Debug"
-msgstr ""
-
-msgctxt "LogEvent"
-msgid "Info"
-msgstr ""
-
-msgctxt "LogEvent"
-msgid "Notice"
-msgstr ""
-
-msgctxt "LogEvent"
-msgid "Warning"
-msgstr ""
-
-msgctxt "LogEvent"
-msgid "Error"
-msgstr ""
-
-msgctxt "LogEvent"
-msgid "Unknown"
-msgstr ""
-
-msgctxt "LogTreeItem"
-msgid "Debug"
-msgstr ""
-
-msgctxt "LogTreeItem"
-msgid "Info"
-msgstr ""
-
-msgctxt "LogTreeItem"
-msgid "Notice"
-msgstr ""
-
-msgctxt "LogTreeItem"
-msgid "Warning"
-msgstr ""
-
-msgctxt "LogTreeItem"
-msgid "Error"
-msgstr ""
-
-msgctxt "LogTreeItem"
-msgid "Unknown"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Start Tor"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Exit"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Bandwidth Graph"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Message Log"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Network Map"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Control Panel"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Settings"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "About"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Help"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "New Identity"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+T"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+B"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+L"
+#: mainwindow.cpp:439
+msgctxt "MainWindow"
+msgid "Ctrl+L"
msgstr ""
+#: mainwindow.cpp:440
msgctxt "MainWindow"
msgid "Ctrl+N"
msgstr ""
+#: mainwindow.cpp:441
msgctxt "MainWindow"
msgid "Ctrl+?"
msgstr ""
+#: mainwindow.cpp:442
msgctxt "MainWindow"
msgid "Ctrl+I"
msgstr ""
+#: mainwindow.cpp:443
msgctxt "MainWindow"
msgid "Ctrl+P"
msgstr ""
+#: mainwindow.cpp:463
msgctxt "MainWindow"
msgid "Tor"
msgstr ""
+#: mainwindow.cpp:468
msgctxt "MainWindow"
msgid "View"
msgstr ""
+#: mainwindow.cpp:476
msgctxt "MainWindow"
msgid "Vidalia Help"
msgstr ""
+#: mainwindow.cpp:527
msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
+#: mainwindow.cpp:528
msgctxt "MainWindow"
msgid "Vidalia was unable to start the configured web browser"
msgstr ""
+#: mainwindow.cpp:540
msgctxt "MainWindow"
msgid "Error starting IM client"
msgstr ""
+#: mainwindow.cpp:541
msgctxt "MainWindow"
msgid "Vidalia was unable to start the configured IM client"
msgstr ""
+#: mainwindow.cpp:562
msgctxt "MainWindow"
msgid "Error starting proxy server"
msgstr ""
+#: mainwindow.cpp:563
msgctxt "MainWindow"
msgid "Vidalia was unable to start the configured proxy server"
msgstr ""
+#: mainwindow.cpp:579
msgctxt "MainWindow"
msgid "Connecting to a relay directory"
msgstr ""
+#: mainwindow.cpp:583
msgctxt "MainWindow"
msgid "Establishing an encrypted directory connection"
msgstr ""
+#: mainwindow.cpp:586
msgctxt "MainWindow"
msgid "Retrieving network status"
msgstr ""
+#: mainwindow.cpp:589
msgctxt "MainWindow"
msgid "Loading network status"
msgstr ""
+#: mainwindow.cpp:592
msgctxt "MainWindow"
msgid "Loading authority certificates"
msgstr ""
+#: mainwindow.cpp:595
msgctxt "MainWindow"
msgid "Requesting relay information"
msgstr ""
+#: mainwindow.cpp:598
msgctxt "MainWindow"
msgid "Loading relay information"
msgstr ""
+#: mainwindow.cpp:1132
msgctxt "MainWindow"
msgid "Connecting to the Tor network"
msgstr ""
+#: mainwindow.cpp:605
msgctxt "MainWindow"
msgid "Establishing a Tor circuit"
msgstr ""
+#: mainwindow.cpp:1297
msgctxt "MainWindow"
msgid "Connected to the Tor network!"
msgstr ""
+#: mainwindow.cpp:612
msgctxt "MainWindow"
msgid "Unrecognized startup status"
msgstr ""
+#: mainwindow.cpp:619
msgctxt "MainWindow"
msgid "miscellaneous"
msgstr ""
+#: mainwindow.cpp:622
msgctxt "MainWindow"
msgid "identity mismatch"
msgstr ""
+#: mainwindow.cpp:625
msgctxt "MainWindow"
msgid "done"
msgstr ""
+#: mainwindow.cpp:628
msgctxt "MainWindow"
msgid "connection refused"
msgstr ""
+#: mainwindow.cpp:631
msgctxt "MainWindow"
msgid "connection timeout"
msgstr ""
+#: mainwindow.cpp:634
msgctxt "MainWindow"
msgid "read/write error"
msgstr ""
+#: mainwindow.cpp:637
msgctxt "MainWindow"
msgid "no route to host"
msgstr ""
+#: mainwindow.cpp:640
msgctxt "MainWindow"
msgid "insufficient resources"
msgstr ""
+#: mainwindow.cpp:643
msgctxt "MainWindow"
msgid "unknown"
msgstr ""
+#: mainwindow.cpp:645
+msgctxt "MainWindow"
+msgid " failed (%1)"
+msgstr ""
+
+#: mainwindow.ui:168
msgctxt "MainWindow"
msgid "Tor is not running"
msgstr ""
+#: mainwindow.cpp:686
+msgctxt "MainWindow"
+msgid "Your relay is shutting down."
+"Click 'Stop' again to stop your relay now."
+msgstr ""
+
+#: mainwindow.cpp:688
msgctxt "MainWindow"
msgid "Tor is shutting down"
msgstr ""
+#: mainwindow.cpp:693
msgctxt "MainWindow"
msgid "Stop Tor Now"
msgstr ""
+#: mainwindow.cpp:695
msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
+#: mainwindow.cpp:711
msgctxt "MainWindow"
msgid "Starting the Tor software"
msgstr ""
+#: mainwindow.ui:75
msgctxt "MainWindow"
msgid "Starting Tor"
msgstr ""
+#: mainwindow.cpp:859
msgctxt "MainWindow"
msgid "Error Starting Tor"
msgstr ""
+#: mainwindow.cpp:862
msgctxt "MainWindow"
-msgid ""
-"Vidalia was unable to start Tor. Check your settings to ensure the correct "
-"name and location of your Tor executable is specified."
+msgid "Vidalia was unable to start Tor. Check your settings to ensure the correct name and location of your Tor executable is specified."
msgstr ""
+#: mainwindow.cpp:896
msgctxt "MainWindow"
msgid "Connecting to Tor"
msgstr ""
+#: mainwindow.cpp:906
msgctxt "MainWindow"
msgid "Connection Error"
msgstr ""
+#: mainwindow.cpp:938
msgctxt "MainWindow"
msgid "Relaying is Enabled"
msgstr ""
+#: mainwindow.cpp:943
+msgctxt "MainWindow"
+msgid "You are currently running a relay. Terminating your relay will interrupt any open connections from clients."
+""
+"Would you like to shutdown gracefully and give clients time to find a new relay?"
+msgstr ""
+
+#: mainwindow.cpp:965
msgctxt "MainWindow"
msgid "Error Shutting Down"
msgstr ""
+#: mainwindow.cpp:966
msgctxt "MainWindow"
msgid "Vidalia was unable to stop the Tor software."
msgstr ""
+#: mainwindow.cpp:997
msgctxt "MainWindow"
msgid "Unexpected Error"
msgstr ""
+#: mainwindow.cpp:1001
+msgctxt "MainWindow"
+msgid "Vidalia detected that the Tor software exited unexpectedly."
+""
+"Please check the message log for recent warning or error messages."
+msgstr ""
+
+#: mainwindow.cpp:1055
msgctxt "MainWindow"
msgid "Authenticating to Tor"
msgstr ""
+#: mainwindow.cpp:1075
msgctxt "MainWindow"
msgid "Cookie Authentication Required"
msgstr ""
+#: mainwindow.cpp:1078
msgctxt "MainWindow"
-msgid ""
-"The Tor software requires Vidalia to send the contents of an authentication "
-"cookie, but Vidalia was unable to find one."
+msgid "The Tor software requires Vidalia to send the contents of an authentication cookie, but Vidalia was unable to find one."
msgstr ""
+#: mainwindow.cpp:1080
msgctxt "MainWindow"
msgid "Would you like to browse for the file 'control_auth_cookie' yourself?"
msgstr ""
+#: mainwindow.cpp:1087
msgctxt "MainWindow"
msgid "Data Directory"
msgstr ""
+#: mainwindow.cpp:1089
msgctxt "MainWindow"
msgid "Control Cookie (control_auth_cookie)"
msgstr ""
+#: mainwindow.cpp:1141
msgctxt "MainWindow"
msgid "Error Registering for Events"
msgstr ""
+#: mainwindow.cpp:1143
msgctxt "MainWindow"
-msgid ""
-"Vidalia was unable to register for some events. Many of Vidalia's features "
-"may be unavailable."
+msgid "Vidalia was unable to register for some events. Many of Vidalia's features may be unavailable."
msgstr ""
+#: mainwindow.cpp:1222
msgctxt "MainWindow"
msgid "Authentication Error"
msgstr ""
+#: mainwindow.cpp:1224
msgctxt "MainWindow"
msgid "Vidalia was unable to authenticate to the Tor software. (%1)"
msgstr ""
+#: mainwindow.cpp:1226
msgctxt "MainWindow"
msgid "Please check your control port authentication settings."
msgstr ""
+#: mainwindow.cpp:1330
msgctxt "MainWindow"
msgid "Tor Update Available"
msgstr ""
+#: mainwindow.cpp:1333
msgctxt "MainWindow"
-msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended. Please visit the Tor website to download the latest version."
+msgid "The currently installed version of Tor is out of date or no longer recommended. Please visit the Tor website to download the latest version."
msgstr ""
+#: mainwindow.cpp:1333
msgctxt "MainWindow"
msgid "Tor website: %1"
msgstr ""
+#: mainwindow.cpp:1394
msgctxt "MainWindow"
-msgid ""
-"All subsequent connections will appear to be different than your old "
-"connections."
+msgid "All subsequent connections will appear to be different than your old connections."
msgstr ""
+#: mainwindow.cpp:1409
msgctxt "MainWindow"
msgid "Failed to Create New Identity"
msgstr ""
+#: mainwindow.cpp:1458
msgctxt "MainWindow"
msgid "Port Forwarding Failed"
msgstr ""
+#: mainwindow.cpp:1459
msgctxt "MainWindow"
msgid "Vidalia was unable to configure automatic port forwarding."
msgstr ""
+#: mainwindow.ui:19
msgctxt "MainWindow"
msgid "Vidalia Control Panel"
msgstr ""
+#: mainwindow.ui:49
msgctxt "MainWindow"
msgid "Status"
msgstr ""
+#: mainwindow.ui:218
msgctxt "MainWindow"
msgid "Vidalia Shortcuts"
msgstr ""
+#: mainwindow.ui:243
msgctxt "MainWindow"
msgid "Setup Relaying"
msgstr ""
+#: mainwindow.ui:246
msgctxt "MainWindow"
msgid "Set up a relay and help the network grow"
msgstr ""
+#: mainwindow.ui:256
msgctxt "MainWindow"
msgid "View the Network"
msgstr ""
+#: mainwindow.ui:259
msgctxt "MainWindow"
msgid "View a map of the Tor network"
msgstr ""
+#: mainwindow.ui:272
msgctxt "MainWindow"
msgid "Use a New Identity"
msgstr ""
+#: mainwindow.ui:275
msgctxt "MainWindow"
msgid "Make subsequent connections appear new"
msgstr ""
+#: mainwindow.ui:307
msgctxt "MainWindow"
msgid "View recent bandwidth usage"
msgstr ""
+#: mainwindow.ui:320
msgctxt "MainWindow"
-msgid "View log message history"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "View help documentation"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Configure Vidalia"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "View version and license information"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Exit Vidalia"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Show this window on startup"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Hide"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Hide this window"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Password Reset Failed"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid ""
-"Vidalia tried to reset Tor's control password, but was not able to restart "
-"the Tor software. Please check your Task Manager to ensure there are no "
-"other Tor processes running."
-msgstr ""
-
-msgctxt "MainWindow"
-msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended."
-msgstr ""
-
-msgctxt "MainWindow"
-msgid ""
-"Would you like to check if a newer package is available for installation?"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Potentially Unsafe Connection"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid ""
-"Tor has automatically closed your connection in order to protect your "
-"anonymity."
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Update Failed"
+msgid "View log message history"
msgstr ""
+#: mainwindow.ui:370
msgctxt "MainWindow"
-msgid "Your software is up to date"
+msgid "View help documentation"
msgstr ""
+#: mainwindow.ui:383
msgctxt "MainWindow"
-msgid ""
-"There are no new Tor software packages available for your computer at this "
-"time."
+msgid "Configure Vidalia"
msgstr ""
+#: mainwindow.ui:433
msgctxt "MainWindow"
-msgid "Installation Failed"
+msgid "View version and license information"
msgstr ""
+#: mainwindow.ui:446
msgctxt "MainWindow"
-msgid "Vidalia was unable to install your software updates."
+msgid "Exit Vidalia"
msgstr ""
+#: mainwindow.ui:498
msgctxt "MainWindow"
-msgid "The following error occurred:"
+msgid "Show this window on startup"
msgstr ""
+#: mainwindow.ui:517
msgctxt "MainWindow"
-msgid ""
-"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 "Hide"
msgstr ""
+#: mainwindow.ui:520
msgctxt "MainWindow"
-msgid "failed (%1)"
+msgid "Hide this window"
msgstr ""
+#: mainwindow.cpp:1210
msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+msgid "Password Reset Failed"
msgstr ""
+#: mainwindow.cpp:1213
msgctxt "MainWindow"
-msgid "Bootstrapping torrc from %1 to %2"
+msgid "Vidalia tried to reset Tor's control 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 ""
-"You are currently running a relay. Terminating your relay 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 ""
-msgctxt "MainWindow"
-msgid "(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)"
+#: 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."
+#: 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 ""
+#: messagelog.cpp:190
msgctxt "MessageLog"
msgid "Vidalia was unable to register for Tor's log events."
msgstr ""
+#: messagelog.cpp:205
msgctxt "MessageLog"
msgid "Error Opening Log File"
msgstr ""
+#: messagelog.cpp:206
msgctxt "MessageLog"
msgid "Vidalia was unable to open the specified log file."
msgstr ""
+#: messagelog.cpp:227
msgctxt "MessageLog"
msgid "Log Filename Required"
msgstr ""
+#: messagelog.cpp:229
msgctxt "MessageLog"
msgid "You must enter a filename to be able to save log messages to a file."
msgstr ""
+#: messagelog.cpp:280
msgctxt "MessageLog"
msgid "Select Log File"
msgstr ""
+#: messagelog.cpp:297
msgctxt "MessageLog"
msgid "Save Log Messages"
msgstr ""
+#: messagelog.cpp:300
msgctxt "MessageLog"
msgid "Text Files (*.txt)"
msgstr ""
+#: messagelog.cpp:309
msgctxt "MessageLog"
msgid "Vidalia"
msgstr ""
+#: messagelog.cpp:310
+msgctxt "MessageLog"
+msgid "Cannot write file %1"
+""
+"%2."
+msgstr ""
+
+#: messagelog.cpp:360
msgctxt "MessageLog"
msgid "Find in Message Log"
msgstr ""
+#: messagelog.cpp:361
msgctxt "MessageLog"
msgid "Find:"
msgstr ""
+#: messagelog.cpp:367
msgctxt "MessageLog"
msgid "Not Found"
msgstr ""
+#: messagelog.cpp:368
msgctxt "MessageLog"
msgid "Search found 0 matches."
msgstr ""
+#: messagelog.ui:19
msgctxt "MessageLog"
msgid "Message Log"
msgstr ""
+#: messagelog.ui:452
msgctxt "MessageLog"
msgid "Message Filters..."
msgstr ""
+#: messagelog.ui:455
msgctxt "MessageLog"
msgid "Set message filters"
msgstr ""
+#: messagelog.ui:463
msgctxt "MessageLog"
msgid "History Size..."
msgstr ""
+#: messagelog.ui:466
msgctxt "MessageLog"
msgid "Set maximum number of messages to display"
msgstr ""
+#: messagelog.ui:477
msgctxt "MessageLog"
msgid "Clear"
msgstr ""
+#: messagelog.ui:480
msgctxt "MessageLog"
msgid "Clear all messages from the Message Log (Ctrl+E)"
msgstr ""
+#: messagelog.ui:483
msgctxt "MessageLog"
msgid "Ctrl+E"
msgstr ""
+#: messagelog.ui:497
msgctxt "MessageLog"
msgid "Copy"
msgstr ""
+#: messagelog.ui:500
msgctxt "MessageLog"
msgid "Copy the selected messages to the clipboard (Ctrl+C)"
msgstr ""
+#: messagelog.ui:503
msgctxt "MessageLog"
msgid "Ctrl+C"
msgstr ""
+#: messagelog.ui:514
msgctxt "MessageLog"
msgid "Select All"
msgstr ""
+#: messagelog.ui:517
msgctxt "MessageLog"
msgid "Select all messages (Ctrl+A)"
msgstr ""
+#: messagelog.ui:520
msgctxt "MessageLog"
msgid "Ctrl+A"
msgstr ""
+#: messagelog.ui:528
msgctxt "MessageLog"
msgid "Save All"
msgstr ""
+#: messagelog.ui:531
msgctxt "MessageLog"
msgid "Save all messages to a file"
msgstr ""
+#: messagelog.ui:539
msgctxt "MessageLog"
msgid "Save Selected"
msgstr ""
+#: messagelog.ui:542
msgctxt "MessageLog"
msgid "Save selected messages to a file"
msgstr ""
+#: messagelog.ui:553
msgctxt "MessageLog"
msgid "Settings"
msgstr ""
+#: messagelog.ui:556
msgctxt "MessageLog"
msgid "Adjust Message Log Settings"
msgstr ""
+#: messagelog.ui:559
msgctxt "MessageLog"
msgid "Ctrl+T"
msgstr ""
+#: messagelog.ui:567
msgctxt "MessageLog"
msgid "Help"
msgstr ""
+#: messagelog.ui:570
msgctxt "MessageLog"
msgid "Show the help browser"
msgstr ""
+#: messagelog.ui:573
msgctxt "MessageLog"
msgid "F1"
msgstr ""
+#: messagelog.ui:581
msgctxt "MessageLog"
msgid "Close"
msgstr ""
+#: messagelog.ui:584
msgctxt "MessageLog"
msgid "Close the Message Log"
msgstr ""
+#: messagelog.ui:587
msgctxt "MessageLog"
msgid "Esc"
msgstr ""
+#: messagelog.ui:598
msgctxt "MessageLog"
msgid "Find"
msgstr ""
+#: messagelog.ui:601
msgctxt "MessageLog"
msgid "Find all messages containing the search text (Ctrl+F)"
msgstr ""
+#: messagelog.ui:604
msgctxt "MessageLog"
msgid "Ctrl+F"
msgstr ""
+#: messagelog.ui:66
msgctxt "MessageLog"
msgid "Time"
msgstr ""
+#: messagelog.ui:71
msgctxt "MessageLog"
msgid "Type"
msgstr ""
+#: messagelog.ui:76
msgctxt "MessageLog"
msgid "Message"
msgstr ""
+#: messagelog.ui:160
msgctxt "MessageLog"
msgid "Saves the current Message Log settings"
msgstr ""
+#: messagelog.ui:163
msgctxt "MessageLog"
msgid "Save Settings"
msgstr ""
+#: messagelog.ui:179
msgctxt "MessageLog"
msgid "Cancels changes made to settings"
msgstr ""
+#: messagelog.ui:182
msgctxt "MessageLog"
msgid "Cancel"
msgstr ""
+#: messagelog.ui:196
msgctxt "MessageLog"
msgid "Message Filter"
msgstr ""
+#: messagelog.ui:217
msgctxt "MessageLog"
msgid "Error"
msgstr ""
+#: messagelog.ui:233
msgctxt "MessageLog"
msgid "Warning"
msgstr ""
+#: messagelog.ui:249
msgctxt "MessageLog"
msgid "Notice"
msgstr ""
+#: messagelog.ui:265
msgctxt "MessageLog"
msgid "Info"
msgstr ""
+#: messagelog.ui:281
msgctxt "MessageLog"
msgid "Debug"
msgstr ""
+#: messagelog.ui:297
msgctxt "MessageLog"
msgid "Message Log History"
msgstr ""
+#: messagelog.ui:318
msgctxt "MessageLog"
msgid "Number of messages to display in the message log window"
msgstr ""
+#: messagelog.ui:337
msgctxt "MessageLog"
msgid "messages"
msgstr ""
-msgctxt "MessageLog"
-msgid "Browse"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Enable automatically saving all new log messages to a file"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Automatically save new log messages to a file"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Basic"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Tor Status"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Advanced"
-msgstr ""
-
+#: messagelog.ui:356
msgctxt "MessageLog"
msgid "Always Save New Log Messages"
msgstr ""
+#: messagelog.ui:371
msgctxt "MessageLog"
-msgid ""
-"Messages that appear when something has \n"
-"gone very wrong and Tor cannot proceed."
-msgstr ""
-
-msgctxt "MessageLog"
-msgid ""
-"Messages that only appear when \n"
-"something has gone wrong with Tor."
-msgstr ""
-
-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 ""
-
-msgctxt "MessageLog"
-msgid ""
-"Messages that appear frequently \n"
-"during normal Tor operation."
+msgid "Browse"
msgstr ""
+#: messagelog.ui:394
msgctxt "MessageLog"
-msgid ""
-"Hyper-verbose messages primarily of \n"
-"interest to Tor developers."
+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 ""
+#: netviewer.ui:24
msgctxt "NetViewer"
msgid "Tor Network Map"
msgstr ""
+#: netviewer.ui:239
msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
+#: netviewer.ui:245
msgctxt "NetViewer"
msgid "Refresh the list of Tor relays and connections"
msgstr ""
+#: netviewer.ui:248
msgctxt "NetViewer"
msgid "Ctrl+R"
msgstr ""
+#: netviewer.ui:256
msgctxt "NetViewer"
msgid "Help"
msgstr ""
+#: netviewer.ui:259
msgctxt "NetViewer"
msgid "Show the network map help"
msgstr ""
+#: netviewer.ui:262
msgctxt "NetViewer"
msgid "Show network map help"
msgstr ""
+#: netviewer.ui:265
msgctxt "NetViewer"
msgid "F1"
msgstr ""
+#: netviewer.ui:273
msgctxt "NetViewer"
msgid "Close"
msgstr ""
+#: netviewer.ui:279
msgctxt "NetViewer"
msgid "Close the network map"
msgstr ""
+#: netviewer.ui:282
msgctxt "NetViewer"
msgid "Esc"
msgstr ""
+#: netviewer.ui:290
msgctxt "NetViewer"
msgid "Zoom In"
msgstr ""
+#: netviewer.ui:296
msgctxt "NetViewer"
msgid "Zoom in on the network map"
msgstr ""
+#: netviewer.ui:299
msgctxt "NetViewer"
msgid "+"
msgstr ""
+#: netviewer.ui:307
msgctxt "NetViewer"
msgid "Zoom Out"
msgstr ""
+#: netviewer.ui:313
msgctxt "NetViewer"
msgid "Zoom out on the network map"
msgstr ""
+#: netviewer.ui:316
msgctxt "NetViewer"
msgid "-"
msgstr ""
+#: netviewer.ui:324
msgctxt "NetViewer"
msgid "Zoom To Fit"
msgstr ""
+#: netviewer.ui:330
msgctxt "NetViewer"
msgid "Zooms to fit all currently displayed circuits"
msgstr ""
+#: netviewer.ui:333
msgctxt "NetViewer"
msgid "Ctrl+Z"
msgstr ""
-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 ""
-
+#: networkpage.cpp:193
msgctxt "NetworkPage"
msgid "Invalid Bridge"
msgstr ""
+#: networkpage.cpp:194
msgctxt "NetworkPage"
msgid "The specified bridge identifier is not valid."
msgstr ""
+#: networkpage.cpp:241
msgctxt "NetworkPage"
msgid "Copy (Ctrl+C)"
msgstr ""
+#: networkpage.cpp:272
msgctxt "NetworkPage"
-msgid ""
-"You must specify both an IP address or hostname and a port number to "
-"configure Tor to use a proxy to access the Internet."
+msgid "You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet."
msgstr ""
+#: networkpage.cpp:278
msgctxt "NetworkPage"
-msgid ""
-"You must specify one or more ports to which your firewall allows you to "
-"connect."
+msgid "You must specify one or more ports to which your firewall allows you to connect."
msgstr ""
+#: networkpage.cpp:314
msgctxt "NetworkPage"
msgid "'%1' is not a valid port number."
msgstr ""
+#: networkpage.ui:25
msgctxt "NetworkPage"
msgid "Check if your local network requires a proxy to access the Internet"
msgstr ""
+#: networkpage.ui:28
msgctxt "NetworkPage"
msgid "I use a proxy to access the Internet"
msgstr ""
+#: networkpage.ui:58
msgctxt "NetworkPage"
msgid "Proxy Settings"
msgstr ""
+#: networkpage.ui:70
+msgctxt "NetworkPage"
+msgid "HTTP Proxy:"
+msgstr ""
+
+#: networkpage.ui:80
msgctxt "NetworkPage"
msgid "Username:"
msgstr ""
+#: networkpage.ui:90
+msgctxt "NetworkPage"
+msgid "Use this proxy for HTTPS also"
+msgstr ""
+
+#: networkpage.ui:108
msgctxt "NetworkPage"
msgid "Password:"
msgstr ""
+#: networkpage.ui:135
msgctxt "NetworkPage"
msgid "Port:"
msgstr ""
+#: networkpage.ui:176
msgctxt "NetworkPage"
msgid "Check to only connect to relays using ports allowed by your firewall"
msgstr ""
+#: networkpage.ui:179
msgctxt "NetworkPage"
msgid "My firewall only lets me connect to certain ports"
msgstr ""
+#: networkpage.ui:203
msgctxt "NetworkPage"
msgid "Firewall Settings"
msgstr ""
+#: networkpage.ui:215
msgctxt "NetworkPage"
msgid "Allowed Ports:"
msgstr ""
+#: networkpage.ui:225
msgctxt "NetworkPage"
msgid "80, 443"
msgstr ""
+#: networkpage.ui:235
msgctxt "NetworkPage"
-msgid ""
-"Check to encrypt directory requests and, optionally, use bridge relays to "
-"access the Tor network"
+msgid "Check to encrypt directory requests and, optionally, use bridge relays to access the Tor network"
msgstr ""
+#: networkpage.ui:238
msgctxt "NetworkPage"
msgid "My ISP blocks connections to the Tor network"
msgstr ""
+#: networkpage.ui:262
msgctxt "NetworkPage"
msgid "Bridge Settings"
msgstr ""
+#: networkpage.ui:274
msgctxt "NetworkPage"
-msgid "Add a Bridge:"
-msgstr ""
-
-msgctxt "NetworkPage"
-msgid "Remove the selected bridges from the list"
-msgstr ""
-
-msgctxt "NetworkPage"
-msgid "Copy the selected bridges to the clipboard"
-msgstr ""
-
-msgctxt "NetworkPage"
-msgid "Find Bridges Now"
-msgstr ""
-
-msgctxt "NetworkPage"
-msgid "<a href=\"bridges.finding\">How else can I find bridges?</a>"
-msgstr ""
-
-msgctxt "NetworkPage"
-msgid "<a href=\"bridges.finding\">How can I find bridges?</a>"
-msgstr ""
-
-msgctxt "NetworkPage"
-msgid ""
-"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:"
+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 "You must select the proxy type."
-msgstr ""
-
-msgctxt "NetworkPage"
-msgid "SOCKS 4"
+msgid "Add a Bridge:"
msgstr ""
+#: networkpage.ui:318
msgctxt "NetworkPage"
-msgid "SOCKS 5"
+msgid "<a href=\"bridges.finding\">How do I find a bridge?</a>"
msgstr ""
+#: networkpage.ui:383
msgctxt "NetworkPage"
-msgid "HTTP"
+msgid "Remove the selected bridges from the list"
msgstr ""
+#: networkpage.ui:399
msgctxt "NetworkPage"
-msgid "HTTP / HTTPS"
+msgid "Copy the selected bridges to the clipboard"
msgstr ""
+#: policy.cpp:167
msgctxt "Policy"
msgid "accept"
msgstr ""
+#: policy.cpp:167
msgctxt "Policy"
msgid "reject"
msgstr ""
+#: routerdescriptor.cpp:76
msgctxt "RouterDescriptor"
msgid "Online"
msgstr ""
+#: routerdescriptor.cpp:78
msgctxt "RouterDescriptor"
msgid "Hibernating"
msgstr ""
+#: routerdescriptor.cpp:80
msgctxt "RouterDescriptor"
msgid "Offline"
msgstr ""
+#: routerdescriptorview.cpp:139
msgctxt "RouterDescriptorView"
msgid "Location:"
msgstr ""
+#: routerdescriptorview.cpp:143
msgctxt "RouterDescriptorView"
msgid "IP Address:"
msgstr ""
+#: routerdescriptorview.cpp:144
msgctxt "RouterDescriptorView"
msgid "Platform:"
msgstr ""
+#: routerdescriptorview.cpp:148
msgctxt "RouterDescriptorView"
msgid "Bandwidth:"
msgstr ""
+#: routerdescriptorview.cpp:150
msgctxt "RouterDescriptorView"
msgid "Uptime:"
msgstr ""
+#: routerdescriptorview.cpp:156
msgctxt "RouterDescriptorView"
msgid "Last Updated:"
msgstr ""
+#: routerdescriptorview.cpp:100
msgctxt "RouterDescriptorView"
-msgid "Copy"
-msgstr ""
-
-msgctxt "RouterInfoDialog"
-msgid "Hibernating"
-msgstr ""
-
-msgctxt "RouterInfoDialog"
-msgid "Online"
-msgstr ""
-
-msgctxt "RouterInfoDialog"
-msgid "Offline"
+msgid "%1 days "
msgstr ""
-msgctxt "RouterInfoDialog"
-msgid "Unknown"
-msgstr ""
-
-msgctxt "RouterInfoDialog"
-msgid "Relay Details"
-msgstr ""
-
-msgctxt "RouterInfoDialog"
-msgid "Summary"
-msgstr ""
-
-msgctxt "RouterInfoDialog"
-msgid "Name:"
-msgstr ""
-
-msgctxt "RouterInfoDialog"
-msgid "Status:"
-msgstr ""
-
-msgctxt "RouterInfoDialog"
-msgid "Location:"
-msgstr ""
-
-msgctxt "RouterInfoDialog"
-msgid "IP Address:"
-msgstr ""
-
-msgctxt "RouterInfoDialog"
-msgid "Platform:"
-msgstr ""
-
-msgctxt "RouterInfoDialog"
-msgid "Bandwidth:"
-msgstr ""
-
-msgctxt "RouterInfoDialog"
-msgid "Uptime:"
+#: routerdescriptorview.cpp:103
+msgctxt "RouterDescriptorView"
+msgid "%1 hours "
msgstr ""
-msgctxt "RouterInfoDialog"
-msgid "Contact:"
+#: routerdescriptorview.cpp:106
+msgctxt "RouterDescriptorView"
+msgid "%1 mins "
msgstr ""
-msgctxt "RouterInfoDialog"
-msgid "Last Updated:"
+#: routerdescriptorview.cpp:109
+msgctxt "RouterDescriptorView"
+msgid "%1 secs"
msgstr ""
-msgctxt "RouterInfoDialog"
-msgid "Descriptor"
+#: routerdescriptorview.cpp:48
+msgctxt "RouterDescriptorView"
+msgid "Copy"
msgstr ""
+#: routerlistitem.cpp:67
msgctxt "RouterListItem"
msgid "Offline"
msgstr ""
+#: routerlistitem.cpp:71
msgctxt "RouterListItem"
msgid "Hibernating"
msgstr ""
+#: routerlistitem.cpp:83
msgctxt "RouterListItem"
msgid "%1 KB/s"
msgstr ""
+#: routerlistwidget.cpp:49
msgctxt "RouterListWidget"
msgid "Relay"
msgstr ""
+#: routerlistwidget.cpp:74
msgctxt "RouterListWidget"
msgid "Zoom to Relay"
msgstr ""
+#: routerlistwidget.cpp:220
msgctxt "RouterListWidget"
msgid "%1 relays online"
msgstr ""
+#: routerlistwidget.cpp:67
msgctxt "RouterListWidget"
msgid "Copy"
msgstr ""
+#: routerlistwidget.cpp:68
msgctxt "RouterListWidget"
msgid "Nickname"
msgstr ""
+#: routerlistwidget.cpp:71
msgctxt "RouterListWidget"
msgid "Fingerprint"
msgstr ""
+#: serverpage.cpp:140
msgctxt "ServerPage"
msgid "Bridge Support Unavailable"
msgstr ""
+#: serverpage.cpp:143
msgctxt "ServerPage"
-msgid ""
-"You have configured Tor to act as a bridge relay for censored users, but "
-"your version of Tor does not support bridges."
+msgid "You have configured Tor to act as a bridge relay for censored users, but your version of Tor does not support bridges."
msgstr ""
+#: serverpage.cpp:145
msgctxt "ServerPage"
-msgid ""
-"Please upgrade your Tor software or configure Tor to act as a normal Tor "
-"relay."
+msgid "Please upgrade your Tor software or configure Tor to act as a normal Tor relay."
msgstr ""
+#: serverpage.cpp:199
msgctxt "ServerPage"
msgid "Your bridge relay is not running."
msgstr ""
+#: serverpage.cpp:263
msgctxt "ServerPage"
msgid "You must specify at least a relay nickname and port."
msgstr ""
+#: serverpage.ui:25
msgctxt "ServerPage"
msgid "Run as a client only"
msgstr ""
+#: serverpage.ui:32
msgctxt "ServerPage"
msgid "Relay traffic for the Tor network"
msgstr ""
+#: serverpage.ui:39
+msgctxt "ServerPage"
+msgid "Help censored users reach the Tor network (Tor 0.2.0.8-alpha or newer)"
+msgstr ""
+
+#: serverpage.ui:91
msgctxt "ServerPage"
msgid "Relay Port:"
msgstr ""
+#: serverpage.ui:110
msgctxt "ServerPage"
msgid "Enable to mirror the relay directory"
msgstr ""
+#: serverpage.ui:113
+msgctxt "ServerPage"
+msgid "Mirror the Relay Directory "
+msgstr ""
+
+#: serverpage.ui:139
msgctxt "ServerPage"
msgid "Attempt to automatically configure port forwarding"
msgstr ""
+#: serverpage.ui:154
msgctxt "ServerPage"
msgid "Test"
msgstr ""
+#: serverpage.ui:164
msgctxt "ServerPage"
msgid "Show help topic on port forwarding"
msgstr ""
+#: serverpage.ui:204
+msgctxt "ServerPage"
+msgid "Email address at which you may be reached if there is a"
+"problem with your relay. You might also include your PGP or GPG fingerprint."
+msgstr ""
+
+#: serverpage.ui:234
msgctxt "ServerPage"
msgid "Directory Port:"
msgstr ""
+#: serverpage.ui:267
msgctxt "ServerPage"
msgid "Directory Port Number"
msgstr ""
+#: serverpage.ui:279
msgctxt "ServerPage"
msgid "Contact Info:"
msgstr ""
+#: serverpage.ui:337
msgctxt "ServerPage"
msgid "Name of your relay"
msgstr ""
+#: serverpage.ui:370
msgctxt "ServerPage"
msgid "Port on which users and other relays can communicate with your relay"
msgstr ""
+#: serverpage.ui:380
msgctxt "ServerPage"
msgid "Nickname:"
msgstr ""
+#: serverpage.ui:76
msgctxt "ServerPage"
msgid "Basic Settings"
msgstr ""
+#: serverpage.ui:435
msgctxt "ServerPage"
-msgid ""
-"For Internet connections with fast download speed but slow upload, please "
-"list your upload speed here."
+msgid "For Internet connections with fast download speed but slow upload, please list your upload speed here."
msgstr ""
+#: serverpage.ui:466
msgctxt "ServerPage"
msgid "Cable/DSL 256 Kbps"
msgstr ""
+#: serverpage.ui:471
msgctxt "ServerPage"
msgid "Cable/DSL 512 Kbps"
msgstr ""
+#: serverpage.ui:476
msgctxt "ServerPage"
msgid "Cable/DSL 768 Kbps"
msgstr ""
+#: serverpage.ui:481
msgctxt "ServerPage"
msgid "T1/Cable/DSL 1.5 Mbps"
msgstr ""
+#: serverpage.ui:486
msgctxt "ServerPage"
msgid "> 1.5 Mbps"
msgstr ""
+#: serverpage.ui:491
msgctxt "ServerPage"
msgid "Custom"
msgstr ""
+#: serverpage.ui:456
msgctxt "ServerPage"
msgid "Select the entry that most closely resembles your Internet connection"
msgstr ""
+#: serverpage.ui:502
msgctxt "ServerPage"
msgid "Show help topic on bandwidth rate limits"
msgstr ""
+#: serverpage.ui:591
msgctxt "ServerPage"
-msgid "Average Rate"
-msgstr ""
-
-msgctxt "ServerPage"
-msgid "Long-term average bandwidth limit"
-msgstr ""
-
-msgctxt "ServerPage"
-msgid "KB/s"
-msgstr ""
-
-msgctxt "ServerPage"
-msgid "Maximum Rate"
-msgstr ""
-
-msgctxt "ServerPage"
-msgid "Peak bandwidth rate limit"
-msgstr ""
-
-msgctxt "ServerPage"
-msgid ""
-"Your maximum bandwidth rate must be greater than or equal to your average "
-"bandwidth rate. Both values must be at least 20 KB/s."
-msgstr ""
-
-msgctxt "ServerPage"
-msgid "Bandwidth Limits"
-msgstr ""
-
-msgctxt "ServerPage"
-msgid "Ports 6660 - 6669 and 6697"
-msgstr ""
-
-msgctxt "ServerPage"
-msgid "Internet Relay Chat (IRC)"
-msgstr ""
-
-msgctxt "ServerPage"
-msgid "Ports 110, 143, 993 and 995"
-msgstr ""
-
-msgctxt "ServerPage"
-msgid "Retrieve Mail (POP, IMAP)"
-msgstr ""
-
-msgctxt "ServerPage"
-msgid "Ports unspecified by other checkboxes"
-msgstr ""
-
-msgctxt "ServerPage"
-msgid "Misc Other Services"
-msgstr ""
-
-msgctxt "ServerPage"
-msgid "Ports 706, 1863, 5050, 5190, 5222, 5223, 8300 and 8888"
+msgid "Average Rate"
msgstr ""
+#: serverpage.ui:620
msgctxt "ServerPage"
-msgid "Instant Messaging (IM)"
+msgid "Long-term average bandwidth limit"
msgstr ""
+#: serverpage.ui:708
msgctxt "ServerPage"
-msgid "Port 443"
+msgid "KB/s"
msgstr ""
+#: serverpage.ui:666
msgctxt "ServerPage"
-msgid "Secure Websites (SSL)"
+msgid "Maximum Rate"
msgstr ""
+#: serverpage.ui:695
msgctxt "ServerPage"
-msgid "Port 80"
+msgid "Peak bandwidth rate limit"
msgstr ""
+#: serverpage.ui:737
msgctxt "ServerPage"
-msgid "Websites"
+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 "Show help topic on exit policies"
+msgid "Bandwidth Limits"
msgstr ""
+#: serverpage.ui:802
msgctxt "ServerPage"
-msgid ""
-"What Internet resources should users be able to access from your relay?"
+msgid "Ports 6660 - 6669 and 6697"
msgstr ""
+#: serverpage.ui:805
msgctxt "ServerPage"
-msgid ""
-"Tor will still block some outgoing mail and file sharing applications by "
-"default to reduce spam and other abuse."
+msgid "Internet Relay Chat (IRC)"
msgstr ""
+#: serverpage.ui:815
msgctxt "ServerPage"
-msgid "Exit Policies"
+msgid "Ports 110, 143, 993 and 995"
msgstr ""
+#: serverpage.ui:818
msgctxt "ServerPage"
-msgid "Let others access your bridge by giving them this line:"
+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"
+msgid "Ports unspecified by other checkboxes"
msgstr ""
+#: serverpage.ui:831
msgctxt "ServerPage"
-msgid "Copy your bridge relay's identity to the clipboard"
+msgid "Misc Other Services"
msgstr ""
+#: serverpage.ui:841
msgctxt "ServerPage"
-msgid "No Recent Usage"
+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."
+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."
+msgid "Port 443"
msgstr ""
+#: serverpage.ui:857
msgctxt "ServerPage"
-msgid "Bridge History"
+msgid "Secure Websites (SSL)"
msgstr ""
+#: serverpage.ui:867
msgctxt "ServerPage"
-msgid "Vidalia was unable to retrieve your bridge's usage history."
+msgid "Port 80"
msgstr ""
+#: serverpage.ui:870
msgctxt "ServerPage"
-msgid ""
-"Tor returned an improperly formatted response when Vidalia requested your "
-"bridge's usage history."
+msgid "Websites"
msgstr ""
+#: serverpage.ui:896
msgctxt "ServerPage"
-msgid "The returned response was: %1"
+msgid "Show help topic on exit policies"
msgstr ""
+#: serverpage.ui:969
msgctxt "ServerPage"
-msgid "Help censored users reach the Tor network"
+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>"
+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>"
+msgid "Exit Policies"
msgstr ""
+#: serverpage.ui:1015
msgctxt "ServerPage"
-msgid "Automatically distribute my bridge address"
+msgid "Let others access your bridge by giving them this line:"
msgstr ""
+#: serverpage.ui:1039
msgctxt "ServerPage"
-msgid "Mirror the Relay Directory"
+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 ""
+#: servicepage.cpp:116
msgctxt "ServicePage"
msgid "Error while trying to unpublish all services"
msgstr ""
+#: servicepage.cpp:123
msgctxt "ServicePage"
-msgid ""
-"Please configure at least a service directory and a virtual port for each "
-"service you want to save. Remove the other ones."
+msgid "Please configure at least a service directory and a virtual port for each service you want to save. Remove the other ones."
msgstr ""
+#: servicepage.cpp:597
msgctxt "ServicePage"
msgid "Error"
msgstr ""
+#: servicepage.cpp:452
msgctxt "ServicePage"
msgid "Please select a Service."
msgstr ""
+#: servicepage.cpp:458
msgctxt "ServicePage"
msgid "Select Service Directory"
msgstr ""
+#: servicepage.cpp:547
msgctxt "ServicePage"
msgid "Virtual Port may only contain valid port numbers [1..65535]."
msgstr ""
+#: servicepage.cpp:578
msgctxt "ServicePage"
msgid "Target may only contain address:port, address, or port."
msgstr ""
+#: servicepage.cpp:598
msgctxt "ServicePage"
msgid "Directory already in use by another service."
msgstr ""
+#: servicepage.ui:19
msgctxt "ServicePage"
msgid "Form"
msgstr ""
+#: servicepage.ui:31
msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
+#: servicepage.ui:56
msgctxt "ServicePage"
msgid "Onion Address"
msgstr ""
+#: servicepage.ui:61
msgctxt "ServicePage"
msgid "Virtual Port"
msgstr ""
+#: servicepage.ui:66
msgctxt "ServicePage"
msgid "Target"
msgstr ""
+#: servicepage.ui:71
msgctxt "ServicePage"
msgid "Directory Path"
msgstr ""
+#: servicepage.ui:76
msgctxt "ServicePage"
msgid "Enabled"
msgstr ""
+#: servicepage.ui:84
msgctxt "ServicePage"
msgid "Add new service to list"
msgstr ""
+#: servicepage.ui:97
msgctxt "ServicePage"
msgid "Remove selected service from list"
msgstr ""
+#: servicepage.ui:110
msgctxt "ServicePage"
msgid "Copy onion address of selected service to clipboard"
msgstr ""
+#: servicepage.ui:123
msgctxt "ServicePage"
msgid "Browse in local file system and choose directory for selected service"
msgstr ""
+#: servicepage.cpp:384
msgctxt "ServicePage"
msgid "Created by Tor"
msgstr ""
-msgctxt "StatusEventWidget"
-msgid "Copy to Clipboard"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "The Tor Software is Running"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "You are currently running version \"%1\" of the Tor software."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "The Tor Software is not Running"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Click \"Start Tor\" in the Vidalia Control Panel to restart the Tor "
-"software. If Tor exited unexpectedly, select the \"Advanced\" tab above for "
-"details about any errors encountered."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"You are currently running version \"%1\" of the Tor software, which is no "
-"longer recommended. Please upgrade to the most recent version of the "
-"software, which may contain important security, reliability and performance "
-"fixes."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"You are currently running version \"%1\" of the Tor software, which may no "
-"longer work with the current Tor network. Please upgrade to the most recent "
-"version of the software, which may contain important security, reliability "
-"and performance fixes."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Your Tor Software is Out-of-date"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Connected to the Tor Network"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"We were able to successfully establish a connection to the Tor network. You "
-"can now configure your applications to use the Internet anonymously."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Tor Software Error"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"The Tor software encountered an internal bug. Please report the following "
-"error message to the Tor developers at bugs.torproject.org: \"%1\""
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Tor has determined that your computer's clock may be set to %1 seconds in "
-"the past compared to the source \"%2\". If your clock is not correct, Tor "
-"will not be able to function. Please verify your computer displays the "
-"correct time."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Tor has determined that your computer's clock may be set to %1 seconds in "
-"the future compared to the source \"%2\". If your clock is not correct, Tor "
-"will not be able to function. Please verify your computer displays the "
-"correct time."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Your Computer's Clock is Potentially Incorrect"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"One of the applications on your computer may have attempted to make an "
-"unencrypted connection through Tor to port %1. Sending unencrypted "
-"information over the Tor network is dangerous and not recommended. For your "
-"protection, Tor has automatically closed this connection."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"One of the applications on your computer may have attempted to make an "
-"unencrypted connection through Tor to port %1. Sending unencrypted "
-"information over the Tor network is dangerous and not recommended."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Potentially Dangerous Connection!"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"One of your applications established a connection through Tor to \"%1\" "
-"using a protocol that may leak information about your destination. Please "
-"ensure you configure your applications to use only SOCKS4a or SOCKS5 with "
-"remote hostname resolution."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Unknown SOCKS Protocol"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"One of your applications tried to establish a connection through Tor using a"
-" protocol that Tor does not understand. Please ensure you configure your "
-"applications to use only SOCKS4a or SOCKS5 with remote hostname resolution."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Invalid Destination Hostname"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"One of your applications tried to establish a connection through Tor to "
-"\"%1\", which Tor does not recognize as a valid hostname. Please check your "
-"application's configuration."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "External IP Address Changed"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Tor has determined your relay's public IP address is currently %1%2. If that"
-" is not correct, please consider setting the 'Address' option in your "
-"relay's configuration."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "DNS Hijacking Detected"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Tor detected that your DNS provider is providing false responses for domains"
-" that do not exist. Some ISPs and other DNS providers, such as OpenDNS, are "
-"known to do this in order to display their own search or advertising pages."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Tor detected that your DNS provider is providing false responses for well "
-"known domains. Since clients rely on Tor network relays to provide accurate "
-"DNS repsonses, your relay will not be configured as an exit relay."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Checking Server Port Reachability"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Tor is trying to determine if your relay's server port is reachable from the"
-" Tor network by connecting to itself at %1:%2. This test could take several "
-"minutes."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Server Port Reachability Test Successful!"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Your relay's server port is reachable from the Tor network!"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Server Port Reachability Test Failed"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Your relay's server port is not reachable by other Tor clients. This can "
-"happen if you are behind a router or firewall that requires you to set up "
-"port forwarding. If %1:%2 is not your correct IP address and server port, "
-"please check your relay's configuration."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Checking Directory Port Reachability"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Tor is trying to determine if your relay's directory port is reachable from "
-"the Tor network by connecting to itself at %1:%2. This test could take "
-"several minutes."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Directory Port Reachability Test Successful!"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Your relay's directory port is reachable from the Tor network!"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Directory Port Reachability Test Failed"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Your relay's directory port is not reachable by other Tor clients. This can "
-"happen if you are behind a router or firewall that requires you to set up "
-"port forwarding. If %1:%2 is not your correct IP address and directory port,"
-" please check your relay's configuration."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Relay Descriptor Rejected"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Your relay's descriptor, which enables clients to connect to your relay, was"
-" rejected by the directory server at %1:%2. The reason given was: %3"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Your Relay is Online"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Your relay is now online and available for Tor clients to use. You should "
-"see an increase in network traffic shown by the Bandwidth Graph within a few"
-" hours as more clients learn about your relay. Thank you for contributing to"
-" the Tor network!"
-msgstr ""
-
+#: stream.cpp:131
msgctxt "Stream"
msgid "New"
msgstr ""
+#: stream.cpp:133
msgctxt "Stream"
msgid "Resolving"
msgstr ""
+#: stream.cpp:134
msgctxt "Stream"
msgid "Connecting"
msgstr ""
+#: stream.cpp:135
msgctxt "Stream"
msgid "Open"
msgstr ""
+#: stream.cpp:136
msgctxt "Stream"
msgid "Failed"
msgstr ""
+#: stream.cpp:137
msgctxt "Stream"
msgid "Closed"
msgstr ""
+#: stream.cpp:138
msgctxt "Stream"
msgid "Retrying"
msgstr ""
+#: stream.cpp:139
msgctxt "Stream"
msgid "Remapped"
msgstr ""
+#: stream.cpp:140
msgctxt "Stream"
msgid "Unknown"
msgstr ""
+#: torprocess.cpp:107
msgctxt "TorProcess"
msgid "Process %1 failed to stop. [%2]"
msgstr ""
+#: torservice.cpp:143
msgctxt "TorService"
msgid "The Tor service is not installed."
msgstr ""
+#: torservice.cpp:161
msgctxt "TorService"
msgid "Unable to start the Tor service."
msgstr ""
+#: torsettings.cpp:103
msgctxt "TorSettings"
msgid "Failed to hash the control password."
msgstr ""
-msgctxt "TorrcDialog"
-msgid "Editing torrc"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid ""
-"Save settings. If unchecked it will only apply settings to the current Tor "
-"instance."
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Cut"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Copy"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Paste"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Undo"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Redo"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Select All"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Apply all"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Apply selection only"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Error connecting to Tor"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Selection is empty. Please select some text, or check \"Apply all\""
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Error at line %1: \"%2\""
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Error"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "An error ocurred while opening torrc file"
-msgstr ""
-
+#: upnpcontrol.cpp:139
msgctxt "UPNPControl"
msgid "Success"
msgstr ""
+#: upnpcontrol.cpp:141
msgctxt "UPNPControl"
msgid "No UPnP-enabled devices found"
msgstr ""
+#: upnpcontrol.cpp:143
msgctxt "UPNPControl"
msgid "No valid UPnP-enabled Internet gateway devices found"
msgstr ""
+#: upnpcontrol.cpp:145
msgctxt "UPNPControl"
msgid "WSAStartup failed"
msgstr ""
+#: upnpcontrol.cpp:147
msgctxt "UPNPControl"
msgid "Failed to add a port mapping"
msgstr ""
+#: upnpcontrol.cpp:149
msgctxt "UPNPControl"
msgid "Failed to retrieve a port mapping"
msgstr ""
+#: upnpcontrol.cpp:151
msgctxt "UPNPControl"
msgid "Failed to remove a port mapping"
msgstr ""
+#: upnpcontrol.cpp:153
msgctxt "UPNPControl"
msgid "Unknown error"
msgstr ""
+#: upnptestdialog.cpp:112
msgctxt "UPNPTestDialog"
msgid "Discovering UPnP-enabled devices"
msgstr ""
+#: upnptestdialog.cpp:117
msgctxt "UPNPTestDialog"
msgid "Updating directory port mapping"
msgstr ""
+#: upnptestdialog.cpp:122
msgctxt "UPNPTestDialog"
msgid "Updating relay port mapping"
msgstr ""
+#: upnptestdialog.cpp:127
msgctxt "UPNPTestDialog"
msgid "Test completed successfully!"
msgstr ""
+#: upnptestdialog.ui:13
msgctxt "UPNPTestDialog"
msgid "Testing UPnP Support"
msgstr ""
+#: upnptestdialog.ui:92
msgctxt "UPNPTestDialog"
msgid "Testing Universal Plug & Play Support"
msgstr ""
-msgctxt "UpdateProcess"
-msgid ""
-"Vidalia was unable to check for available software updates because it could "
-"not find '%1'."
-msgstr ""
-
-msgctxt "UpdateProcess"
-msgid ""
-"Vidalia was unable to check for available software updates because Tor's "
-"update process exited unexpectedly."
-msgstr ""
-
-msgctxt "UpdateProgressDialog"
-msgid "Checking for available updates..."
-msgstr ""
-
-msgctxt "UpdateProgressDialog"
-msgid "Hide"
-msgstr ""
-
-msgctxt "UpdateProgressDialog"
-msgid "Downloading updates..."
-msgstr ""
-
-msgctxt "UpdateProgressDialog"
-msgid "Installing updated software..."
-msgstr ""
-
-msgctxt "UpdateProgressDialog"
-msgid "Done! Your software is now up to date."
-msgstr ""
-
-msgctxt "UpdateProgressDialog"
-msgid "OK"
-msgstr ""
-
-msgctxt "UpdateProgressDialog"
-msgid "Software Updates"
-msgstr ""
-
-msgctxt "UpdateProgressDialog"
-msgid "Checking for updates..."
-msgstr ""
-
-msgctxt "UpdateProgressDialog"
-msgid "Cancel"
-msgstr ""
-
-msgctxt "UpdatesAvailableDialog"
-msgid "Software Updates Available"
-msgstr ""
-
-msgctxt "UpdatesAvailableDialog"
-msgid "Remind Me Later"
-msgstr ""
-
-msgctxt "UpdatesAvailableDialog"
-msgid "Install"
-msgstr ""
-
-msgctxt "UpdatesAvailableDialog"
-msgid "The following updated software packages are ready for installation:"
-msgstr ""
-
-msgctxt "UpdatesAvailableDialog"
-msgid "Package"
-msgstr ""
-
-msgctxt "UpdatesAvailableDialog"
-msgid "Version"
-msgstr ""
-
+#: vmessagebox.cpp:77
msgctxt "VMessageBox"
msgid "OK"
msgstr ""
+#: vmessagebox.cpp:78
msgctxt "VMessageBox"
msgid "Cancel"
msgstr ""
+#: vmessagebox.cpp:79
msgctxt "VMessageBox"
msgid "Yes"
msgstr ""
+#: vmessagebox.cpp:80
msgctxt "VMessageBox"
msgid "No"
msgstr ""
+#: vmessagebox.cpp:81
msgctxt "VMessageBox"
msgid "Help"
msgstr ""
+#: vmessagebox.cpp:82
msgctxt "VMessageBox"
msgid "Retry"
msgstr ""
+#: vmessagebox.cpp:83
msgctxt "VMessageBox"
msgid "Show Log"
msgstr ""
+#: vmessagebox.cpp:84
msgctxt "VMessageBox"
msgid "Show Settings"
msgstr ""
+#: vmessagebox.cpp:85
msgctxt "VMessageBox"
msgid "Continue"
msgstr ""
+#: vmessagebox.cpp:86
msgctxt "VMessageBox"
msgid "Quit"
msgstr ""
+#: vmessagebox.cpp:87
msgctxt "VMessageBox"
msgid "Browse"
msgstr ""
+#: main.cpp:75
msgctxt "Vidalia"
msgid "Invalid Argument"
msgstr ""
+#: main.cpp:89
msgctxt "Vidalia"
msgid "Vidalia is already running"
msgstr ""
+#: main.cpp:95
+msgctxt "Vidalia"
+msgid "Another Vidalia process is possibly already running. If there really is not another Vidalia process running, you can choose to continue anyway."
+""
+"Would you like to continue starting Vidalia?"
+msgstr ""
+
+#: vidalia.cpp:169
msgctxt "Vidalia"
msgid "Displays this usage message and exits."
msgstr ""
+#: vidalia.cpp:171
msgctxt "Vidalia"
msgid "Resets ALL stored Vidalia settings."
msgstr ""
+#: vidalia.cpp:173
msgctxt "Vidalia"
msgid "Sets the directory Vidalia uses for data files."
msgstr ""
+#: vidalia.cpp:175
msgctxt "Vidalia"
msgid "Sets the name and location of Vidalia's pidfile."
msgstr ""
+#: vidalia.cpp:177
msgctxt "Vidalia"
msgid "Sets the name and location of Vidalia's logfile."
msgstr ""
+#: vidalia.cpp:180
msgctxt "Vidalia"
msgid "Sets the verbosity of Vidalia's logging."
msgstr ""
+#: vidalia.cpp:183
msgctxt "Vidalia"
msgid "Sets Vidalia's interface style."
msgstr ""
+#: vidalia.cpp:186
msgctxt "Vidalia"
msgid "Sets Vidalia's language."
msgstr ""
+#: vidalia.cpp:190
msgctxt "Vidalia"
msgid "Vidalia Usage Information"
msgstr ""
+#: vidalia.cpp:238
msgctxt "Vidalia"
-msgid "Unable to open log file '%1': %2"
-msgstr ""
-
-msgctxt "Vidalia"
-msgid "Value required for parameter :"
-msgstr ""
-
-msgctxt "Vidalia"
-msgid "Invalid language code specified:"
+msgid "Invalid language code specified: "
msgstr ""
+#: vidalia.cpp:245
msgctxt "Vidalia"
-msgid "Invalid GUI style specified:"
+msgid "Invalid GUI style specified: "
msgstr ""
+#: vidalia.cpp:251
msgctxt "Vidalia"
-msgid "Invalid log level specified:"
+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?"
-msgstr ""
-
-msgctxt "stringutil.h"
-msgid "%1 secs"
-msgstr ""
-
-msgctxt "stringutil.h"
-msgid "%1 B/s"
-msgstr ""
-
-msgctxt "stringutil.h"
-msgid "%1 KB/s"
-msgstr ""
-
-msgctxt "stringutil.h"
-msgid "%1 MB/s"
-msgstr ""
-
-msgctxt "stringutil.h"
-msgid "%1 GB/s"
-msgstr ""
-
-msgctxt "stringutil.h"
-msgid "%1 days"
-msgstr ""
-
-msgctxt "stringutil.h"
-msgid "%1 hours"
-msgstr ""
-
-msgctxt "stringutil.h"
-msgid "%1 mins"
+msgid "Unable to open log file '%1': %2"
msgstr ""
-
-
diff --git a/src/vidalia/i18n/po/br/qt_br.po b/src/vidalia/i18n/po/br/qt_br.po
index aa64469..68f542b 100644
--- a/src/vidalia/i18n/po/br/qt_br.po
+++ b/src/vidalia/i18n/po/br/qt_br.po
@@ -1,11 +1,10 @@
#
-# Translators:
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-08-20 03:25+0000\n"
-"PO-Revision-Date: 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"
@@ -431,5 +430,3 @@ msgstr ""
msgctxt "QFileSystemModel"
msgid "%1 bytes"
msgstr ""
-
-
diff --git a/src/vidalia/i18n/po/br/vidalia_br.po b/src/vidalia/i18n/po/br/vidalia_br.po
index 6e6ff60..22b0f4e 100644
--- a/src/vidalia/i18n/po/br/vidalia_br.po
+++ b/src/vidalia/i18n/po/br/vidalia_br.po
@@ -1,18 +1,15 @@
-#
-# Translators:
+#, fuzzy
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: 2010-12-05 20:03+0000\n"
-"Last-Translator: \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: 2009-05-19 23:56+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
+"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: br\n"
-"Plural-Forms: nplurals=2; plural=(n > 1)\n"
"X-Generator: Vidalia ts2po 0.2\n"
msgctxt "AboutDialog"
@@ -35,13 +32,28 @@ msgctxt "AboutDialog"
msgid "Qt 4.4.2"
msgstr ""
+msgctxt "AboutDialog"
+msgid "Vidalia"
+msgstr ""
+
+msgctxt "AboutDialog"
+msgid "Tor"
+msgstr ""
+
+msgctxt "AboutDialog"
+msgid "Qt"
+msgstr ""
+
+msgctxt "AboutDialog"
+msgid "version"
+msgstr ""
+
msgctxt "AdvancedPage"
msgid "'%1' is not a valid IP address."
msgstr ""
msgctxt "AdvancedPage"
-msgid ""
-"You selected 'Password' authentication, but did not specify a password."
+msgid "You selected 'Password' authentication, but did not specify a password."
msgstr ""
msgctxt "AdvancedPage"
@@ -81,6 +93,10 @@ msgid "Vidalia was unable to install the Tor service."
msgstr ""
msgctxt "AdvancedPage"
+msgid "Control Port"
+msgstr ""
+
+msgctxt "AdvancedPage"
msgid "Authentication:"
msgstr ""
@@ -137,68 +153,7 @@ msgid "Select the directory used to store data for the Tor software"
msgstr ""
msgctxt "AdvancedPage"
-msgid "Tor Control"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "Use TCP connection (ControlPort)"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "Path:"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "Use Unix domain socket (ControlSocket)"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "Edit current torrc"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "NOTE: this will edit the currently loaded torrc"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "ControlSocket path doesn't exist."
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid ""
-"The specified Tor configuration file location contains characters that "
-"cannot be represented in your system's current 8-bit character encoding."
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid ""
-"The specified Tor data directory location contains characters that cannot be"
-" represented in your system's current 8-bit character encoding."
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "Warning"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "You changed torrc path, would you like to restart Tor?"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "Tor Configuration File (torrc);;All Files (*)"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "Select a file to use for Tor socket path"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "Configure ControlPort automatically"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid ""
-"Vidalia was unable to remove the Tor service.\n"
+msgid "Vidalia was unable to remove the Tor service.\n"
"\n"
"You may need to remove it manually."
msgstr ""
@@ -440,9 +395,7 @@ msgid "Remember my password"
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid ""
-"Vidalia has connected to a running Tor process that requires a password. "
-"Please enter your control password:"
+msgid "Vidalia has connected to a running Tor process that requires a password. Please enter your control password:"
msgstr ""
msgctxt "ControlSocket"
@@ -1158,10 +1111,6 @@ msgid "Zimbabwe"
msgstr ""
msgctxt "CountryInfo"
-msgid "Zaire"
-msgstr ""
-
-msgctxt "CountryInfo"
msgid "Albania"
msgstr ""
@@ -1257,55 +1206,6 @@ msgctxt "CountryInfo"
msgid "Taiwan"
msgstr ""
-msgctxt "CrashReportDialog"
-msgid "Submit a Crash Report"
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid "Vidalia encountered an error and needed to close"
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid "Restart Vidalia"
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid "Don't Restart"
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid "Unable to restart Vidalia"
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid ""
-"We were unable to automatically restart Vidalia. Please restart Vidalia "
-"manually."
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid "Please fill a ticket in:"
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid ""
-"<a "
-"href=\"https://trac.torproject.org/projects/tor/newticket\">https://trac.torproject.org/projects/tor/newticket</a>"
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid ""
-"A crash report has been created that you can send to the Vidalia developers "
-"to help identify and fix the problem. The submitted report does not contain "
-"any personally identifying information."
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid ""
-"with a description of what you were doing before the application crashed, "
-"along with the following files corresponding to the crash report:"
-msgstr ""
-
msgctxt "GeneralPage"
msgid "Executables (*.exe)"
msgstr ""
@@ -1323,6 +1223,10 @@ msgid "You must specify the name of your Tor executable."
msgstr ""
msgctxt "GeneralPage"
+msgid "The proxy arguments specified are not properly formatted."
+msgstr ""
+
+msgctxt "GeneralPage"
msgid "Start Vidalia when my system starts"
msgstr ""
@@ -1519,10 +1423,7 @@ msgid "Opening External Link"
msgstr ""
msgctxt "HelpTextBrowser"
-msgid ""
-"Vidalia can open the link you selected in your default Web browser. If your "
-"browser is not currently configured to use Tor then the request will not be "
-"anonymous."
+msgid "Vidalia can open the link you selected in your default Web browser. If your browser is not currently configured to use Tor then the request will not be anonymous."
msgstr ""
msgctxt "HelpTextBrowser"
@@ -1534,9 +1435,7 @@ msgid "Unable to Open Link"
msgstr ""
msgctxt "HelpTextBrowser"
-msgid ""
-"Vidalia was unable to open the selected link in your Web browser. You can "
-"still copy the URL and paste it into your browser."
+msgid "Vidalia was unable to open the selected link in your Web browser. You can still copy the URL and paste it into your browser."
msgstr ""
msgctxt "HelpTextBrowser"
@@ -1579,30 +1478,6 @@ msgctxt "LogEvent"
msgid "Unknown"
msgstr ""
-msgctxt "LogTreeItem"
-msgid "Debug"
-msgstr ""
-
-msgctxt "LogTreeItem"
-msgid "Info"
-msgstr ""
-
-msgctxt "LogTreeItem"
-msgid "Notice"
-msgstr ""
-
-msgctxt "LogTreeItem"
-msgid "Warning"
-msgstr ""
-
-msgctxt "LogTreeItem"
-msgid "Error"
-msgstr ""
-
-msgctxt "LogTreeItem"
-msgid "Unknown"
-msgstr ""
-
msgctxt "MainWindow"
msgid "Start Tor"
msgstr ""
@@ -1816,9 +1691,7 @@ msgid "Error Starting Tor"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Vidalia was unable to start Tor. Check your settings to ensure the correct "
-"name and location of your Tor executable is specified."
+msgid "Vidalia was unable to start Tor. Check your settings to ensure the correct name and location of your Tor executable is specified."
msgstr ""
msgctxt "MainWindow"
@@ -1854,9 +1727,7 @@ msgid "Cookie Authentication Required"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"The Tor software requires Vidalia to send the contents of an authentication "
-"cookie, but Vidalia was unable to find one."
+msgid "The Tor software requires Vidalia to send the contents of an authentication cookie, but Vidalia was unable to find one."
msgstr ""
msgctxt "MainWindow"
@@ -1876,9 +1747,7 @@ msgid "Error Registering for Events"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Vidalia was unable to register for some events. Many of Vidalia's features "
-"may be unavailable."
+msgid "Vidalia was unable to register for some events. Many of Vidalia's features may be unavailable."
msgstr ""
msgctxt "MainWindow"
@@ -1898,9 +1767,7 @@ msgid "Tor Update Available"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended. Please visit the Tor website to download the latest version."
+msgid "The currently installed version of Tor is out of date or no longer recommended. Please visit the Tor website to download the latest version."
msgstr ""
msgctxt "MainWindow"
@@ -1908,9 +1775,7 @@ msgid "Tor website: %1"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"All subsequent connections will appear to be different than your old "
-"connections."
+msgid "All subsequent connections will appear to be different than your old connections."
msgstr ""
msgctxt "MainWindow"
@@ -2002,21 +1867,15 @@ msgid "Password Reset Failed"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Vidalia tried to reset Tor's control password, but was not able to restart "
-"the Tor software. Please check your Task Manager to ensure there are no "
-"other Tor processes running."
+msgid "Vidalia tried to reset Tor's control password, but was not able to restart the Tor software. Please check your Task Manager to ensure there are no other Tor processes running."
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended."
+msgid "The currently installed version of Tor is out of date or no longer recommended."
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Would you like to check if a newer package is available for installation?"
+msgid "Would you like to check if a newer package is available for installation?"
msgstr ""
msgctxt "MainWindow"
@@ -2024,9 +1883,11 @@ msgid "Potentially Unsafe Connection"
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 ""
msgctxt "MainWindow"
@@ -2038,9 +1899,7 @@ msgid "Your software is up to date"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"There are no new Tor software packages available for your computer at this "
-"time."
+msgid "There are no new Tor software packages available for your computer at this time."
msgstr ""
msgctxt "MainWindow"
@@ -2056,52 +1915,52 @@ msgid "The following error occurred:"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Anything sent over this connection could be monitored. Please check your "
-"application's configuration and use only encrypted protocols, such as SSL, "
-"if possible."
-msgstr ""
-
-msgctxt "MainWindow"
msgid "failed (%1)"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
+msgid "Your relay is shutting down.\n"
"Click 'Stop' again to stop your relay now."
msgstr ""
msgctxt "MainWindow"
-msgid "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 ""
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 ""
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 ""
+
+msgctxt "MainWindow"
+msgid "File"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "About Vidalia"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Home"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Check For Updates"
msgstr ""
msgctxt "MessageLog"
@@ -2345,68 +2204,50 @@ 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"
+msgid "Always Save New Log Messages"
msgstr ""
msgctxt "MessageLog"
-msgid "Tor Status"
+msgid "Browse"
msgstr ""
msgctxt "MessageLog"
-msgid "Advanced"
+msgid "Enable automatically saving all new log messages to a file"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
+msgid "Automatically save new log messages to a file"
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 ""
msgctxt "MessageLog"
-msgid ""
-"Messages that only appear when \n"
+msgid "Messages that only appear when \n"
"something has gone wrong with Tor."
msgstr ""
msgctxt "MessageLog"
-msgid ""
-"Messages that appear infrequently \n"
+msgid "Messages that appear infrequently \n"
"during normal Tor operation and are \n"
"not considered errors, but you may \n"
"care about."
msgstr ""
msgctxt "MessageLog"
-msgid ""
-"Messages that appear frequently \n"
+msgid "Messages that appear frequently \n"
"during normal Tor operation."
msgstr ""
msgctxt "MessageLog"
-msgid ""
-"Hyper-verbose messages primarily of \n"
+msgid "Hyper-verbose messages primarily of \n"
"interest to Tor developers."
msgstr ""
msgctxt "MessageLog"
-msgid ""
-"Cannot write file %1\n"
+msgid "Cannot write file %1\n"
"\n"
"%2."
msgstr ""
@@ -2528,15 +2369,11 @@ msgid "Copy (Ctrl+C)"
msgstr ""
msgctxt "NetworkPage"
-msgid ""
-"You must specify both an IP address or hostname and a port number to "
-"configure Tor to use a proxy to access the Internet."
+msgid "You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet."
msgstr ""
msgctxt "NetworkPage"
-msgid ""
-"You must specify one or more ports to which your firewall allows you to "
-"connect."
+msgid "You must specify one or more ports to which your firewall allows you to connect."
msgstr ""
msgctxt "NetworkPage"
@@ -2556,10 +2393,18 @@ msgid "Proxy Settings"
msgstr ""
msgctxt "NetworkPage"
+msgid "HTTP Proxy:"
+msgstr ""
+
+msgctxt "NetworkPage"
msgid "Username:"
msgstr ""
msgctxt "NetworkPage"
+msgid "Use this proxy for HTTPS also"
+msgstr ""
+
+msgctxt "NetworkPage"
msgid "Password:"
msgstr ""
@@ -2588,9 +2433,7 @@ msgid "80, 443"
msgstr ""
msgctxt "NetworkPage"
-msgid ""
-"Check to encrypt directory requests and, optionally, use bridge relays to "
-"access the Tor network"
+msgid "Check to encrypt directory requests and, optionally, use bridge relays to access the Tor network"
msgstr ""
msgctxt "NetworkPage"
@@ -2602,10 +2445,18 @@ msgid "Bridge Settings"
msgstr ""
msgctxt "NetworkPage"
+msgid "The Tor software you are currently running does not support bridges. <br>Directory connections will still be encrypted."
+msgstr ""
+
+msgctxt "NetworkPage"
msgid "Add a Bridge:"
msgstr ""
msgctxt "NetworkPage"
+msgid "<a href=\"bridges.finding\">How do I find a bridge?</a>"
+msgstr ""
+
+msgctxt "NetworkPage"
msgid "Remove the selected bridges from the list"
msgstr ""
@@ -2626,43 +2477,13 @@ msgid "<a href=\"bridges.finding\">How can I find bridges?</a>"
msgstr ""
msgctxt "NetworkPage"
-msgid ""
-"No new bridges are currently available. You can either wait a while and try "
-"again, or try another method of finding new bridges."
+msgid "No new bridges are currently available. You can either wait a while and try again, or try another method of finding new bridges."
msgstr ""
msgctxt "NetworkPage"
msgid "Click Help to see other methods of finding new bridges."
msgstr ""
-msgctxt "NetworkPage"
-msgid "Address:"
-msgstr ""
-
-msgctxt "NetworkPage"
-msgid "Type:"
-msgstr ""
-
-msgctxt "NetworkPage"
-msgid "You must select the proxy type."
-msgstr ""
-
-msgctxt "NetworkPage"
-msgid "SOCKS 4"
-msgstr ""
-
-msgctxt "NetworkPage"
-msgid "SOCKS 5"
-msgstr ""
-
-msgctxt "NetworkPage"
-msgid "HTTP"
-msgstr ""
-
-msgctxt "NetworkPage"
-msgid "HTTP / HTTPS"
-msgstr ""
-
msgctxt "Policy"
msgid "accept"
msgstr ""
@@ -2816,15 +2637,11 @@ msgid "Bridge Support Unavailable"
msgstr ""
msgctxt "ServerPage"
-msgid ""
-"You have configured Tor to act as a bridge relay for censored users, but "
-"your version of Tor does not support bridges."
+msgid "You have configured Tor to act as a bridge relay for censored users, but your version of Tor does not support bridges."
msgstr ""
msgctxt "ServerPage"
-msgid ""
-"Please upgrade your Tor software or configure Tor to act as a normal Tor "
-"relay."
+msgid "Please upgrade your Tor software or configure Tor to act as a normal Tor relay."
msgstr ""
msgctxt "ServerPage"
@@ -2892,9 +2709,7 @@ msgid "Basic Settings"
msgstr ""
msgctxt "ServerPage"
-msgid ""
-"For Internet connections with fast download speed but slow upload, please "
-"list your upload speed here."
+msgid "For Internet connections with fast download speed but slow upload, please list your upload speed here."
msgstr ""
msgctxt "ServerPage"
@@ -2950,9 +2765,7 @@ msgid "Peak bandwidth rate limit"
msgstr ""
msgctxt "ServerPage"
-msgid ""
-"Your maximum bandwidth rate must be greater than or equal to your average "
-"bandwidth rate. Both values must be at least 20 KB/s."
+msgid "Your maximum bandwidth rate must be greater than or equal to your average bandwidth rate. Both values must be at least 20 KB/s."
msgstr ""
msgctxt "ServerPage"
@@ -3012,14 +2825,11 @@ msgid "Show help topic on exit policies"
msgstr ""
msgctxt "ServerPage"
-msgid ""
-"What Internet resources should users be able to access from your relay?"
+msgid "What Internet resources should users be able to access from your relay?"
msgstr ""
msgctxt "ServerPage"
-msgid ""
-"Tor will still block some outgoing mail and file sharing applications by "
-"default to reduce spam and other abuse."
+msgid "Tor will still block some outgoing mail and file sharing applications by default to reduce spam and other abuse."
msgstr ""
msgctxt "ServerPage"
@@ -3031,8 +2841,7 @@ msgid "Let others access your bridge by giving them this line:"
msgstr ""
msgctxt "ServerPage"
-msgid ""
-"This is the identity of your bridge relay that you can give to other people"
+msgid "This is the identity of your bridge relay that you can give to other people"
msgstr ""
msgctxt "ServerPage"
@@ -3048,9 +2857,7 @@ msgid "No clients have used your relay recently."
msgstr ""
msgctxt "ServerPage"
-msgid ""
-"Leave your relay running so clients have a better chance of finding and "
-"using it."
+msgid "Leave your relay running so clients have a better chance of finding and using it."
msgstr ""
msgctxt "ServerPage"
@@ -3062,9 +2869,7 @@ msgid "Vidalia was unable to retrieve your bridge's usage history."
msgstr ""
msgctxt "ServerPage"
-msgid ""
-"Tor returned an improperly formatted response when Vidalia requested your "
-"bridge's usage history."
+msgid "Tor returned an improperly formatted response when Vidalia requested your bridge's usage history."
msgstr ""
msgctxt "ServerPage"
@@ -3080,20 +2885,11 @@ msgid "<a href=\"#bridgeUsage\">Who has used my bridge?</a>"
msgstr ""
msgctxt "ServerPage"
-msgid "<a href=\"#bridgeHelp\">What's this?</a>"
-msgstr ""
-
-msgctxt "ServerPage"
-msgid "Automatically distribute my bridge address"
-msgstr ""
-
-msgctxt "ServerPage"
msgid "Mirror the Relay Directory"
msgstr ""
msgctxt "ServerPage"
-msgid ""
-"Email address at which you may be reached if there is a\n"
+msgid "Email address at which you may be reached if there is a\n"
"problem with your relay. You might also include your PGP or GPG fingerprint."
msgstr ""
@@ -3102,9 +2898,7 @@ msgid "Error while trying to unpublish all services"
msgstr ""
msgctxt "ServicePage"
-msgid ""
-"Please configure at least a service directory and a virtual port for each "
-"service you want to save. Remove the other ones."
+msgid "Please configure at least a service directory and a virtual port for each service you want to save. Remove the other ones."
msgstr ""
msgctxt "ServicePage"
@@ -3179,251 +2973,6 @@ msgctxt "ServicePage"
msgid "Created by Tor"
msgstr ""
-msgctxt "StatusEventWidget"
-msgid "Copy to Clipboard"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "The Tor Software is Running"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "You are currently running version \"%1\" of the Tor software."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "The Tor Software is not Running"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Click \"Start Tor\" in the Vidalia Control Panel to restart the Tor "
-"software. If Tor exited unexpectedly, select the \"Advanced\" tab above for "
-"details about any errors encountered."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"You are currently running version \"%1\" of the Tor software, which is no "
-"longer recommended. Please upgrade to the most recent version of the "
-"software, which may contain important security, reliability and performance "
-"fixes."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"You are currently running version \"%1\" of the Tor software, which may no "
-"longer work with the current Tor network. Please upgrade to the most recent "
-"version of the software, which may contain important security, reliability "
-"and performance fixes."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Your Tor Software is Out-of-date"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Connected to the Tor Network"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"We were able to successfully establish a connection to the Tor network. You "
-"can now configure your applications to use the Internet anonymously."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Tor Software Error"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"The Tor software encountered an internal bug. Please report the following "
-"error message to the Tor developers at bugs.torproject.org: \"%1\""
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Tor has determined that your computer's clock may be set to %1 seconds in "
-"the past compared to the source \"%2\". If your clock is not correct, Tor "
-"will not be able to function. Please verify your computer displays the "
-"correct time."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Tor has determined that your computer's clock may be set to %1 seconds in "
-"the future compared to the source \"%2\". If your clock is not correct, Tor "
-"will not be able to function. Please verify your computer displays the "
-"correct time."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Your Computer's Clock is Potentially Incorrect"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"One of the applications on your computer may have attempted to make an "
-"unencrypted connection through Tor to port %1. Sending unencrypted "
-"information over the Tor network is dangerous and not recommended. For your "
-"protection, Tor has automatically closed this connection."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"One of the applications on your computer may have attempted to make an "
-"unencrypted connection through Tor to port %1. Sending unencrypted "
-"information over the Tor network is dangerous and not recommended."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Potentially Dangerous Connection!"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"One of your applications established a connection through Tor to \"%1\" "
-"using a protocol that may leak information about your destination. Please "
-"ensure you configure your applications to use only SOCKS4a or SOCKS5 with "
-"remote hostname resolution."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Unknown SOCKS Protocol"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"One of your applications tried to establish a connection through Tor using a"
-" protocol that Tor does not understand. Please ensure you configure your "
-"applications to use only SOCKS4a or SOCKS5 with remote hostname resolution."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Invalid Destination Hostname"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"One of your applications tried to establish a connection through Tor to "
-"\"%1\", which Tor does not recognize as a valid hostname. Please check your "
-"application's configuration."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "External IP Address Changed"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Tor has determined your relay's public IP address is currently %1%2. If that"
-" is not correct, please consider setting the 'Address' option in your "
-"relay's configuration."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "DNS Hijacking Detected"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Tor detected that your DNS provider is providing false responses for domains"
-" that do not exist. Some ISPs and other DNS providers, such as OpenDNS, are "
-"known to do this in order to display their own search or advertising pages."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Tor detected that your DNS provider is providing false responses for well "
-"known domains. Since clients rely on Tor network relays to provide accurate "
-"DNS repsonses, your relay will not be configured as an exit relay."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Checking Server Port Reachability"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Tor is trying to determine if your relay's server port is reachable from the"
-" Tor network by connecting to itself at %1:%2. This test could take several "
-"minutes."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Server Port Reachability Test Successful!"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Your relay's server port is reachable from the Tor network!"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Server Port Reachability Test Failed"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Your relay's server port is not reachable by other Tor clients. This can "
-"happen if you are behind a router or firewall that requires you to set up "
-"port forwarding. If %1:%2 is not your correct IP address and server port, "
-"please check your relay's configuration."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Checking Directory Port Reachability"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Tor is trying to determine if your relay's directory port is reachable from "
-"the Tor network by connecting to itself at %1:%2. This test could take "
-"several minutes."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Directory Port Reachability Test Successful!"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Your relay's directory port is reachable from the Tor network!"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Directory Port Reachability Test Failed"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Your relay's directory port is not reachable by other Tor clients. This can "
-"happen if you are behind a router or firewall that requires you to set up "
-"port forwarding. If %1:%2 is not your correct IP address and directory port,"
-" please check your relay's configuration."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Relay Descriptor Rejected"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Your relay's descriptor, which enables clients to connect to your relay, was"
-" rejected by the directory server at %1:%2. The reason given was: %3"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Your Relay is Online"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Your relay is now online and available for Tor clients to use. You should "
-"see an increase in network traffic shown by the Bandwidth Graph within a few"
-" hours as more clients learn about your relay. Thank you for contributing to"
-" the Tor network!"
-msgstr ""
-
msgctxt "Stream"
msgid "New"
msgstr ""
@@ -3476,68 +3025,6 @@ msgctxt "TorSettings"
msgid "Failed to hash the control password."
msgstr ""
-msgctxt "TorrcDialog"
-msgid "Editing torrc"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid ""
-"Save settings. If unchecked it will only apply settings to the current Tor "
-"instance."
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Cut"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Copy"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Paste"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Undo"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Redo"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Select All"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Apply all"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Apply selection only"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Error connecting to Tor"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Selection is empty. Please select some text, or check \"Apply all\""
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Error at line %1: \"%2\""
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Error"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "An error ocurred while opening torrc file"
-msgstr ""
-
msgctxt "UPNPControl"
msgid "Success"
msgstr ""
@@ -3595,15 +3082,11 @@ msgid "Testing Universal Plug & Play Support"
msgstr ""
msgctxt "UpdateProcess"
-msgid ""
-"Vidalia was unable to check for available software updates because it could "
-"not find '%1'."
+msgid "Vidalia was unable to check for available software updates because it could not find '%1'."
msgstr ""
msgctxt "UpdateProcess"
-msgid ""
-"Vidalia was unable to check for available software updates because Tor's "
-"update process exited unexpectedly."
+msgid "Vidalia was unable to check for available software updates because Tor's update process exited unexpectedly."
msgstr ""
msgctxt "UpdateProgressDialog"
@@ -3759,10 +3242,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 ""
@@ -3775,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 ""
@@ -3812,5 +3290,3 @@ msgstr ""
msgctxt "stringutil.h"
msgid "%1 mins"
msgstr ""
-
-
diff --git a/src/vidalia/i18n/po/bs/qt_bs.po b/src/vidalia/i18n/po/bs/qt_bs.po
index 119546d..910b85a 100644
--- a/src/vidalia/i18n/po/bs/qt_bs.po
+++ b/src/vidalia/i18n/po/bs/qt_bs.po
@@ -1,11 +1,10 @@
#
-# Translators:
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-08-20 03:25+0000\n"
-"PO-Revision-Date: 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"
@@ -431,5 +430,3 @@ msgstr ""
msgctxt "QFileSystemModel"
msgid "%1 bytes"
msgstr ""
-
-
diff --git a/src/vidalia/i18n/po/bs/vidalia_bs.po b/src/vidalia/i18n/po/bs/vidalia_bs.po
index 54e3e62..22b0f4e 100644
--- a/src/vidalia/i18n/po/bs/vidalia_bs.po
+++ b/src/vidalia/i18n/po/bs/vidalia_bs.po
@@ -1,18 +1,15 @@
-#
-# Translators:
+#, fuzzy
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: 2010-12-05 20:03+0000\n"
-"Last-Translator: \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: 2009-05-19 23:56+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
+"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: bs\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
"X-Generator: Vidalia ts2po 0.2\n"
msgctxt "AboutDialog"
@@ -35,13 +32,28 @@ msgctxt "AboutDialog"
msgid "Qt 4.4.2"
msgstr ""
+msgctxt "AboutDialog"
+msgid "Vidalia"
+msgstr ""
+
+msgctxt "AboutDialog"
+msgid "Tor"
+msgstr ""
+
+msgctxt "AboutDialog"
+msgid "Qt"
+msgstr ""
+
+msgctxt "AboutDialog"
+msgid "version"
+msgstr ""
+
msgctxt "AdvancedPage"
msgid "'%1' is not a valid IP address."
msgstr ""
msgctxt "AdvancedPage"
-msgid ""
-"You selected 'Password' authentication, but did not specify a password."
+msgid "You selected 'Password' authentication, but did not specify a password."
msgstr ""
msgctxt "AdvancedPage"
@@ -81,6 +93,10 @@ msgid "Vidalia was unable to install the Tor service."
msgstr ""
msgctxt "AdvancedPage"
+msgid "Control Port"
+msgstr ""
+
+msgctxt "AdvancedPage"
msgid "Authentication:"
msgstr ""
@@ -137,68 +153,7 @@ msgid "Select the directory used to store data for the Tor software"
msgstr ""
msgctxt "AdvancedPage"
-msgid "Tor Control"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "Use TCP connection (ControlPort)"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "Path:"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "Use Unix domain socket (ControlSocket)"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "Edit current torrc"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "NOTE: this will edit the currently loaded torrc"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "ControlSocket path doesn't exist."
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid ""
-"The specified Tor configuration file location contains characters that "
-"cannot be represented in your system's current 8-bit character encoding."
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid ""
-"The specified Tor data directory location contains characters that cannot be"
-" represented in your system's current 8-bit character encoding."
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "Warning"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "You changed torrc path, would you like to restart Tor?"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "Tor Configuration File (torrc);;All Files (*)"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "Select a file to use for Tor socket path"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "Configure ControlPort automatically"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid ""
-"Vidalia was unable to remove the Tor service.\n"
+msgid "Vidalia was unable to remove the Tor service.\n"
"\n"
"You may need to remove it manually."
msgstr ""
@@ -440,9 +395,7 @@ msgid "Remember my password"
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid ""
-"Vidalia has connected to a running Tor process that requires a password. "
-"Please enter your control password:"
+msgid "Vidalia has connected to a running Tor process that requires a password. Please enter your control password:"
msgstr ""
msgctxt "ControlSocket"
@@ -1158,10 +1111,6 @@ msgid "Zimbabwe"
msgstr ""
msgctxt "CountryInfo"
-msgid "Zaire"
-msgstr ""
-
-msgctxt "CountryInfo"
msgid "Albania"
msgstr ""
@@ -1257,55 +1206,6 @@ msgctxt "CountryInfo"
msgid "Taiwan"
msgstr ""
-msgctxt "CrashReportDialog"
-msgid "Submit a Crash Report"
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid "Vidalia encountered an error and needed to close"
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid "Restart Vidalia"
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid "Don't Restart"
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid "Unable to restart Vidalia"
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid ""
-"We were unable to automatically restart Vidalia. Please restart Vidalia "
-"manually."
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid "Please fill a ticket in:"
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid ""
-"<a "
-"href=\"https://trac.torproject.org/projects/tor/newticket\">https://trac.torproject.org/projects/tor/newticket</a>"
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid ""
-"A crash report has been created that you can send to the Vidalia developers "
-"to help identify and fix the problem. The submitted report does not contain "
-"any personally identifying information."
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid ""
-"with a description of what you were doing before the application crashed, "
-"along with the following files corresponding to the crash report:"
-msgstr ""
-
msgctxt "GeneralPage"
msgid "Executables (*.exe)"
msgstr ""
@@ -1323,6 +1223,10 @@ msgid "You must specify the name of your Tor executable."
msgstr ""
msgctxt "GeneralPage"
+msgid "The proxy arguments specified are not properly formatted."
+msgstr ""
+
+msgctxt "GeneralPage"
msgid "Start Vidalia when my system starts"
msgstr ""
@@ -1519,10 +1423,7 @@ msgid "Opening External Link"
msgstr ""
msgctxt "HelpTextBrowser"
-msgid ""
-"Vidalia can open the link you selected in your default Web browser. If your "
-"browser is not currently configured to use Tor then the request will not be "
-"anonymous."
+msgid "Vidalia can open the link you selected in your default Web browser. If your browser is not currently configured to use Tor then the request will not be anonymous."
msgstr ""
msgctxt "HelpTextBrowser"
@@ -1534,9 +1435,7 @@ msgid "Unable to Open Link"
msgstr ""
msgctxt "HelpTextBrowser"
-msgid ""
-"Vidalia was unable to open the selected link in your Web browser. You can "
-"still copy the URL and paste it into your browser."
+msgid "Vidalia was unable to open the selected link in your Web browser. You can still copy the URL and paste it into your browser."
msgstr ""
msgctxt "HelpTextBrowser"
@@ -1579,30 +1478,6 @@ msgctxt "LogEvent"
msgid "Unknown"
msgstr ""
-msgctxt "LogTreeItem"
-msgid "Debug"
-msgstr ""
-
-msgctxt "LogTreeItem"
-msgid "Info"
-msgstr ""
-
-msgctxt "LogTreeItem"
-msgid "Notice"
-msgstr ""
-
-msgctxt "LogTreeItem"
-msgid "Warning"
-msgstr ""
-
-msgctxt "LogTreeItem"
-msgid "Error"
-msgstr ""
-
-msgctxt "LogTreeItem"
-msgid "Unknown"
-msgstr ""
-
msgctxt "MainWindow"
msgid "Start Tor"
msgstr ""
@@ -1816,9 +1691,7 @@ msgid "Error Starting Tor"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Vidalia was unable to start Tor. Check your settings to ensure the correct "
-"name and location of your Tor executable is specified."
+msgid "Vidalia was unable to start Tor. Check your settings to ensure the correct name and location of your Tor executable is specified."
msgstr ""
msgctxt "MainWindow"
@@ -1854,9 +1727,7 @@ msgid "Cookie Authentication Required"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"The Tor software requires Vidalia to send the contents of an authentication "
-"cookie, but Vidalia was unable to find one."
+msgid "The Tor software requires Vidalia to send the contents of an authentication cookie, but Vidalia was unable to find one."
msgstr ""
msgctxt "MainWindow"
@@ -1876,9 +1747,7 @@ msgid "Error Registering for Events"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Vidalia was unable to register for some events. Many of Vidalia's features "
-"may be unavailable."
+msgid "Vidalia was unable to register for some events. Many of Vidalia's features may be unavailable."
msgstr ""
msgctxt "MainWindow"
@@ -1898,9 +1767,7 @@ msgid "Tor Update Available"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended. Please visit the Tor website to download the latest version."
+msgid "The currently installed version of Tor is out of date or no longer recommended. Please visit the Tor website to download the latest version."
msgstr ""
msgctxt "MainWindow"
@@ -1908,9 +1775,7 @@ msgid "Tor website: %1"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"All subsequent connections will appear to be different than your old "
-"connections."
+msgid "All subsequent connections will appear to be different than your old connections."
msgstr ""
msgctxt "MainWindow"
@@ -2002,21 +1867,15 @@ msgid "Password Reset Failed"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Vidalia tried to reset Tor's control password, but was not able to restart "
-"the Tor software. Please check your Task Manager to ensure there are no "
-"other Tor processes running."
+msgid "Vidalia tried to reset Tor's control password, but was not able to restart the Tor software. Please check your Task Manager to ensure there are no other Tor processes running."
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended."
+msgid "The currently installed version of Tor is out of date or no longer recommended."
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Would you like to check if a newer package is available for installation?"
+msgid "Would you like to check if a newer package is available for installation?"
msgstr ""
msgctxt "MainWindow"
@@ -2024,9 +1883,11 @@ msgid "Potentially Unsafe Connection"
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 ""
msgctxt "MainWindow"
@@ -2038,9 +1899,7 @@ msgid "Your software is up to date"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"There are no new Tor software packages available for your computer at this "
-"time."
+msgid "There are no new Tor software packages available for your computer at this time."
msgstr ""
msgctxt "MainWindow"
@@ -2056,52 +1915,52 @@ msgid "The following error occurred:"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Anything sent over this connection could be monitored. Please check your "
-"application's configuration and use only encrypted protocols, such as SSL, "
-"if possible."
-msgstr ""
-
-msgctxt "MainWindow"
msgid "failed (%1)"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
+msgid "Your relay is shutting down.\n"
"Click 'Stop' again to stop your relay now."
msgstr ""
msgctxt "MainWindow"
-msgid "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 ""
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 ""
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 ""
+
+msgctxt "MainWindow"
+msgid "File"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "About Vidalia"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Home"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Check For Updates"
msgstr ""
msgctxt "MessageLog"
@@ -2345,68 +2204,50 @@ 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"
+msgid "Always Save New Log Messages"
msgstr ""
msgctxt "MessageLog"
-msgid "Tor Status"
+msgid "Browse"
msgstr ""
msgctxt "MessageLog"
-msgid "Advanced"
+msgid "Enable automatically saving all new log messages to a file"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
+msgid "Automatically save new log messages to a file"
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 ""
msgctxt "MessageLog"
-msgid ""
-"Messages that only appear when \n"
+msgid "Messages that only appear when \n"
"something has gone wrong with Tor."
msgstr ""
msgctxt "MessageLog"
-msgid ""
-"Messages that appear infrequently \n"
+msgid "Messages that appear infrequently \n"
"during normal Tor operation and are \n"
"not considered errors, but you may \n"
"care about."
msgstr ""
msgctxt "MessageLog"
-msgid ""
-"Messages that appear frequently \n"
+msgid "Messages that appear frequently \n"
"during normal Tor operation."
msgstr ""
msgctxt "MessageLog"
-msgid ""
-"Hyper-verbose messages primarily of \n"
+msgid "Hyper-verbose messages primarily of \n"
"interest to Tor developers."
msgstr ""
msgctxt "MessageLog"
-msgid ""
-"Cannot write file %1\n"
+msgid "Cannot write file %1\n"
"\n"
"%2."
msgstr ""
@@ -2528,15 +2369,11 @@ msgid "Copy (Ctrl+C)"
msgstr ""
msgctxt "NetworkPage"
-msgid ""
-"You must specify both an IP address or hostname and a port number to "
-"configure Tor to use a proxy to access the Internet."
+msgid "You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet."
msgstr ""
msgctxt "NetworkPage"
-msgid ""
-"You must specify one or more ports to which your firewall allows you to "
-"connect."
+msgid "You must specify one or more ports to which your firewall allows you to connect."
msgstr ""
msgctxt "NetworkPage"
@@ -2556,10 +2393,18 @@ msgid "Proxy Settings"
msgstr ""
msgctxt "NetworkPage"
+msgid "HTTP Proxy:"
+msgstr ""
+
+msgctxt "NetworkPage"
msgid "Username:"
msgstr ""
msgctxt "NetworkPage"
+msgid "Use this proxy for HTTPS also"
+msgstr ""
+
+msgctxt "NetworkPage"
msgid "Password:"
msgstr ""
@@ -2588,9 +2433,7 @@ msgid "80, 443"
msgstr ""
msgctxt "NetworkPage"
-msgid ""
-"Check to encrypt directory requests and, optionally, use bridge relays to "
-"access the Tor network"
+msgid "Check to encrypt directory requests and, optionally, use bridge relays to access the Tor network"
msgstr ""
msgctxt "NetworkPage"
@@ -2602,10 +2445,18 @@ msgid "Bridge Settings"
msgstr ""
msgctxt "NetworkPage"
+msgid "The Tor software you are currently running does not support bridges. <br>Directory connections will still be encrypted."
+msgstr ""
+
+msgctxt "NetworkPage"
msgid "Add a Bridge:"
msgstr ""
msgctxt "NetworkPage"
+msgid "<a href=\"bridges.finding\">How do I find a bridge?</a>"
+msgstr ""
+
+msgctxt "NetworkPage"
msgid "Remove the selected bridges from the list"
msgstr ""
@@ -2626,43 +2477,13 @@ msgid "<a href=\"bridges.finding\">How can I find bridges?</a>"
msgstr ""
msgctxt "NetworkPage"
-msgid ""
-"No new bridges are currently available. You can either wait a while and try "
-"again, or try another method of finding new bridges."
+msgid "No new bridges are currently available. You can either wait a while and try again, or try another method of finding new bridges."
msgstr ""
msgctxt "NetworkPage"
msgid "Click Help to see other methods of finding new bridges."
msgstr ""
-msgctxt "NetworkPage"
-msgid "Address:"
-msgstr ""
-
-msgctxt "NetworkPage"
-msgid "Type:"
-msgstr ""
-
-msgctxt "NetworkPage"
-msgid "You must select the proxy type."
-msgstr ""
-
-msgctxt "NetworkPage"
-msgid "SOCKS 4"
-msgstr ""
-
-msgctxt "NetworkPage"
-msgid "SOCKS 5"
-msgstr ""
-
-msgctxt "NetworkPage"
-msgid "HTTP"
-msgstr ""
-
-msgctxt "NetworkPage"
-msgid "HTTP / HTTPS"
-msgstr ""
-
msgctxt "Policy"
msgid "accept"
msgstr ""
@@ -2816,15 +2637,11 @@ msgid "Bridge Support Unavailable"
msgstr ""
msgctxt "ServerPage"
-msgid ""
-"You have configured Tor to act as a bridge relay for censored users, but "
-"your version of Tor does not support bridges."
+msgid "You have configured Tor to act as a bridge relay for censored users, but your version of Tor does not support bridges."
msgstr ""
msgctxt "ServerPage"
-msgid ""
-"Please upgrade your Tor software or configure Tor to act as a normal Tor "
-"relay."
+msgid "Please upgrade your Tor software or configure Tor to act as a normal Tor relay."
msgstr ""
msgctxt "ServerPage"
@@ -2892,9 +2709,7 @@ msgid "Basic Settings"
msgstr ""
msgctxt "ServerPage"
-msgid ""
-"For Internet connections with fast download speed but slow upload, please "
-"list your upload speed here."
+msgid "For Internet connections with fast download speed but slow upload, please list your upload speed here."
msgstr ""
msgctxt "ServerPage"
@@ -2950,9 +2765,7 @@ msgid "Peak bandwidth rate limit"
msgstr ""
msgctxt "ServerPage"
-msgid ""
-"Your maximum bandwidth rate must be greater than or equal to your average "
-"bandwidth rate. Both values must be at least 20 KB/s."
+msgid "Your maximum bandwidth rate must be greater than or equal to your average bandwidth rate. Both values must be at least 20 KB/s."
msgstr ""
msgctxt "ServerPage"
@@ -3012,14 +2825,11 @@ msgid "Show help topic on exit policies"
msgstr ""
msgctxt "ServerPage"
-msgid ""
-"What Internet resources should users be able to access from your relay?"
+msgid "What Internet resources should users be able to access from your relay?"
msgstr ""
msgctxt "ServerPage"
-msgid ""
-"Tor will still block some outgoing mail and file sharing applications by "
-"default to reduce spam and other abuse."
+msgid "Tor will still block some outgoing mail and file sharing applications by default to reduce spam and other abuse."
msgstr ""
msgctxt "ServerPage"
@@ -3031,8 +2841,7 @@ msgid "Let others access your bridge by giving them this line:"
msgstr ""
msgctxt "ServerPage"
-msgid ""
-"This is the identity of your bridge relay that you can give to other people"
+msgid "This is the identity of your bridge relay that you can give to other people"
msgstr ""
msgctxt "ServerPage"
@@ -3048,9 +2857,7 @@ msgid "No clients have used your relay recently."
msgstr ""
msgctxt "ServerPage"
-msgid ""
-"Leave your relay running so clients have a better chance of finding and "
-"using it."
+msgid "Leave your relay running so clients have a better chance of finding and using it."
msgstr ""
msgctxt "ServerPage"
@@ -3062,9 +2869,7 @@ msgid "Vidalia was unable to retrieve your bridge's usage history."
msgstr ""
msgctxt "ServerPage"
-msgid ""
-"Tor returned an improperly formatted response when Vidalia requested your "
-"bridge's usage history."
+msgid "Tor returned an improperly formatted response when Vidalia requested your bridge's usage history."
msgstr ""
msgctxt "ServerPage"
@@ -3080,20 +2885,11 @@ msgid "<a href=\"#bridgeUsage\">Who has used my bridge?</a>"
msgstr ""
msgctxt "ServerPage"
-msgid "<a href=\"#bridgeHelp\">What's this?</a>"
-msgstr ""
-
-msgctxt "ServerPage"
-msgid "Automatically distribute my bridge address"
-msgstr ""
-
-msgctxt "ServerPage"
msgid "Mirror the Relay Directory"
msgstr ""
msgctxt "ServerPage"
-msgid ""
-"Email address at which you may be reached if there is a\n"
+msgid "Email address at which you may be reached if there is a\n"
"problem with your relay. You might also include your PGP or GPG fingerprint."
msgstr ""
@@ -3102,9 +2898,7 @@ msgid "Error while trying to unpublish all services"
msgstr ""
msgctxt "ServicePage"
-msgid ""
-"Please configure at least a service directory and a virtual port for each "
-"service you want to save. Remove the other ones."
+msgid "Please configure at least a service directory and a virtual port for each service you want to save. Remove the other ones."
msgstr ""
msgctxt "ServicePage"
@@ -3179,251 +2973,6 @@ msgctxt "ServicePage"
msgid "Created by Tor"
msgstr ""
-msgctxt "StatusEventWidget"
-msgid "Copy to Clipboard"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "The Tor Software is Running"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "You are currently running version \"%1\" of the Tor software."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "The Tor Software is not Running"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Click \"Start Tor\" in the Vidalia Control Panel to restart the Tor "
-"software. If Tor exited unexpectedly, select the \"Advanced\" tab above for "
-"details about any errors encountered."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"You are currently running version \"%1\" of the Tor software, which is no "
-"longer recommended. Please upgrade to the most recent version of the "
-"software, which may contain important security, reliability and performance "
-"fixes."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"You are currently running version \"%1\" of the Tor software, which may no "
-"longer work with the current Tor network. Please upgrade to the most recent "
-"version of the software, which may contain important security, reliability "
-"and performance fixes."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Your Tor Software is Out-of-date"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Connected to the Tor Network"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"We were able to successfully establish a connection to the Tor network. You "
-"can now configure your applications to use the Internet anonymously."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Tor Software Error"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"The Tor software encountered an internal bug. Please report the following "
-"error message to the Tor developers at bugs.torproject.org: \"%1\""
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Tor has determined that your computer's clock may be set to %1 seconds in "
-"the past compared to the source \"%2\". If your clock is not correct, Tor "
-"will not be able to function. Please verify your computer displays the "
-"correct time."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Tor has determined that your computer's clock may be set to %1 seconds in "
-"the future compared to the source \"%2\". If your clock is not correct, Tor "
-"will not be able to function. Please verify your computer displays the "
-"correct time."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Your Computer's Clock is Potentially Incorrect"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"One of the applications on your computer may have attempted to make an "
-"unencrypted connection through Tor to port %1. Sending unencrypted "
-"information over the Tor network is dangerous and not recommended. For your "
-"protection, Tor has automatically closed this connection."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"One of the applications on your computer may have attempted to make an "
-"unencrypted connection through Tor to port %1. Sending unencrypted "
-"information over the Tor network is dangerous and not recommended."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Potentially Dangerous Connection!"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"One of your applications established a connection through Tor to \"%1\" "
-"using a protocol that may leak information about your destination. Please "
-"ensure you configure your applications to use only SOCKS4a or SOCKS5 with "
-"remote hostname resolution."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Unknown SOCKS Protocol"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"One of your applications tried to establish a connection through Tor using a"
-" protocol that Tor does not understand. Please ensure you configure your "
-"applications to use only SOCKS4a or SOCKS5 with remote hostname resolution."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Invalid Destination Hostname"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"One of your applications tried to establish a connection through Tor to "
-"\"%1\", which Tor does not recognize as a valid hostname. Please check your "
-"application's configuration."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "External IP Address Changed"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Tor has determined your relay's public IP address is currently %1%2. If that"
-" is not correct, please consider setting the 'Address' option in your "
-"relay's configuration."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "DNS Hijacking Detected"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Tor detected that your DNS provider is providing false responses for domains"
-" that do not exist. Some ISPs and other DNS providers, such as OpenDNS, are "
-"known to do this in order to display their own search or advertising pages."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Tor detected that your DNS provider is providing false responses for well "
-"known domains. Since clients rely on Tor network relays to provide accurate "
-"DNS repsonses, your relay will not be configured as an exit relay."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Checking Server Port Reachability"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Tor is trying to determine if your relay's server port is reachable from the"
-" Tor network by connecting to itself at %1:%2. This test could take several "
-"minutes."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Server Port Reachability Test Successful!"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Your relay's server port is reachable from the Tor network!"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Server Port Reachability Test Failed"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Your relay's server port is not reachable by other Tor clients. This can "
-"happen if you are behind a router or firewall that requires you to set up "
-"port forwarding. If %1:%2 is not your correct IP address and server port, "
-"please check your relay's configuration."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Checking Directory Port Reachability"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Tor is trying to determine if your relay's directory port is reachable from "
-"the Tor network by connecting to itself at %1:%2. This test could take "
-"several minutes."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Directory Port Reachability Test Successful!"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Your relay's directory port is reachable from the Tor network!"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Directory Port Reachability Test Failed"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Your relay's directory port is not reachable by other Tor clients. This can "
-"happen if you are behind a router or firewall that requires you to set up "
-"port forwarding. If %1:%2 is not your correct IP address and directory port,"
-" please check your relay's configuration."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Relay Descriptor Rejected"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Your relay's descriptor, which enables clients to connect to your relay, was"
-" rejected by the directory server at %1:%2. The reason given was: %3"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Your Relay is Online"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Your relay is now online and available for Tor clients to use. You should "
-"see an increase in network traffic shown by the Bandwidth Graph within a few"
-" hours as more clients learn about your relay. Thank you for contributing to"
-" the Tor network!"
-msgstr ""
-
msgctxt "Stream"
msgid "New"
msgstr ""
@@ -3476,68 +3025,6 @@ msgctxt "TorSettings"
msgid "Failed to hash the control password."
msgstr ""
-msgctxt "TorrcDialog"
-msgid "Editing torrc"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid ""
-"Save settings. If unchecked it will only apply settings to the current Tor "
-"instance."
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Cut"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Copy"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Paste"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Undo"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Redo"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Select All"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Apply all"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Apply selection only"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Error connecting to Tor"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Selection is empty. Please select some text, or check \"Apply all\""
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Error at line %1: \"%2\""
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Error"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "An error ocurred while opening torrc file"
-msgstr ""
-
msgctxt "UPNPControl"
msgid "Success"
msgstr ""
@@ -3595,15 +3082,11 @@ msgid "Testing Universal Plug & Play Support"
msgstr ""
msgctxt "UpdateProcess"
-msgid ""
-"Vidalia was unable to check for available software updates because it could "
-"not find '%1'."
+msgid "Vidalia was unable to check for available software updates because it could not find '%1'."
msgstr ""
msgctxt "UpdateProcess"
-msgid ""
-"Vidalia was unable to check for available software updates because Tor's "
-"update process exited unexpectedly."
+msgid "Vidalia was unable to check for available software updates because Tor's update process exited unexpectedly."
msgstr ""
msgctxt "UpdateProgressDialog"
@@ -3759,10 +3242,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 ""
@@ -3775,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 ""
@@ -3812,5 +3290,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 8acc58e..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:
-# 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-02-14 09:46+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"
@@ -202,7 +199,9 @@ msgctxt "QFileDialog"
msgid ""
"%1 already exists.\n"
"Do you want to replace it?"
-msgstr "%1 ja existeix.\nVoleu reemplaçar-lo?"
+msgstr ""
+"%1 ja existeix.\n"
+"Voleu reemplaçar-lo?"
#: qfiledialog.cpp:1690
msgctxt "QFileDialog"
@@ -210,7 +209,10 @@ msgid ""
"%1\n"
"File not found.\n"
"Please verify the correct file name was given."
-msgstr "%1\nFitxer no trobat.\nSi us plau, verifiqueu que heu introduït el nom correcte."
+msgstr ""
+"%1\n"
+"Fitxer no trobat.\n"
+"Si us plau, verifiqueu que heu introduït el nom correcte."
#: qdirmodel.cpp:833
msgctxt "QFileDialog"
@@ -240,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"
@@ -268,168 +270,168 @@ msgid ""
"%1\n"
"Directory not found.\n"
"Please verify the correct directory name was given."
-msgstr "%1\n\nDirectori no trobat.\nSi us plau, verifiqueu que s'ha proporcionat un nom de directori correcte."
+msgstr ""
#: qfiledialog.cpp:2281
msgctxt "QFileDialog"
msgid ""
"'%1' is write protected.\n"
"Do you want to delete it anyway?"
-msgstr "'%1' està protegit per escriptura.\nEl desitgeu suprimir igualment?"
+msgstr ""
#: 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"
msgid ""
"<b>The name \"%1\" can not be used.</b><p>Try using another name, with fewer"
" characters or no punctuations marks."
-msgstr "<b>No es pot utilitzar el nom \"%1\".</b><p>Intenteu utilitzar un altre nom, amb menys caracters o sense marques de puntuació."
+msgstr ""
#: 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 8d013ac..fd1a754 100755
--- a/src/vidalia/i18n/po/ca/vidalia_ca.po
+++ b/src/vidalia/i18n/po/ca/vidalia_ca.po
@@ -1,14 +1,11 @@
#
-# Translators:
-# Gerard Farràs Ballabriga <>, 2012.
-# Josep Sànchez <papapep at gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2012-03-21 17:52+0000\n"
-"PO-Revision-Date: 2012-03-22 08:52+0000\n"
-"Last-Translator: Josep Sànchez <papapep at gmail.com>\n"
+"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"
@@ -19,124 +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."
+msgstr ""
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"
+msgstr ""
msgctxt "AdvancedPage"
msgid "Tor Control"
@@ -195,993 +192,974 @@ msgid "Select a file to use for Tor socket path"
msgstr ""
msgctxt "AdvancedPage"
-msgid "Configure ControlPort automatically"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid ""
-"You've checked the autoconfiguration option for the ControlPort, but "
-"provided no Data Directory. Please add one, or uncheck the \"Configure "
-"ControlPort automatically\" option."
-msgstr ""
-
-msgctxt "AdvancedPage"
msgid ""
"Vidalia was unable to remove the Tor service.\n"
"\n"
"You may need to remove it manually."
-msgstr "Vidalia ha estat incapaç de suprimir el servei del Tor.\n\nHaureu de suprimirlo manualment."
+msgstr ""
msgctxt "AppearancePage"
msgid "Language"
-msgstr "Llengua"
+msgstr ""
msgctxt "AppearancePage"
msgid "Choose the language used in Vidalia"
-msgstr "Escolliu l'idioma utilitzat a Vidalia"
-
-msgctxt "AppearancePage"
-msgid "Style"
-msgstr "Estil"
-
-msgctxt "AppearancePage"
-msgid "Choose Vidalia's interface style"
-msgstr "Escolliu l'estil per a la interfície de Vidalia"
-
-msgctxt "AppearancePage"
-msgid "Vidalia was unable to load the selected language translation."
-msgstr "Vidalia ha estat incapaç de carregar el fitxer de llengua especificat."
-
-msgctxt "AppearancePage"
-msgid ""
-"System Icon Preferences (changes will take effect when you restart Vidalia)"
msgstr ""
msgctxt "AppearancePage"
-msgid "Show the Tray Icon and Dock Icon (default)"
+msgid "Style"
msgstr ""
msgctxt "AppearancePage"
-msgid "Hide the Tray Icon"
+msgid "Choose Vidalia's interface style"
msgstr ""
msgctxt "AppearancePage"
-msgid "Hide the Dock Icon"
+msgid "Vidalia was unable to load the selected language translation."
msgstr ""
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"
+msgstr ""
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 "Problem connecting to Tor"
+msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Password Required"
-msgstr "Contrasenya requerida"
+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:"
-msgstr "Vidalia s'ha connectat amb un procés de Tor que requereix contrasenya. Si us plau, inseriu la contrasenya de control:"
+"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 "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"
-msgstr "Palau"
+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"
@@ -1189,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"
@@ -1292,6 +1270,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 ""
@@ -1307,303 +1303,292 @@ msgctxt "CrashReportDialog"
msgid ""
"We were unable to automatically restart Vidalia. Please restart Vidalia "
"manually."
-msgstr "Hem estat incapaços de reiniciar Vidalia de manera automàtica. Si us plau, reinicieu Vidalia manualment."
-
-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"
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 ""
"Vidalia can open the link you selected in your default Web browser. If your "
"browser is not currently configured to use Tor then the request will not be "
"anonymous."
-msgstr "Vidalia pot obrir l'enllaç que heu seleccionat en el seu navegador per defecte. Si el vostre navegador no està actualment configurat per a utilitzar el Tor, llavors la petició no podrà ser anònima"
+msgstr ""
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."
+msgstr ""
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"
@@ -1611,7 +1596,7 @@ msgstr ""
msgctxt "LogTreeItem"
msgid "Info"
-msgstr "Info"
+msgstr ""
msgctxt "LogTreeItem"
msgid "Notice"
@@ -1619,163 +1604,135 @@ 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"
+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 "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"
-msgstr "S'està demanant informació del relé"
+msgstr ""
msgctxt "MainWindow"
msgid "Loading relay information"
-msgstr "S'està carregant informació del relé"
+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"
+msgstr ""
msgctxt "MainWindow"
msgid "miscellaneous"
-msgstr "miscel·lània"
+msgstr ""
msgctxt "MainWindow"
msgid "identity mismatch"
@@ -1783,348 +1740,252 @@ msgstr ""
msgctxt "MainWindow"
msgid "done"
-msgstr "fet"
+msgstr ""
msgctxt "MainWindow"
msgid "connection refused"
-msgstr "connexió refusada"
+msgstr ""
msgctxt "MainWindow"
msgid "connection timeout"
-msgstr "S'ha excedit el temps d'espera de connexió"
+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."
+msgstr ""
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."
+msgstr ""
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ó."
+msgstr ""
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ó."
+msgstr ""
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."
+msgstr ""
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."
+msgstr ""
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."
+msgstr ""
msgctxt "MainWindow"
msgid ""
"The currently installed version of Tor is out of date or no longer "
"recommended."
-msgstr "La versió instal·lada del Tor està desactualitzada i ja no està recomanada."
+msgstr ""
msgctxt "MainWindow"
msgid ""
"Would you like to check if a newer package is available for installation?"
-msgstr "Desitgeu revisar si un paquet més nou està disponible per a ser instal·lat?"
+msgstr ""
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."
+msgstr ""
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."
+msgstr ""
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."
+msgstr ""
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 ""
"Anything sent over this connection could be monitored. Please check your "
"application's configuration and use only encrypted protocols, such as SSL, "
"if possible."
-msgstr "Tot el que s'envïi per aquesta connexió serà monitoritzat. Si us plau, reviseu la configuració de la vostra aplicació i utilitzeu només protocols xifrats, com SSL."
-
-msgctxt "MainWindow"
-msgid "Bootstrapping torrc from %1 to %2"
msgstr ""
msgctxt "MainWindow"
-msgid "(probably Telnet)"
+msgid "toolBar"
msgstr ""
msgctxt "MainWindow"
-msgid "(probably an email client)"
+msgid "Start"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"One of your applications %1 appears to be making a potentially unencrypted "
-"and unsafe connection to port %2."
+msgid "Stop"
msgstr ""
msgctxt "MainWindow"
-msgid "failed (%1)"
-msgstr "fallit (%1)"
+msgid "Restart"
+msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
-msgstr "El vostre relé s'està tancant.\nFeu clic un altre cop a \"Atura\" per a aturar el relé."
+msgid "Reload Tor's config"
+msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Vidalia can't find out how to talk to Tor because it can't access this file: %1\n"
-"\n"
-"Here's the last error message:\n"
-"%2"
+msgid "Actions"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"It seems Tor has stopped running since Vidalia started it.\n"
-"\n"
-"See the Advanced Message Log for more information."
+msgid "Bootstrapping torrc from %1 to %2"
msgstr ""
msgctxt "MainWindow"
@@ -2139,275 +2000,299 @@ msgid ""
"Vidalia detected that the Tor software exited unexpectedly.\n"
"\n"
"Please check the message log for recent warning or error messages."
-msgstr "Vidalia ha detectat que el programari Tor ha abortat inesperadament.\n\nSi us plau, reviseu el fitxer de registre per a avisos recents o missatges d'error."
+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 ""
+
+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 "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."
-msgstr "Vidalia no ha pogut el fitxer de registre especificat."
+msgstr ""
msgctxt "MessageLog"
msgid "Log Filename Required"
-msgstr "Cal especificar un nom de fitxer de registre"
+msgstr ""
msgctxt "MessageLog"
msgid "You must enter a filename to be able to save log messages to a file."
-msgstr "Heu d'introduir un nom de fitxer per a poder-hi desar els missatges de registre."
+msgstr ""
msgctxt "MessageLog"
msgid "Select Log File"
-msgstr "Trieu un fitxer de registre"
+msgstr ""
msgctxt "MessageLog"
msgid "Save Log Messages"
-msgstr "Desa els missatges de registre"
+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"
-msgstr "Cerca al registre de missatges"
+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."
-msgstr "S'han trobat 0 coincidències per la cerca"
+msgstr ""
msgctxt "MessageLog"
msgid "Message Log"
-msgstr "Registre de missatges"
+msgstr ""
msgctxt "MessageLog"
msgid "Message Filters..."
-msgstr "Filtres de missatges..."
+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)"
-msgstr "Esborreu tots els missatges del registre de missatges (Ctrl+E)"
+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"
-msgstr "Ajusteu els paràmetres del registre"
+msgstr ""
msgctxt "MessageLog"
msgid "Ctrl+T"
-msgstr "Ctrl+T"
+msgstr ""
msgctxt "MessageLog"
msgid "Help"
-msgstr "Ajuda"
+msgstr ""
msgctxt "MessageLog"
msgid "Show the help browser"
-msgstr "Mostra el navegador de l'ajuda"
+msgstr ""
msgctxt "MessageLog"
msgid "F1"
-msgstr "F1"
+msgstr ""
msgctxt "MessageLog"
msgid "Close"
-msgstr "Tanca"
+msgstr ""
msgctxt "MessageLog"
msgid "Close the Message Log"
-msgstr "Tanca el registre de missatges"
+msgstr ""
msgctxt "MessageLog"
msgid "Esc"
-msgstr "Esc"
+msgstr ""
msgctxt "MessageLog"
msgid "Find"
-msgstr "Cerca"
+msgstr ""
msgctxt "MessageLog"
msgid "Find all messages containing the search text (Ctrl+F)"
-msgstr "Cerca tots els missatges que continguin el text (Ctrl+F)"
+msgstr ""
msgctxt "MessageLog"
msgid "Ctrl+F"
-msgstr "Ctrl+F"
+msgstr ""
msgctxt "MessageLog"
msgid "Time"
-msgstr "Temps"
+msgstr ""
msgctxt "MessageLog"
msgid "Type"
-msgstr "Tipus"
+msgstr ""
msgctxt "MessageLog"
msgid "Message"
-msgstr "Missatge"
+msgstr ""
msgctxt "MessageLog"
msgid "Saves the current Message Log settings"
-msgstr "Desa els paràmetres actuals del registre de missatges"
+msgstr ""
msgctxt "MessageLog"
msgid "Save Settings"
-msgstr "Desa els paràmetres"
+msgstr ""
msgctxt "MessageLog"
msgid "Cancels changes made to settings"
-msgstr "Desfès els canvis fets als paràmetres"
+msgstr ""
msgctxt "MessageLog"
msgid "Cancel"
-msgstr "Cancel·la"
+msgstr ""
msgctxt "MessageLog"
msgid "Message Filter"
-msgstr "Filtre de missatges"
+msgstr ""
msgctxt "MessageLog"
msgid "Error"
-msgstr "Error"
+msgstr ""
msgctxt "MessageLog"
msgid "Warning"
-msgstr "Advertència"
+msgstr ""
msgctxt "MessageLog"
msgid "Notice"
-msgstr "Avís"
+msgstr ""
msgctxt "MessageLog"
msgid "Info"
-msgstr "Informació"
+msgstr ""
msgctxt "MessageLog"
msgid "Debug"
-msgstr "Depura"
+msgstr ""
msgctxt "MessageLog"
msgid "Message Log History"
-msgstr "Històric del registre de missatges"
+msgstr ""
msgctxt "MessageLog"
msgid "Number of messages to display in the message log window"
-msgstr "Nombre de missatges a mostrar a la finestra del registre de missatges"
+msgstr ""
msgctxt "MessageLog"
msgid "messages"
-msgstr "missatges"
+msgstr ""
msgctxt "MessageLog"
msgid "Browse"
-msgstr "Navega"
+msgstr ""
msgctxt "MessageLog"
msgid "Enable automatically saving all new log messages to a file"
-msgstr "Habilita el desament automàtic a un fitxer dels missatges de registre "
+msgstr ""
msgctxt "MessageLog"
msgid "Automatically save new log messages to a file"
-msgstr "Desa automàticament a fitxer els nous missatges de registre"
-
-msgctxt "MessageLog"
-msgid "Basic"
-msgstr "Bàsic"
-
-msgctxt "MessageLog"
-msgid "Tor Status"
-msgstr "Estat del Tor"
+msgstr ""
msgctxt "MessageLog"
-msgid "Advanced"
-msgstr "Avançat"
+msgid "Always Save New Log Messages"
+msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
-msgstr "Desa sempre els missatges de registre nous"
+msgid "toolbar"
+msgstr ""
msgctxt "MessageLog"
msgid ""
@@ -2433,7 +2318,7 @@ msgctxt "MessageLog"
msgid ""
"Messages that appear frequently \n"
"during normal Tor operation."
-msgstr "Missatges que apareixen sovient\ndurant l'operació normal del Tor"
+msgstr ""
msgctxt "MessageLog"
msgid ""
@@ -2446,15 +2331,11 @@ msgid ""
"Cannot write file %1\n"
"\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"
+msgstr ""
msgctxt "NetViewer"
msgid "Refresh"
-msgstr "Refresca"
+msgstr ""
msgctxt "NetViewer"
msgid "Refresh the list of Tor relays and connections"
@@ -2462,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"
@@ -2526,75 +2407,99 @@ msgstr ""
msgctxt "NetViewer"
msgid "Ctrl+Z"
-msgstr "Ctrl+Z"
+msgstr ""
+
+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 "Relay Not Found"
+msgid "Ctrl+F"
msgstr ""
msgctxt "NetViewer"
-msgid "No details on the selected relay are available."
+msgid "Network Map"
msgstr ""
msgctxt "NetViewer"
-msgid "Unknown"
-msgstr "Desconegut"
+msgid "Relay"
+msgstr ""
msgctxt "NetViewer"
-msgid "Full Screen"
-msgstr "Pantalla completa"
+msgid "Connection"
+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"
+msgid "Status"
+msgstr ""
-msgctxt "NetViewer"
-msgid "Ctrl+F"
-msgstr "Ctrl+F"
+msgctxt "NetworkPage"
+msgid "Invalid Bridge"
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "The specified bridge identifier is not valid."
+msgstr ""
msgctxt "NetworkPage"
msgid "Copy (Ctrl+C)"
-msgstr "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."
+msgstr ""
msgctxt "NetworkPage"
msgid ""
"You must specify one or more ports to which your firewall allows you to "
"connect."
-msgstr "Heu d'especificar un o més ports del vostre tallafocs per tal que us permeti connectar-vos."
+msgstr ""
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"
+msgstr ""
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"
@@ -2602,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 ""
@@ -2624,41 +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."
+msgstr ""
msgctxt "NetworkPage"
msgid "Click Help to see other methods of finding new bridges."
@@ -2666,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 / HTTPS"
-msgstr "HTTP / HTTPS"
+msgid "HTTP"
+msgstr ""
msgctxt "NetworkPage"
-msgid "You must specify one or more bridges."
+msgid "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:"
@@ -2734,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"
@@ -2762,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:"
@@ -2794,11 +2699,11 @@ msgstr ""
msgctxt "RouterInfoDialog"
msgid "Contact:"
-msgstr "Contacte:"
+msgstr ""
msgctxt "RouterInfoDialog"
msgid "Last Updated:"
-msgstr "Darrera actualització:"
+msgstr ""
msgctxt "RouterInfoDialog"
msgid "Descriptor"
@@ -2806,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"
@@ -2830,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"
@@ -2882,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"
@@ -2898,53 +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"
+msgstr ""
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í."
+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 "Personalitzat"
+msgstr ""
msgctxt "ServerPage"
msgid "Select the entry that most closely resembles your Internet connection"
@@ -2952,27 +2857,27 @@ msgstr ""
msgctxt "ServerPage"
msgid "Show help topic on bandwidth rate limits"
-msgstr "Mostra el tema d'ajuda sobre els límits en la velocitat d'amplada de banda"
+msgstr ""
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 ""
@@ -2982,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"
@@ -3010,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"
@@ -3066,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."
@@ -3080,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."
@@ -3094,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>"
@@ -3106,18 +3011,18 @@ 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 for the Tor network (exit relay)"
+msgid "Relay traffic inside the Tor network (non-exit relay)"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic inside the Tor network (non-exit relay)"
+msgid "Relay traffic for the Tor network (exit relay)"
msgstr ""
msgctxt "ServerPage"
@@ -3142,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"
@@ -3154,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"
@@ -3178,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"
@@ -3206,34 +3107,34 @@ msgstr ""
msgctxt "ServicePage"
msgid "Browse in local file system and choose directory for selected service"
-msgstr "Navega pel sistema de fitxers local i esculliu un directori pel servei seleccionat"
+msgstr ""
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 ""
"Click \"Start Tor\" in the Vidalia Control Panel to restart the Tor "
"software. If Tor exited unexpectedly, select the \"Advanced\" tab above for "
"details about any errors encountered."
-msgstr "Feu clic a \"Inicia el Tor\" en el panell de control de Vidalia per a reiniciar el programari. En el cas que el Tor aborti de manera inesperada, seleccioneu \"Avançat\" per a conéixer més detalls sobre els errors"
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
@@ -3241,7 +3142,7 @@ msgid ""
"longer recommended. Please upgrade to the most recent version of the "
"software, which may contain important security, reliability and performance "
"fixes."
-msgstr "Esteu executant la versió \"%1\" del Tor, la qual ja no està suportada. Si us plau, actualitzeu-vos a la versió més recent, que conté correccions relacionades amb la seguretat, la fiabilitat i el rendiment. "
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
@@ -3249,31 +3150,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 "Esteu executant la versió \"%1\" del Tor, que probablement ja no funciona amb la xarxa de Tor actual. Si us plau, actualitze-vos a la versió més recent, que conté correccions relacionades amb la seguretat, la fibilitat i el rendiment."
+msgstr ""
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."
+msgstr ""
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\""
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
@@ -3281,7 +3182,7 @@ msgid ""
"the past compared to the source \"%2\". If your clock is not correct, Tor "
"will not be able to function. Please verify your computer displays the "
"correct time."
-msgstr "El Tor ha determinat que el rellotge del seu sistema està establert %1 seconds en el passat que el de la font de \"%2\". Si l'hora del seu rellotge no és correcta, el Tor no podrà funcionar correctament. Si us plau, verifiqueu que el seu sistema tingui l'hrora correcta."
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
@@ -3289,11 +3190,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 "El Tor ha determinat que el rellotge del seu sistema està establert %1 seconds en el futur que el de la font de \"%2\". Si l'hora del seu rellotge no és correcta, el Tor no podrà funcionar correctament. Si us plau, verifiqueu que el seu sistema tingui l'hrora correcta."
+msgstr ""
msgctxt "StatusEventWidget"
msgid "Your Computer's Clock is Potentially Incorrect"
-msgstr "L'hora del seu sistema és potencialment incorrecta"
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
@@ -3301,18 +3202,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 les aplicacions del seu sistema ha intentat realitzar una connexió no xifrada al Tor a través del port %1. Enviar informació en clar a través de la xarxa Tor és perillós i no està recomanat. Per la seva protecció, el Tor ha tancat de manera automàtica aquesta connexió."
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
"One of the applications on your computer may have attempted to make an "
"unencrypted connection through Tor to port %1. Sending unencrypted "
"information over the Tor network is dangerous and not recommended."
-msgstr "Una de les aplicacions del seu sistema ha intentat realitzar una connexió no xifrada al Tor a través del port %1. Enviar informació en clar a través de la xarxa Tor és perillós i no està recomanat. "
+msgstr ""
msgctxt "StatusEventWidget"
msgid "Potentially Dangerous Connection!"
-msgstr "Connexió potencialment perillosa!"
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
@@ -3320,33 +3221,33 @@ msgid ""
"using a protocol that may leak information about your destination. Please "
"ensure you configure your applications to use only SOCKS4a or SOCKS5 with "
"remote hostname resolution."
-msgstr "Una de les vostres aplicacions ha establert una connexió a través del Tor a \"%1\" utilitzant un protocol que podria proporcionar informació sobre la seva destinació. Si us plau, assegureu-vos que heu configurat les vostres aplicacions per tal d'utilitzar solament SOCKS4 i SOCKS5 amb resolució d'objectiu remot."
+msgstr ""
msgctxt "StatusEventWidget"
msgid "Unknown SOCKS Protocol"
-msgstr "Protocol SOCKS desconegut"
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
"One of your applications tried to establish a connection through Tor using a"
" protocol that Tor does not understand. Please ensure you configure your "
"applications to use only SOCKS4a or SOCKS5 with remote hostname resolution."
-msgstr "Una de les vostres aplicacions ha establert una connexió a través del Tor emprant un protocol que aquest no compren. Si us plau, assegureu-vos que heu configurat les vostres aplicacions per tal d'utilitzar solament SOCKS4 i SOCKS5 amb resolució d'objectiu remot."
+msgstr ""
msgctxt "StatusEventWidget"
msgid "Invalid Destination Hostname"
-msgstr "Destinació d'objectiu invàlida"
+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 "Una de les vostres aplicacions ha intentat establir una connexió via el Tor a \"%1\", que aquest no reconeix com a objectiu vàlid. Si us plau, reviseu la configuració de la seva aplicació."
+msgstr ""
msgctxt "StatusEventWidget"
msgid "External IP Address Changed"
-msgstr "L'adreça IP externa s'ha canviat"
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
@@ -3357,21 +3258,21 @@ msgstr ""
msgctxt "StatusEventWidget"
msgid "DNS Hijacking Detected"
-msgstr "Detecció de DNS Hijacking"
+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 "El Tor ha detectat que el seu proveïdor de DNS està proveïnt de respostes falses per dominis que no existeixen. És conegut que alguns ISPs i d'altres proveïdors de DNS, com per exemple, OpenDNS, fan això per tal de mostrar les seves pròpies pàgines de cerca o de publicitat."
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
"Tor detected that your DNS provider is providing false responses for well "
"known domains. Since clients rely on Tor network relays to provide accurate "
"DNS repsonses, your relay will not be configured as an exit relay."
-msgstr "El Tor ha detectat que el seu proveïdor de DNS està proveïnt de respostes falses per a dominis reconeguts. Since clients rely on Tor network relays to provide accurate DNS repsonses, your relay will not be configured as an exit relay."
+msgstr ""
msgctxt "StatusEventWidget"
msgid "Checking Server Port Reachability"
@@ -3457,57 +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."
+msgstr ""
msgctxt "TorrcDialog"
msgid "Editing torrc"
@@ -3571,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"
@@ -3585,7 +3532,7 @@ msgstr ""
msgctxt "UPNPControl"
msgid "WSAStartup failed"
-msgstr "WSAStartup ha fallat"
+msgstr ""
msgctxt "UPNPControl"
msgid "Failed to add a port mapping"
@@ -3601,7 +3548,7 @@ msgstr ""
msgctxt "UPNPControl"
msgid "Unknown error"
-msgstr "Error desconegut"
+msgstr ""
msgctxt "UPNPTestDialog"
msgid "Discovering UPnP-enabled devices"
@@ -3617,7 +3564,7 @@ msgstr ""
msgctxt "UPNPTestDialog"
msgid "Test completed successfully!"
-msgstr "El test ha estat completat correctament!"
+msgstr ""
msgctxt "UPNPTestDialog"
msgid "Testing UPnP Support"
@@ -3641,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..."
@@ -3673,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"
@@ -3685,7 +3632,7 @@ msgstr ""
msgctxt "UpdatesAvailableDialog"
msgid "Install"
-msgstr "Instal·la"
+msgstr ""
msgctxt "UpdatesAvailableDialog"
msgid "The following updated software packages are ready for installation:"
@@ -3693,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"
@@ -3729,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."
@@ -3792,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 ""
diff --git a/src/vidalia/i18n/po/cs/qt_cs.po b/src/vidalia/i18n/po/cs/qt_cs.po
index 5f207de..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:
-# 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: 2012-02-14 09:46+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"
@@ -202,7 +199,9 @@ msgctxt "QFileDialog"
msgid ""
"%1 already exists.\n"
"Do you want to replace it?"
-msgstr "%1 již existuje.\nPřejete si jej nahradit?"
+msgstr ""
+"%1 již existuje.\n"
+"Přejete si jej nahradit?"
#: qfiledialog.cpp:1690
msgctxt "QFileDialog"
@@ -210,12 +209,15 @@ msgid ""
"%1\n"
"File not found.\n"
"Please verify the correct file name was given."
-msgstr "%1\nSoubor nebyl nalezen.\nProsím ověřte, zda byl název souboru zadán správně."
+msgstr ""
+"%1\n"
+"Soubor nebyl nalezen.\n"
+"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"
@@ -230,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"
@@ -245,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"
@@ -268,14 +270,19 @@ msgid ""
"%1\n"
"Directory not found.\n"
"Please verify the correct directory name was given."
-msgstr "%1\nAdresář nebyl nalezen.\nProsím ověřte, zda bylo jméno adresáře zadáno správně."
+msgstr ""
+"%1\n"
+"Adresář nebyl nalezen.\n"
+"Prosím ověřte, zda bylo jméno adresáře zadáno správně."
#: qfiledialog.cpp:2281
msgctxt "QFileDialog"
msgid ""
"'%1' is write protected.\n"
"Do you want to delete it anyway?"
-msgstr "'%1' je chráněn proti přepisu.\nChcete jej smazat i tak?"
+msgstr ""
+"'%1' je chráněn proti přepisu.\n"
+"Chcete jej smazat i tak?"
#: qfiledialog.cpp:2286
msgctxt "QFileDialog"
@@ -315,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"
@@ -350,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"
@@ -365,14 +372,16 @@ 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"
msgid ""
"<b>The name \"%1\" can not be used.</b><p>Try using another name, with fewer"
" characters or no punctuations marks."
-msgstr "<b>Název \"%1\" nelze použít.</b><p>Zkuste použít jiný název s menším počtem znaků nebo bez zvláštních znaků."
+msgstr ""
+"<b>Název \"%1\" nelze použít.</b><p>Zkuste použít jiný název s menším počtem"
+" znaků nebo bez zvláštních znaků."
#: qfilesystemmodel.cpp:832
msgctxt "QFileSystemModel"
@@ -402,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"
@@ -432,4 +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 8328c25..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: 2012-03-21 17:52+0000\n"
-"PO-Revision-Date: 2012-03-22 08:51+0000\n"
-"Last-Translator: smejicisebestie <smejicisebestie at gmail.com>\n"
+"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"
@@ -43,7 +44,7 @@ msgstr "'%1' neni platna IP adresa."
msgctxt "AdvancedPage"
msgid ""
"You selected 'Password' authentication, but did not specify a password."
-msgstr "Jako způsob autentizace jste vybrali \"Heslo\", ale žádné heslo jste neurčili"
+msgstr ""
msgctxt "AdvancedPage"
msgid "Select Tor Configuration File"
@@ -67,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"
@@ -103,7 +104,7 @@ msgstr "Heslo"
msgctxt "AdvancedPage"
msgid "Randomly Generate"
-msgstr "Generováno Náhodně"
+msgstr "Náhodně vygenerované."
msgctxt "AdvancedPage"
msgid ":"
@@ -115,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"
@@ -131,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:"
@@ -151,31 +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"
@@ -183,25 +184,14 @@ 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"
-
-msgctxt "AdvancedPage"
-msgid ""
-"You've checked the autoconfiguration option for the ControlPort, but "
-"provided no Data Directory. Please add one, or uncheck the \"Configure "
-"ControlPort automatically\" option."
msgstr ""
msgctxt "AdvancedPage"
@@ -209,7 +199,7 @@ msgid ""
"Vidalia was unable to remove the Tor service.\n"
"\n"
"You may need to remove it manually."
-msgstr "Program Vidalie nemůže odebrat službu Tor.\n\n Musíte ji tedy odebrat ručně."
+msgstr ""
msgctxt "AppearancePage"
msgid "Language"
@@ -231,23 +221,6 @@ msgctxt "AppearancePage"
msgid "Vidalia was unable to load the selected language translation."
msgstr "Vidalia nebyl schopen načíst vybraný překlad."
-msgctxt "AppearancePage"
-msgid ""
-"System Icon Preferences (changes will take effect when you restart Vidalia)"
-msgstr ""
-
-msgctxt "AppearancePage"
-msgid "Show the Tray Icon and Dock Icon (default)"
-msgstr ""
-
-msgctxt "AppearancePage"
-msgid "Hide the Tray Icon"
-msgstr ""
-
-msgctxt "AppearancePage"
-msgid "Hide the Dock Icon"
-msgstr ""
-
msgctxt "BandwidthGraph"
msgid "Since:"
msgstr "Od:"
@@ -261,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"
@@ -304,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"
@@ -342,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"
@@ -390,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"
@@ -434,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"
@@ -450,25 +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 ""
+"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 "Remember my password"
-msgstr "Zapamatovat heslo"
+msgid ""
+"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 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:"
+"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."
@@ -872,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"
@@ -920,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"
@@ -1012,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"
@@ -1284,52 +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)"
@@ -1341,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"
@@ -1405,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."
@@ -1537,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"
@@ -1548,29 +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,80 +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 ""
msgctxt "MainWindow"
msgid "miscellaneous"
-msgstr "různý"
+msgstr ""
msgctxt "MainWindow"
msgid "identity mismatch"
-msgstr "nesouhlasí identita"
+msgstr ""
msgctxt "MainWindow"
msgid "done"
@@ -1786,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"
@@ -1817,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,89 +1801,77 @@ msgstr "Vidalia nemuze spustit Tor. Ujistete se, ze vase nastaveni identifikator
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"
+msgstr ""
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"
+msgstr ""
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."
+msgstr ""
msgctxt "MainWindow"
msgid "Tor website: %1"
-msgstr "Tor webová stránka: %1"
+msgstr ""
msgctxt "MainWindow"
msgid ""
@@ -1940,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"
@@ -1955,190 +1900,142 @@ msgid "Status"
msgstr "Status"
msgctxt "MainWindow"
-msgid "Vidalia Shortcuts"
-msgstr "Zkratky Vidalia"
+msgid "Password Reset Failed"
+msgstr ""
msgctxt "MainWindow"
-msgid "Setup Relaying"
-msgstr "Nastav Preposilani"
+msgid ""
+"The currently installed version of Tor is out of date or no longer "
+"recommended."
+msgstr ""
msgctxt "MainWindow"
-msgid "Set up a relay and help the network grow"
-msgstr "Vytvořte uzel a pomožte síťi růst"
+msgid ""
+"Would you like to check if a newer package is available for installation?"
+msgstr ""
msgctxt "MainWindow"
-msgid "View the Network"
-msgstr "Pohled na Sit"
+msgid "Potentially Unsafe Connection"
+msgstr ""
msgctxt "MainWindow"
-msgid "View a map of the Tor network"
-msgstr "Pohled na Mapu Site Tor"
+msgid ""
+"Tor has automatically closed your connection in order to protect your "
+"anonymity."
+msgstr ""
msgctxt "MainWindow"
-msgid "Use a New Identity"
-msgstr "Pouzit Novou Identitu"
+msgid "Update Failed"
+msgstr "Neuspesne"
msgctxt "MainWindow"
-msgid "Make subsequent connections appear new"
-msgstr "Vsechny dalsi pripojeni jako nove"
+msgid "Your software is up to date"
+msgstr ""
msgctxt "MainWindow"
-msgid "View recent bandwidth usage"
-msgstr "Zobrazit využití sítě"
+msgid ""
+"There are no new Tor software packages available for your computer at this "
+"time."
+msgstr ""
msgctxt "MainWindow"
-msgid "View log message history"
-msgstr "Zobrazit zprávy logu"
+msgid "Installation Failed"
+msgstr ""
msgctxt "MainWindow"
-msgid "View help documentation"
-msgstr "Dokumentace Napovedy"
+msgid "Vidalia was unable to install your software updates."
+msgstr "Vidalia neni schopna instalovat Tor jako sluzbu"
msgctxt "MainWindow"
-msgid "Configure Vidalia"
-msgstr "Nastavit Vidalii"
+msgid "The following error occurred:"
+msgstr ""
msgctxt "MainWindow"
-msgid "View version and license information"
-msgstr "Verze a licencni informace"
+msgid ""
+"One of your applications%1appears to be making a potentially unencrypted and"
+" unsafe connection to port %2."
+msgstr ""
msgctxt "MainWindow"
-msgid "Exit Vidalia"
-msgstr "Ukoncit Vidalia"
+msgid ""
+"Anything 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 "Show this window on startup"
-msgstr "Zobrazuj toto okno pri startu"
+msgid "toolBar"
+msgstr ""
msgctxt "MainWindow"
-msgid "Hide"
-msgstr "Schovat"
+msgid "Start"
+msgstr ""
msgctxt "MainWindow"
-msgid "Hide this window"
-msgstr "Schovat toto okno"
+msgid "Stop"
+msgstr ""
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"
+msgid "Restart"
+msgstr ""
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."
+msgid "Reload Tor's config"
+msgstr ""
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ů?"
+msgid "Actions"
+msgstr ""
msgctxt "MainWindow"
-msgid "Potentially Unsafe Connection"
-msgstr "Potencionálně nebezpečné připojení"
+msgid "Bootstrapping torrc from %1 to %2"
+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"
-
-msgctxt "MainWindow"
-msgid "Update Failed"
-msgstr "Neuspesne"
-
-msgctxt "MainWindow"
-msgid "Your software is up to date"
-msgstr "Váš software je zastaralý"
+"You are currently running a relay. Terminating your relay will 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 ""
-"There are no new Tor software packages available for your computer at this "
-"time."
-msgstr "Není k dispozici žádný Tor softwarový balíček "
-
-msgctxt "MainWindow"
-msgid "Installation Failed"
-msgstr "Instalace selhala"
-
-msgctxt "MainWindow"
-msgid "Vidalia was unable to install your software updates."
-msgstr "Vidalia neni schopna instalovat Tor jako sluzbu"
-
-msgctxt "MainWindow"
-msgid "The following error occurred:"
-msgstr "Objevila se následující chyba"
+"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."
-msgstr "Veškerá komunikace přes toto připojení může být monitorováno. Zkontrolujte nastavení aplikace a pokud možno používejte výhradně šifrovaný protokol jako je SSL"
-
-msgctxt "MainWindow"
-msgid "Bootstrapping torrc from %1 to %2"
-msgstr "Konfigurace připojení v torrc pomocí BOOTP od %1 do %2"
-
-msgctxt "MainWindow"
-msgid "(probably Telnet)"
-msgstr "(pravděpodobně Telnet)"
+"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 ""
-"One of your applications %1 appears to be making a potentially unencrypted "
-"and unsafe connection to port %2."
-msgstr "Zdá se že jedna z Vašich aplikací %1 komunikuje nešifrovaně a nebezpečně na portu %2."
+msgid ", probably Telnet,"
+msgstr ""
msgctxt "MainWindow"
-msgid "failed (%1)"
-msgstr "Selhání (%1)"
+msgid ", probably an email client,"
+msgstr ""
msgctxt "MainWindow"
msgid ""
"Your relay is shutting down.\n"
"Click 'Stop' again to stop your relay now."
-msgstr "Váš uzel se vypíná.\nKlikněte na 'Stop' znovu pro okamžité odpojení."
-
-msgctxt "MainWindow"
-msgid ""
-"Vidalia can't find out how to talk to Tor because it can't access this file: %1\n"
-"\n"
-"Here's the last error message:\n"
-"%2"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"It seems Tor has stopped running since Vidalia started it.\n"
-"\n"
-"See the Advanced Message Log for more information."
+msgid "Error reloading configuration"
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 "Máte právě spuštěný uzel. Jeho ukončením přerušíte všechna otevřená připojení klientů.\n\nPřejete si spojení s klienty ukončit a nechat jim čas nalézt nový uzel?"
-
-msgctxt "MainWindow"
-msgid ""
-"Vidalia detected that the Tor software exited unexpectedly.\n"
-"\n"
-"Please check the message log for recent warning or error messages."
-msgstr "Vidalia zaznamenala neočekávané ukončení Tor software.\n\nZkontrolujte poslední varovné a chybové zprávy v logu."
+msgid "Vidalia was unable to reload Tor's configuration."
+msgstr ""
msgctxt "MessageLog"
msgid "Error Setting Filter"
@@ -2393,32 +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ě \nkdy Tor nemůže nadále pokračovat."
+msgstr ""
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ě \nTor."
+msgstr ""
msgctxt "MessageLog"
msgid ""
@@ -2426,30 +2315,26 @@ msgid ""
"during normal Tor operation and are \n"
"not considered errors, but you may \n"
"care about."
-msgstr "Zprávy které se během normálního \nprovozu zřídka objevují a které nepředstavují \nchybu, nicméně měli by jste jim věnovat pozornost"
+msgstr ""
msgctxt "MessageLog"
msgid ""
"Messages that appear frequently \n"
"during normal Tor operation."
-msgstr "Zprávy které se objevují při běžném \n provou často"
+msgstr ""
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 ""
"Cannot write file %1\n"
"\n"
"%2."
-msgstr "Nelze zapisovat do souboru %1\n\n%2."
-
-msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr "Mapa sítě"
+msgstr ""
msgctxt "NetViewer"
msgid "Refresh"
@@ -2457,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"
@@ -2533,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"
@@ -2541,75 +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 ""
+
+msgctxt "NetworkPage"
+msgid "The specified bridge identifier is not valid."
+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"
+msgstr ""
msgctxt "NetworkPage"
msgid ""
"You must specify one or more ports to which your firewall allows you to "
"connect."
-msgstr "Musíte specifikovat jeden nebo více portů, které Váš firewall neblokuje"
+msgstr ""
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"
+msgstr ""
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"
@@ -2619,76 +2528,76 @@ msgctxt "NetworkPage"
msgid ""
"Check to encrypt directory requests and, optionally, use bridge relays to "
"access the Tor network"
-msgstr "Zkontrolujte že jste zakodovali požadavky a použijte mostové uzly k přístupu na internet"
+msgstr ""
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."
+msgstr ""
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 / HTTPS"
-msgstr "HTTP / HTTPS"
+msgid "HTTP"
+msgstr ""
msgctxt "NetworkPage"
-msgid "You must specify one or more bridges."
+msgid "HTTP / HTTPS"
msgstr ""
msgctxt "Policy"
@@ -2757,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:"
@@ -2801,7 +2710,7 @@ msgstr "Aktualizovano naposled:"
msgctxt "RouterInfoDialog"
msgid "Descriptor"
-msgstr "Ukazatel"
+msgstr ""
msgctxt "RouterListItem"
msgid "Offline"
@@ -2817,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"
@@ -2833,59 +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"
+msgstr ""
msgctxt "ServerPage"
msgid ""
"Please upgrade your Tor software or configure Tor to act as a normal Tor "
"relay."
-msgstr "Prosím upgradujte Váš Tor, nebo jej nastavte tak, aby se choval jako normální uzel"
+msgstr ""
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"
+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:"
@@ -2901,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:"
@@ -3038,13 +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"
+msgstr ""
msgctxt "ServerPage"
msgid "Exit Policies"
@@ -3052,30 +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"
+msgstr ""
msgctxt "ServerPage"
msgid "Bridge History"
@@ -3089,55 +2998,55 @@ msgctxt "ServerPage"
msgid ""
"Tor returned an improperly formatted response when Vidalia requested your "
"bridge's usage history."
-msgstr "Tor navrátil nesprávně formátovanou odpověď Viladie, když se dotaovala na historii vyzužití mostu"
+msgstr ""
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 for the Tor network (exit relay)"
+msgid "Relay traffic inside the Tor network (non-exit relay)"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic inside the Tor network (non-exit relay)"
+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\nobjevili problémy s uzlem. Měli by jste také váš PGP nebo GPG fingerprint."
+msgstr ""
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."
+msgstr ""
msgctxt "ServicePage"
msgid "Error"
@@ -3145,94 +3054,90 @@ 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"
+msgstr ""
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 ""
"Click \"Start Tor\" in the Vidalia Control Panel to restart the Tor "
"software. If Tor exited unexpectedly, select the \"Advanced\" tab above for "
"details about any errors encountered."
-msgstr "Ve Vidalia Ovládacím panelu klikněte na \"Start Tor\" pro restartování softwaru. Pokud Tor skončil neočekávaně, klikněte na \"Pokročilé\" a zobrazí se Vám informace o chybách"
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
@@ -3240,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 "Právě používáte program Tor ve verzi \"%1\" . Tato verze již není podporována. Prosím upgradujte software pro získání důležitých oprav."
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
@@ -3248,31 +3153,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 "Právě používáte program Tor ve verzi \"%1\" . Tato verze již není podporována. Prosím upgradujte software pro získání důležitých oprav."
+msgstr ""
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"
+msgstr ""
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\""
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
@@ -3280,7 +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 identifikoval, že vaše systémové hodiny jdou o %1 sekund opožděne oproti zdroji \"%2\". S nesprávně nastaveným časem nemůže Tor správně pracovat. Prosím ověřte správnost systémového času."
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
@@ -3288,11 +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 identifikoval, že vaše systémové hodiny jdou o %1 sekund napřed oproti zdroji \"%2\". S nesprávně nastaveným časem nemůže Tor správně pracovat. Prosím ověřte správnost systémového času."
+msgstr ""
msgctxt "StatusEventWidget"
msgid "Your Computer's Clock is Potentially Incorrect"
-msgstr "Nesprávný systémový čas"
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
@@ -3300,18 +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 "Jedna z aplikací na Vašem počítači se pokusila o nezašifrovanou komunikaci na portu %1. Posílání nezašifrovaných informací sítí Tor je nebezpečné. Pro Vaši ochranu Tor automaticky uzavřel spojení."
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
"One of the applications on your computer may have attempted to make an "
"unencrypted connection through Tor to port %1. Sending unencrypted "
"information over the Tor network is dangerous and not recommended."
-msgstr "Jedna z aplikací na Vašem počítači se pokusila o nezašifrovanou komunikaci na portu %1. Posílání nezašifrovaných informací sítí Tor je nebezpečné. Pro Vaši ochranu Tor automaticky uzavřel spojení."
+msgstr ""
msgctxt "StatusEventWidget"
msgid "Potentially Dangerous Connection!"
-msgstr "Potenciálně nebezpečné připojení!"
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
@@ -3319,81 +3224,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 "Jedna z Vašich aplikací navázala spojení přes Tor na \"%1\" používajíc protokol, který by prozradil informace o Vaší poloze. Ujistěte se že jste nastavil Vaše aplikace aby používali pouze SOCKS4a nebo SOCKS5 se remote hostname resolution."
+msgstr ""
msgctxt "StatusEventWidget"
msgid "Unknown SOCKS Protocol"
-msgstr "Neznámý SOCKS protokol"
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
"One of your applications tried to establish a connection through Tor using a"
" protocol that Tor does not understand. Please ensure you configure your "
"applications to use only SOCKS4a or SOCKS5 with remote hostname resolution."
-msgstr "Jedna z Vašich aplikací navázala spojení přes Tor používajíc protokol, který Tor nezna. Ujistěte se že jste nastavil Vaše aplikace aby používali pouze SOCKS4a nebo SOCKS5 se remote hostname resolution."
+msgstr ""
msgctxt "StatusEventWidget"
msgid "Invalid Destination Hostname"
-msgstr "Neplatný název cílového serveru"
+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 "Jedna z Vašich aplikací se pokouší spojit přes Tor na \"%1\", jehož hostname nepovažuje Tor za platné. Prosím zkontrolujte nastavení Vaší aplikace."
+msgstr ""
msgctxt "StatusEventWidget"
msgid "External IP Address Changed"
-msgstr "Externí IP adresa se změnila"
+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 určil Vaši veřejnou IP adresu na %1%2. Pokud to není správně, upravte hodnotu 'Adresa' v nastavení uzlu."
+msgstr ""
msgctxt "StatusEventWidget"
msgid "DNS Hijacking Detected"
-msgstr "Detekován DNS Hijacking"
+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 "Tor zaznamenal, že Váš DNS provider odesílá nesprávné odpovědi při hledání neexistujících domén. Někteří poskytovatelé DNS a internetu to dělají, aby uživateli podstrčili vlastní reklamy nebo vyhledávače."
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
"Tor detected that your DNS provider is providing false responses for well "
"known domains. Since clients rely on Tor network relays to provide accurate "
"DNS repsonses, your relay will not be configured as an exit relay."
-msgstr "Tor zaznamenal, že Váš DNS provider poskytuje nesprávné odpovědi u existujícíhc stránek. Vzhledem k tomu nebude Váš uzel nastaven jako výstupní."
+msgstr ""
msgctxt "StatusEventWidget"
msgid "Checking Server Port Reachability"
-msgstr "Kontrola dostupnosti portů"
+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 zkouší jestli je Váš uzel přístupný ze sítě Tor přihlášením sám sebe na %1:%2. Test může trvat několik minut."
+msgstr ""
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 ""
@@ -3401,30 +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 "Váš uzlový server není dostupný klientům ze sítě Tor. To může být pokud jste za routerem, nebo firewallem kvůli kterému je nutné porty přesměrovat. Pokud toto není Vaše IP adresa %1:%2 i a port serveru, zkontrolujte nastavení Vašeho uzlu"
+msgstr ""
msgctxt "StatusEventWidget"
msgid "Checking Directory Port Reachability"
-msgstr "Kontrola Dostupnosti adresářového portu"
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
"Tor is trying to determine if your relay's directory port is reachable from "
"the Tor network by connecting to itself at %1:%2. This test could take "
"several minutes."
-msgstr "Tor zkouší jestli je Váš adresářový port na uzlu přístupný ze sítě Tor přihlášením sám sebe na %1:%2. Test může trvat několik minut."
+msgstr ""
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 ""
@@ -3432,21 +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 "Váš adresářový port uzlu není dostupný klientům ze sítě Tor. To může být pokud jste za routerem, nebo firewallem kvůli kterému je nutné porty přesměrovat. Pokud toto není Vaše IP adresa %1:%2 i a port serveru, zkontrolujte nastavení Vašeho uzlu"
+msgstr ""
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"
+msgstr ""
msgctxt "StatusEventWidget"
msgid "Your Relay is Online"
-msgstr "Váš uzel je Online"
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
@@ -3454,7 +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 "Váš uzel je nyní online a dostupný pro klienty Toru. Za několik hodin dojde pravděpodobně k vyššímu vytížení v souvislosti s tím jak vás jednotlivé klienty postupně objevují. Děkujeme Vám za přispívání Tor síti"
+msgstr ""
+
+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"
@@ -3486,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]"
@@ -3506,141 +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"
+msgstr ""
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\""
+msgstr ""
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'."
+msgstr ""
msgctxt "UpdateProcess"
msgid ""
"Vidalia was unable to check for available software updates because Tor's "
"update process exited unexpectedly."
-msgstr "Vidalia se nepodařilo zjistit přítomnost dostupných aktualizací, protože proces Tor aktualizace skončil neočekávaně."
+msgstr ""
msgctxt "UpdateProgressDialog"
msgid "Checking for available updates..."
-msgstr "Kontroluji nové aktualizace"
+msgstr ""
msgctxt "UpdateProgressDialog"
msgid "Hide"
@@ -3648,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"
@@ -3664,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"
@@ -3676,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"
@@ -3696,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"
@@ -3791,31 +3750,27 @@ 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 ""
"Another Vidalia process is possibly already running. If there really is not another Vidalia process running, you can choose to continue anyway.\n"
"\n"
"Would you like to continue starting Vidalia?"
-msgstr "Je možné že již běží jiný proces Vidalia. Pokud skutečně žádný další proces Vidalia neběží můžete pokračovat dál.\n\nPřejete si dále spoštět Vidaliu?"
+msgstr ""
msgctxt "stringutil.h"
msgid "%1 secs"
-msgstr "%1 sekund"
+msgstr ""
msgctxt "stringutil.h"
msgid "%1 B/s"
@@ -3835,12 +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/qt_csb.po b/src/vidalia/i18n/po/csb/qt_csb.po
index 5b976a7..f2a2ae6 100644
--- a/src/vidalia/i18n/po/csb/qt_csb.po
+++ b/src/vidalia/i18n/po/csb/qt_csb.po
@@ -1,11 +1,10 @@
#
-# Translators:
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-08-20 03:25+0000\n"
-"PO-Revision-Date: 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"
@@ -431,5 +430,3 @@ msgstr ""
msgctxt "QFileSystemModel"
msgid "%1 bytes"
msgstr ""
-
-
diff --git a/src/vidalia/i18n/po/csb/vidalia_csb.po b/src/vidalia/i18n/po/csb/vidalia_csb.po
index ce3630d..0b40a42 100644
--- a/src/vidalia/i18n/po/csb/vidalia_csb.po
+++ b/src/vidalia/i18n/po/csb/vidalia_csb.po
@@ -1,11 +1,10 @@
#
-# Translators:
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-09-07 14:40+0000\n"
-"PO-Revision-Date: 2010-12-05 20:03+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"
@@ -193,10 +192,6 @@ 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"
@@ -236,10 +231,6 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr ""
-
-msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -279,6 +270,10 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr ""
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -432,17 +427,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"
@@ -1266,44 +1270,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"
@@ -1331,10 +1342,6 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr ""
-
-msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1362,6 +1369,10 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr ""
+
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1644,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 ""
@@ -1680,10 +1663,6 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1796,10 +1775,6 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1882,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 ""
@@ -1934,82 +1897,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 ""
@@ -2057,19 +1949,39 @@ 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)"
+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"
@@ -2091,17 +2003,35 @@ msgid ""
msgstr ""
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"
@@ -2357,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"
@@ -2412,10 +2334,6 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2515,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 ""
@@ -2840,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 ""
@@ -3088,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 ""
@@ -3132,10 +3070,6 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
-msgid "Form"
-msgstr ""
-
-msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3424,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 ""
@@ -3460,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 ""
@@ -3538,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 ""
@@ -3666,6 +3646,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 ""
@@ -3759,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 ""
@@ -3812,5 +3796,3 @@ msgstr ""
msgctxt "stringutil.h"
msgid "%1 mins"
msgstr ""
-
-
diff --git a/src/vidalia/i18n/po/cy/qt_cy.po b/src/vidalia/i18n/po/cy/qt_cy.po
index 54bd79a..ec5dedd 100644
--- a/src/vidalia/i18n/po/cy/qt_cy.po
+++ b/src/vidalia/i18n/po/cy/qt_cy.po
@@ -1,13 +1,11 @@
-# Translators:
-# Translators:
-# cymro <markives at hotmail.co.uk>, 2011.
+#
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-08-20 03:25+0000\n"
-"PO-Revision-Date: 2012-02-14 09:47+0000\n"
-"Last-Translator: cymro <markives at hotmail.co.uk>\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"
@@ -19,7 +17,7 @@ msgstr ""
#: qaccessibleobject.cpp:348
msgctxt "QApplication"
msgid "Activate"
-msgstr "Ysgogi"
+msgstr ""
#: qmessagebox.h:319
msgctxt "QApplication"
@@ -44,27 +42,27 @@ msgstr ""
#: qmessagebox.cpp:2104
msgctxt "QDialogButtonBox"
msgid "OK"
-msgstr "Iawn"
+msgstr ""
#: qdialogbuttonbox.cpp:528
msgctxt "QDialogButtonBox"
msgid "Save"
-msgstr "Cadw"
+msgstr ""
#: qdialogbuttonbox.cpp:531
msgctxt "QDialogButtonBox"
msgid "Open"
-msgstr "Agor"
+msgstr ""
#: qdialogbuttonbox.cpp:534
msgctxt "QDialogButtonBox"
msgid "Cancel"
-msgstr "Diddymu"
+msgstr ""
#: qdialogbuttonbox.cpp:537
msgctxt "QDialogButtonBox"
msgid "Close"
-msgstr "Cau"
+msgstr ""
#: qdialogbuttonbox.cpp:540
msgctxt "QDialogButtonBox"
@@ -74,27 +72,27 @@ msgstr ""
#: qdialogbuttonbox.cpp:543
msgctxt "QDialogButtonBox"
msgid "Reset"
-msgstr "Ailosod"
+msgstr ""
#: qdialogbuttonbox.cpp:546
msgctxt "QDialogButtonBox"
msgid "Help"
-msgstr "Help"
+msgstr ""
#: qdialogbuttonbox.cpp:550
msgctxt "QDialogButtonBox"
msgid "Don't Save"
-msgstr "Peidiwch â Cadw"
+msgstr ""
#: qdialogbuttonbox.cpp:554
msgctxt "QDialogButtonBox"
msgid "Discard"
-msgstr "Gwaredu"
+msgstr ""
#: qdialogbuttonbox.cpp:557
msgctxt "QDialogButtonBox"
msgid "&Yes"
-msgstr "&Ia"
+msgstr ""
#: qdialogbuttonbox.cpp:560
msgctxt "QDialogButtonBox"
@@ -149,7 +147,7 @@ msgstr ""
#: qdirmodel.cpp:423
msgctxt "QDirModel"
msgid "Name"
-msgstr "Enw"
+msgstr ""
#: qdirmodel.cpp:424
msgctxt "QDirModel"
@@ -194,7 +192,7 @@ msgstr ""
#: qfiledialog.cpp:435
msgctxt "QFileDialog"
msgid "Open"
-msgstr "Agor"
+msgstr ""
#: qfiledialog.cpp:1670
msgctxt "QFileDialog"
@@ -219,12 +217,12 @@ msgstr ""
#: qfiledialog.cpp:462
msgctxt "QFileDialog"
msgid "&Rename"
-msgstr "&Ailenwi"
+msgstr ""
#: qfiledialog.cpp:463
msgctxt "QFileDialog"
msgid "&Delete"
-msgstr "&Dileu"
+msgstr ""
#: qfiledialog.cpp:464
msgctxt "QFileDialog"
diff --git a/src/vidalia/i18n/po/cy/vidalia_cy.po b/src/vidalia/i18n/po/cy/vidalia_cy.po
index 34ef2a8..eecb6cd 100644
--- a/src/vidalia/i18n/po/cy/vidalia_cy.po
+++ b/src/vidalia/i18n/po/cy/vidalia_cy.po
@@ -1,14 +1,11 @@
#
-# Translators:
-# cymro <markives at hotmail.co.uk>, 2011.
-# <demonuk9 at gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2012-03-21 17:52+0000\n"
-"PO-Revision-Date: 2012-03-22 08:52+0000\n"
-"Last-Translator: PoopZemli <demonuk9 at gmail.com>\n"
+"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"
@@ -19,27 +16,27 @@ 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."
-msgstr "'%1' не є дійсною IP-адресою."
+msgstr ""
msgctxt "AdvancedPage"
msgid ""
@@ -52,11 +49,11 @@ 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?"
-msgstr "%1 не існує. Бажаєте створити?"
+msgstr ""
msgctxt "AdvancedPage"
msgid "Failed to Create File"
@@ -88,11 +85,11 @@ msgstr ""
msgctxt "AdvancedPage"
msgid "Address:"
-msgstr "Cyfeiriad:"
+msgstr ""
msgctxt "AdvancedPage"
msgid "None"
-msgstr "Dim"
+msgstr ""
msgctxt "AdvancedPage"
msgid "Cookie"
@@ -100,15 +97,15 @@ msgstr ""
msgctxt "AdvancedPage"
msgid "Password"
-msgstr "Cyfrinair"
+msgstr ""
msgctxt "AdvancedPage"
msgid "Randomly Generate"
-msgstr "Генерувати випадково"
+msgstr ""
msgctxt "AdvancedPage"
msgid ":"
-msgstr ":"
+msgstr ""
msgctxt "AdvancedPage"
msgid "Tor Configuration File"
@@ -195,17 +192,6 @@ msgid "Select a file to use for Tor socket path"
msgstr ""
msgctxt "AdvancedPage"
-msgid "Configure ControlPort automatically"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid ""
-"You've checked the autoconfiguration option for the ControlPort, but "
-"provided no Data Directory. Please add one, or uncheck the \"Configure "
-"ControlPort automatically\" option."
-msgstr ""
-
-msgctxt "AdvancedPage"
msgid ""
"Vidalia was unable to remove the Tor service.\n"
"\n"
@@ -214,7 +200,7 @@ msgstr ""
msgctxt "AppearancePage"
msgid "Language"
-msgstr "Мова"
+msgstr ""
msgctxt "AppearancePage"
msgid "Choose the language used in Vidalia"
@@ -222,7 +208,7 @@ msgstr ""
msgctxt "AppearancePage"
msgid "Style"
-msgstr "Steil"
+msgstr ""
msgctxt "AppearancePage"
msgid "Choose Vidalia's interface style"
@@ -232,37 +218,16 @@ msgctxt "AppearancePage"
msgid "Vidalia was unable to load the selected language translation."
msgstr ""
-msgctxt "AppearancePage"
-msgid ""
-"System Icon Preferences (changes will take effect when you restart Vidalia)"
-msgstr ""
-
-msgctxt "AppearancePage"
-msgid "Show the Tray Icon and Dock Icon (default)"
-msgstr ""
-
-msgctxt "AppearancePage"
-msgid "Hide the Tray Icon"
-msgstr ""
-
-msgctxt "AppearancePage"
-msgid "Hide the Dock Icon"
-msgstr ""
-
msgctxt "BandwidthGraph"
msgid "Since:"
-msgstr "Ers:"
+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"
@@ -279,7 +244,7 @@ msgstr ""
msgctxt "BandwidthGraph"
msgid "Always on Top"
-msgstr "Завжди згори"
+msgstr ""
msgctxt "BandwidthGraph"
msgid "Style"
@@ -291,7 +256,7 @@ msgstr ""
msgctxt "BandwidthGraph"
msgid "100"
-msgstr "100"
+msgstr ""
msgctxt "BandwidthGraph"
msgid "% Opaque"
@@ -299,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..."
@@ -311,7 +280,7 @@ msgstr ""
msgctxt "BridgeDownloader"
msgid "Connecting to %1:%2..."
-msgstr "Під'єднання до %1:%2..."
+msgstr ""
msgctxt "BridgeDownloader"
msgid "Sending an HTTPS request for bridges..."
@@ -335,7 +304,7 @@ msgstr ""
msgctxt "BridgeUsageDialog"
msgid "Country"
-msgstr "Країна"
+msgstr ""
msgctxt "BridgeUsageDialog"
msgid "# Clients"
@@ -355,11 +324,11 @@ msgstr ""
msgctxt "Circuit"
msgid "New"
-msgstr "Новий"
+msgstr ""
msgctxt "Circuit"
msgid "Open"
-msgstr "Відкрити"
+msgstr ""
msgctxt "Circuit"
msgid "Building"
@@ -427,11 +396,11 @@ msgstr ""
msgctxt "ConfigDialog"
msgid "Help"
-msgstr "Допомога"
+msgstr ""
msgctxt "ConfigDialog"
msgid "Error Saving Settings"
-msgstr "Помилка при збереженні налаштувань"
+msgstr ""
msgctxt "ConfigDialog"
msgid "Vidalia was unable to save your %1 settings."
@@ -439,7 +408,7 @@ msgstr ""
msgctxt "ConfigDialog"
msgid "Error Applying Settings"
-msgstr "Помилка при застосуванні налаштувань"
+msgstr ""
msgctxt "ConfigDialog"
msgid "Vidalia was unable to apply your %1 settings to Tor."
@@ -458,17 +427,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"
@@ -509,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"
@@ -1189,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"
@@ -1292,44 +1270,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"
@@ -1354,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)"
@@ -1388,6 +1369,10 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr ""
+
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1434,7 +1419,7 @@ msgstr ""
msgctxt "HelpBrowser"
msgid "Vidalia Help"
-msgstr "Help Vidalia"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Back"
@@ -1450,7 +1435,7 @@ msgstr ""
msgctxt "HelpBrowser"
msgid "Forward"
-msgstr "Ymlaen"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Move to next page (Shift+Backspace)"
@@ -1670,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 ""
@@ -1706,10 +1663,6 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1774,6 +1727,10 @@ msgid "Connected to the Tor network!"
msgstr ""
msgctxt "MainWindow"
+msgid "Unrecognized startup status"
+msgstr ""
+
+msgctxt "MainWindow"
msgid "miscellaneous"
msgstr ""
@@ -1818,10 +1775,6 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1904,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 ""
@@ -1956,82 +1897,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 ""
@@ -2079,66 +1949,89 @@ 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 "Bootstrapping torrc from %1 to %2"
+msgid "toolBar"
msgstr ""
msgctxt "MainWindow"
-msgid "(probably Telnet)"
+msgid "Start"
msgstr ""
msgctxt "MainWindow"
-msgid "(probably an email client)"
+msgid "Stop"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"One of your applications %1 appears to be making a potentially unencrypted "
-"and unsafe connection to port %2."
+msgid "Restart"
msgstr ""
msgctxt "MainWindow"
-msgid "failed (%1)"
+msgid "Reload Tor's config"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+msgid "Actions"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Bootstrapping torrc from %1 to %2"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia can't find out how to talk to Tor because it can't access this file: %1\n"
+"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
"\n"
-"Here's the last error message:\n"
-"%2"
+"Would you like to shutdown gracefully and give clients time to find a new relay?"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"It seems Tor has stopped running since Vidalia started it.\n"
+"Vidalia detected that the Tor software exited unexpectedly.\n"
"\n"
-"See the Advanced Message Log for more information."
+"Please check the message log for recent warning or error messages."
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?"
+"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 ""
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 "Error reloading configuration"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to reload Tor's configuration."
msgstr ""
msgctxt "MessageLog"
@@ -2394,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"
@@ -2449,10 +2334,6 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2552,6 +2433,30 @@ 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 ""
+
+msgctxt "NetworkPage"
+msgid "The specified bridge identifier is not valid."
+msgstr ""
+
msgctxt "NetworkPage"
msgid "Copy (Ctrl+C)"
msgstr ""
@@ -2685,11 +2590,11 @@ msgid "SOCKS 5"
msgstr ""
msgctxt "NetworkPage"
-msgid "HTTP / HTTPS"
+msgid "HTTP"
msgstr ""
msgctxt "NetworkPage"
-msgid "You must specify one or more bridges."
+msgid "HTTP / HTTPS"
msgstr ""
msgctxt "Policy"
@@ -3113,11 +3018,11 @@ msgid "Automatically distribute my bridge address"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network (exit relay)"
+msgid "Relay traffic inside the Tor network (non-exit relay)"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic inside the Tor network (non-exit relay)"
+msgid "Relay traffic for the Tor network (exit relay)"
msgstr ""
msgctxt "ServerPage"
@@ -3165,10 +3070,6 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
-msgid "Form"
-msgstr ""
-
-msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3457,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 ""
@@ -3493,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 ""
@@ -3521,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"
@@ -3565,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 ""
@@ -3699,6 +3646,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 ""
@@ -3792,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 ""
diff --git a/src/vidalia/i18n/po/da/qt_da.po b/src/vidalia/i18n/po/da/qt_da.po
index dd51185..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:
-# 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"
@@ -201,7 +199,9 @@ msgctxt "QFileDialog"
msgid ""
"%1 already exists.\n"
"Do you want to replace it?"
-msgstr "%1 findes allerede.\nVil du overskrive den?"
+msgstr ""
+"%1 findes allerede.\n"
+"Vil du overskrive den?"
#: qfiledialog.cpp:1690
msgctxt "QFileDialog"
@@ -209,7 +209,10 @@ msgid ""
"%1\n"
"File not found.\n"
"Please verify the correct file name was given."
-msgstr "%1\nFilen blev ikke fundet.\nBekræft venligst, at det korrekte filnavn blev givet."
+msgstr ""
+"%1\n"
+"Filen blev ikke fundet.\n"
+"Bekræft venligst, at det korrekte filnavn blev givet."
#: qdirmodel.cpp:833
msgctxt "QFileDialog"
@@ -267,14 +270,19 @@ msgid ""
"%1\n"
"Directory not found.\n"
"Please verify the correct directory name was given."
-msgstr "%1\nMappen blev ikke fundet.\nBekræft venligst, at det rigtige mappe navn blev givet."
+msgstr ""
+"%1\n"
+"Mappen blev ikke fundet.\n"
+"Bekræft venligst, at det rigtige mappe navn blev givet."
#: qfiledialog.cpp:2281
msgctxt "QFileDialog"
msgid ""
"'%1' is write protected.\n"
"Do you want to delete it anyway?"
-msgstr "'%1' er skrivebeskyttet.\nVil du slette den alligevel?"
+msgstr ""
+"'%1' er skrivebeskyttet.\n"
+"Vil du slette den alligevel?"
#: qfiledialog.cpp:2286
msgctxt "QFileDialog"
@@ -371,7 +379,9 @@ msgctxt "QFileSystemModel"
msgid ""
"<b>The name \"%1\" can not be used.</b><p>Try using another name, with fewer"
" characters or no punctuations marks."
-msgstr "<b>Navnet \"%1\" kunne ikke bruges.</b><p>Prøv at bruge et andet navn, med færre karakterer og ingen grammatiske tegn."
+msgstr ""
+"<b>Navnet \"%1\" kunne ikke bruges.</b><p>Prøv at bruge et andet navn, med "
+"færre karakterer og ingen grammatiske tegn."
#: qfilesystemmodel.cpp:832
msgctxt "QFileSystemModel"
diff --git a/src/vidalia/i18n/po/da/vidalia_da.po b/src/vidalia/i18n/po/da/vidalia_da.po
index 1bd2935..5f9aa10 100644
--- a/src/vidalia/i18n/po/da/vidalia_da.po
+++ b/src/vidalia/i18n/po/da/vidalia_da.po
@@ -1,16 +1,13 @@
#
# Translators:
-# <3xm at detfalskested.dk>, 2012.
-# Aputsiaq Janussen <aputtu at gmail.com>, 2011.
-# runasand <runa.sandvik at gmail.com>, 2011.
# <theoliver at live.co.uk>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2012-03-21 17:52+0000\n"
-"PO-Revision-Date: 2012-04-11 07:32+0000\n"
-"Last-Translator: decibyte <3xm at detfalskested.dk>\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"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -46,11 +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"
@@ -70,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."
@@ -86,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:"
@@ -102,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 ":"
@@ -118,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"
@@ -130,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"
@@ -154,31 +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"
@@ -186,33 +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"
-
-msgctxt "AdvancedPage"
-msgid ""
-"You've checked the autoconfiguration option for the ControlPort, but "
-"provided no Data Directory. Please add one, or uncheck the \"Configure "
-"ControlPort automatically\" option."
-msgstr "Du har valgt automatisk konfiguration af KontrolPort, men har ikke angivet nogen DataMappe. Vælg venligst et, eller slå automatisk konfiguration af kontrolport fra."
+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\nDu 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"
@@ -220,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"
@@ -228,28 +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"
-
-msgctxt "AppearancePage"
-msgid ""
-"System Icon Preferences (changes will take effect when you restart Vidalia)"
-msgstr "Systemikonindstillinger (ændringer træder i kraft når du genstarter Vidalia)"
-
-msgctxt "AppearancePage"
-msgid "Show the Tray Icon and Dock Icon (default)"
-msgstr "Vis bakkeikonet og dokikonet (slået til som standard)"
-
-msgctxt "AppearancePage"
-msgid "Hide the Tray Icon"
-msgstr "Skjul bakkeikonet"
-
-msgctxt "AppearancePage"
-msgid "Hide the Dock Icon"
-msgstr "Skjul dokikonet"
+msgstr "Vidalia kunne ikke indlæse det valgte sprog oversættelse."
msgctxt "BandwidthGraph"
msgid "Since:"
@@ -257,2171 +226,2087 @@ 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 "Problem connecting to Tor"
+msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Password Required"
-msgstr "Kodeord påkrævet"
+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:"
-msgstr "Vidalia er tilsluttet til en kørende Tor-proces som kræver et kodeord. Venligst indtast til kontrolkodeord:"
+"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 "Kontrol-socket er ikke forbundet."
+msgstr ""
msgctxt "ControlSocket"
msgid "Error sending control command. [%1]"
-msgstr "Fejl ved sending af kontrolkommando. [%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 kontrolsvar. [%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:"
+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 "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."
-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 "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:"
-msgstr "med en beskrivelse af, hvad du gjorde, før ansøgningen styrtede ned, sammen med følgende filer, der svarer til rapporten:"
+msgctxt "CrashReportUploader"
+msgid "Receiving response..."
+msgstr ""
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 ""
"Vidalia can open the link you selected in your default Web browser. If your "
"browser is not currently configured to use Tor then the request will not be "
"anonymous."
-msgstr "Vidalia kan åbne det valgte link i din standart Internet Browser. Hvis din browser ikke er opsat til at anvende Tor, vil din anmodning ikke være anonym. "
+msgstr ""
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."
+msgstr ""
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 ""
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."
+msgstr ""
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."
+msgstr ""
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."
+msgstr ""
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."
+msgstr ""
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."
+msgstr ""
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."
+msgstr ""
msgctxt "MainWindow"
msgid ""
"The currently installed version of Tor is out of date or no longer "
"recommended."
-msgstr "Den aktuelt installerede version af Tor er forældet eller kan ikke længere anbefales."
+msgstr ""
msgctxt "MainWindow"
msgid ""
"Would you like to check if a newer package is available for installation?"
-msgstr "Vil du gerne se, om der er en nyere pakke tilgængelig for installation?"
+msgstr ""
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."
+msgstr ""
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."
+msgstr ""
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."
+msgstr ""
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 ""
"Anything sent over this connection could be monitored. Please check your "
"application's configuration and use only encrypted protocols, such as SSL, "
"if possible."
-msgstr "Alt som sendes over denne forbindelse vil kunne overvåges. Tjek venligst din applikations konfiguration og brug kun krypterede protokoller, såsom SSL, om muligt."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "toolBar"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Start"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Stop"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Restart"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Reload Tor's config"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Actions"
+msgstr ""
msgctxt "MainWindow"
msgid "Bootstrapping torrc from %1 to %2"
-msgstr "Bootsstrapper torrc fra %1 til %2"
+msgstr ""
msgctxt "MainWindow"
-msgid "(probably Telnet)"
-msgstr "(måske Telnet)"
+msgid ""
+"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"\n"
+"Would you like to shutdown gracefully and give clients time to find a new relay?"
+msgstr ""
msgctxt "MainWindow"
-msgid "(probably an email client)"
-msgstr "(måske en email klient)"
+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 ""
-"One of your applications %1 appears to be making a potentially unencrypted "
-"and unsafe connection to port %2."
-msgstr "En af dine applikationer %1 synes at være ved at lave en potentielt ukrypteret og usikre forbindelse til port %2."
+"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 "mislykkedes (%1)"
+msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
-msgstr "Deres relæ er ved at lukke. \nKlik på 'Stop' igen for at stoppe din relæ nu."
+msgid ", probably Telnet,"
+msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Vidalia can't find out how to talk to Tor because it can't access this file: %1\n"
-"\n"
-"Here's the last error message:\n"
-"%2"
-msgstr "Vidalia kan ikke snakke med Tor, da den ikke kan tilgå filen: %1\n\nHere er den seneste fejlmeddelelse:\n%2"
+msgid ", probably an email client,"
+msgstr ""
msgctxt "MainWindow"
msgid ""
-"It seems Tor has stopped running since Vidalia started it.\n"
-"\n"
-"See the Advanced Message Log for more information."
-msgstr "Det ser ud til at Tor er holdt op med at køre siden Vidalia startede det.\n\nSee i den avancerede meddelelseslog efter mere information."
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
+msgstr ""
msgctxt "MainWindow"
-msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
-"\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
-msgstr "Du har i øjeblikket et relæ kørende. Afbrydelse af dit relæ vil forstyrre alle åbne klientforbindelser.\n\nVil du gerne lukke taktfuldt og give klienterne tid til at finde nye relæer?"
+msgid "Error reloading configuration"
+msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Vidalia detected that the Tor software exited unexpectedly.\n"
-"\n"
-"Please check the message log for recent warning or error messages."
-msgstr "Vidalia registrerede at Tor-softwaren uventet blev afsluttet.\n\nTjek venligst beskedloggen for seneste advarsler eller fejlbeskeder."
+msgid "Vidalia was unable to reload Tor's configuration."
+msgstr ""
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\nmeget galt og hvor Tor ikke kan forsætte."
+msgstr ""
msgctxt "MessageLog"
msgid ""
"Messages that only appear when \n"
"something has gone wrong with Tor."
-msgstr "Beskeder som kun fremkommer når\nnoget er gået galt med Tor."
+msgstr ""
msgctxt "MessageLog"
msgid ""
@@ -2429,813 +2314,829 @@ msgid ""
"during normal Tor operation and are \n"
"not considered errors, but you may \n"
"care about."
-msgstr "Beskeder som fremkommer mindre hyppigt \nunder normal Tor-brug og som ikke kan \nbetragtes som fejl, men som du kan være\ninteresseret i."
+msgstr ""
msgctxt "MessageLog"
msgid ""
"Messages that appear frequently \n"
"during normal Tor operation."
-msgstr "Beskeder som fremkommer hyppigt \nunder normal brug af Tor."
+msgstr ""
msgctxt "MessageLog"
msgid ""
"Hyper-verbose messages primarily of \n"
"interest to Tor developers."
-msgstr "Meget detaljerede beskeder som primært\nhar interesse for Tor-udviklere."
+msgstr ""
msgctxt "MessageLog"
msgid ""
"Cannot write file %1\n"
"\n"
"%2."
-msgstr "Kan ikke skrive til %1\n\n%2."
-
-msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr "Tor Netværksoversigt"
+msgstr ""
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 ""
+
+msgctxt "NetworkPage"
+msgid "The specified bridge identifier is not valid."
+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."
+msgstr ""
msgctxt "NetworkPage"
msgid ""
"You must specify one or more ports to which your firewall allows you to "
"connect."
-msgstr "Du skal angive en eller flere porte, som din firewall tillader dig at tilslutte."
+msgstr ""
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"
+msgstr ""
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"
+msgstr ""
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"
+msgstr ""
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."
+msgstr ""
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 / HTTPS"
-msgstr "HTTP / HTTPS"
+msgid "HTTP"
+msgstr ""
msgctxt "NetworkPage"
-msgid "You must specify one or more bridges."
-msgstr "Du skal angive en eller flere broer."
+msgid "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."
+msgstr ""
msgctxt "ServerPage"
msgid ""
"Please upgrade your Tor software or configure Tor to act as a normal Tor "
"relay."
-msgstr "Du skal opgradere din Tor software eller konfigurere Tor til at fungere som et normalt Tor relæ."
+msgstr ""
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"
+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."
+msgstr ""
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."
+msgstr ""
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æ?"
+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 vil stadig blokere nogle udgående post og fildeling applikationer som standard for at reducere spam og anden misbrug."
+msgstr ""
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"
+msgstr ""
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."
+msgstr ""
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."
+msgstr ""
msgctxt "ServerPage"
msgid ""
"Tor returned an improperly formatted response when Vidalia requested your "
"bridge's usage history."
-msgstr "Tor returnerede et ukorrekt formatteret svar, da Vidalia forespurgte din bros forbrugshistorik."
+msgstr ""
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 for the Tor network (exit relay)"
-msgstr "Relætrafik for Tor-netværket (exit-relæ)"
+msgid "Relay traffic inside the Tor network (non-exit relay)"
+msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic inside the Tor network (non-exit relay)"
-msgstr "Relætrafik for Tor-netværket (ikke-exit-relæ)"
+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\nproblem med dit relæ. Du kan også inkludere din PGP- eller GPG-fingeraftryk."
+msgstr ""
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."
+msgstr ""
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 ""
"Click \"Start Tor\" in the Vidalia Control Panel to restart the Tor "
"software. If Tor exited unexpectedly, select the \"Advanced\" tab above for "
"details about any errors encountered."
-msgstr "Klik \"Start Tor\" i Kontrolpanelet for Vidalia for at genstarte Tor-programmelet. Hvis Tor afsluttede uventet, så vælg \"Avanceret\"-fanen ovenfor for detaljer om hvilke fejl som opstod."
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
@@ -3243,7 +3144,7 @@ msgid ""
"longer recommended. Please upgrade to the most recent version of the "
"software, which may contain important security, reliability and performance "
"fixes."
-msgstr "Du kører i øjeblikket version \"%1\" af Tor-softwaren, der ikke længere anbefales. Opgradér venligst til den seneste version af softwaren, der kan indeholde vigtige rettelser vedrørende sikkerhed, pålidelighed og ydelse."
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
@@ -3251,31 +3152,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 "Du kører i øjeblikket version \"%1\" af Tor-softwaren, der ikke længere fungerer med det nuværende Tor-netværk. Opgradér venligst til den seneste version af softwaren, der kan indeholde vigtige rettelser vedrørende sikkerhed, pålidelighed og ydelse."
+msgstr ""
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."
+msgstr ""
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"
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
@@ -3283,7 +3184,7 @@ msgid ""
"the past compared to the source \"%2\". If your clock is not correct, Tor "
"will not be able to function. Please verify your computer displays the "
"correct time."
-msgstr "Tor af afgjort at din maskines ur kan sætte til %1 sekunder tilbage i tid sammenlignet med kilden \"%2\". Hvis dit ur ikke går korrekt, så vil Tor ikke være i stand til at fungere. Bekræft venligst at maskinen viser den korrekte tid."
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
@@ -3291,11 +3192,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 af afgjort at din maskines ur kan sætte til %1 sekunder frem i tid sammenlignet med kilden \"%2\". Hvis dit ur ikke går korrekt, så vil Tor ikke være i stand til at fungere. Bekræft venligst at maskinen viser den korrekte tid."
+msgstr ""
msgctxt "StatusEventWidget"
msgid "Your Computer's Clock is Potentially Incorrect"
-msgstr "Din maskines ur går muligvis forkert."
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
@@ -3303,18 +3204,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 "En af dine applikationer på din maskine har forsøgt at oprette en ukrypteret forbindelse gennem Tor på port %1. Afsendelse af ukrypteret information over Tor-netværket er farligt og anbefales ikke. For din egen beskyttelse, så har Tor automatisk lukket denne forbindelse."
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
"One of the applications on your computer may have attempted to make an "
"unencrypted connection through Tor to port %1. Sending unencrypted "
"information over the Tor network is dangerous and not recommended."
-msgstr "En af dine applikationer på din maskine har forsøgt at oprette en ukrypteret forbindelse gennem Tor på port %1. Afsendelse af ukrypteret information over Tor-netværket er farligt og anbefales ikke."
+msgstr ""
msgctxt "StatusEventWidget"
msgid "Potentially Dangerous Connection!"
-msgstr "Potentielt farlig forbindelse!"
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
@@ -3322,81 +3223,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 "En af dine applikationer etablerede en forbindelse via Tor til \"%1\" ved hjælp af en protokol, der kan lække oplysninger om din destination. Sørg venligst for at konfigurere dine applikationer til kun at bruge SOCKS4a eller SOCKS5 med fjern værtsnavnsopløsning."
+msgstr ""
msgctxt "StatusEventWidget"
msgid "Unknown SOCKS Protocol"
-msgstr "Ukendt SOCKS protokol"
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
"One of your applications tried to establish a connection through Tor using a"
" protocol that Tor does not understand. Please ensure you configure your "
"applications to use only SOCKS4a or SOCKS5 with remote hostname resolution."
-msgstr "En af dine applikationer forsøgte at etablere en forbindelse via Tor ved hjælp af en protokol, som Tor ikke forstår. Sørg venligst for at konfigurere dine applikationer til kun at bruge SOCKS4a eller SOCKS5 med fjerne værtsnavnopløsning."
+msgstr ""
msgctxt "StatusEventWidget"
msgid "Invalid Destination Hostname"
-msgstr "Ugyldigt værtsnavn for destination"
+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 "En af dine applikationer forsøgte at etablere en forbindelse gennem Tor til \"%1\", hvilken Tor ikke genkender som gyldigt værtsnavn. Tjek venligst din applikations konfiguration."
+msgstr ""
msgctxt "StatusEventWidget"
msgid "External IP Address Changed"
-msgstr "Ekstern IP-adresse ændrede sig"
+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 har detekteret at dit relæs offentlige IP-adresse i øjeblikket er %1%2. Hvis dette ikke er korrekt, så overvej venligst at ændre indstillingen 'Adresse' i dit relæs konfiguration."
+msgstr ""
msgctxt "StatusEventWidget"
msgid "DNS Hijacking Detected"
-msgstr "DNS-kapring blev opdaget"
+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 "Tor har detekteret at din DNS-udbyder udbyder falske svar for domæner som ikke eksisterer. Nogle internetudbydere, såsom OpenDNS, er kendt for at gøre dette for at kunne vise deres egen søgefunktion eller reklamesider."
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
"Tor detected that your DNS provider is providing false responses for well "
"known domains. Since clients rely on Tor network relays to provide accurate "
"DNS repsonses, your relay will not be configured as an exit relay."
-msgstr "Tor har detekteret at din DNS-udbyder udbyder falske svar for velkendte domæner. Da klienter afhænger af at Tor-netværkets relæer tilbyder akkurate DNS-svar, så vil det relæ ikke blive konfigureret som et udgående relæ."
+msgstr ""
msgctxt "StatusEventWidget"
msgid "Checking Server Port Reachability"
-msgstr "Tjekker serverports tilgængelighed"
+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 forsøger at afgøre om dit relæs serverport er tilgængelig fra Tor-netværket ved selv at tilslutte sig på %1:%2. Denne test kan tage flere minutter."
+msgstr ""
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 ""
@@ -3404,30 +3305,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 "Dit relæs serverport er ikke tilgængelig for andre Tor-klienter. Dette kan ske når du er bag en router eller brandmur som kræver at du opsætter port-videresendelse. Hvis %1:%2 ikke er din korrekte IP-adresse og serverport, så tjek venligst dit relæs konfiguration."
+msgstr ""
msgctxt "StatusEventWidget"
msgid "Checking Directory Port Reachability"
-msgstr "Tjekker katalogportens tilgængelighed."
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
"Tor is trying to determine if your relay's directory port is reachable from "
"the Tor network by connecting to itself at %1:%2. This test could take "
"several minutes."
-msgstr "Tor forsøger at afgøre om dit relæs katalogport er tilgængelig fra Tor-netværket ved selv at tilslutte på %1:%2. Denne test kan tage flere minutter. "
+msgstr ""
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 ""
@@ -3435,21 +3336,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 "Dit relæs katalogport er ikke tilgængeligt fra andre Tor-klienter. Dette kan ske hvis du er bag en router eller brandmur som kræver at du opsætter port-videresendelse. Hvis %1:%2 ikke er din korrekte IP-adresse og katalogport, så tjek venligst dit relæs konfiguration."
+msgstr ""
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"
+msgstr ""
msgctxt "StatusEventWidget"
msgid "Your Relay is Online"
-msgstr "Dit relæ er online"
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
@@ -3457,393 +3358,443 @@ msgid ""
"see an increase in network traffic shown by the Bandwidth Graph within a few"
" hours as more clients learn about your relay. Thank you for contributing to"
" the Tor network!"
-msgstr "Dit relæ er nu online og tilgængelig for anvendelse af Tor-klienter. Du bør kunne se en forøgelse i netværkstrafikken vist med Båndbredde-grafen inden for få timer i takt med at flere klienter finder frem til dit relæ. Tak for dit bidrag til Tor-netværket\"!"
+msgstr ""
+
+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."
+msgstr ""
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'."
+msgstr ""
msgctxt "UpdateProcess"
msgid ""
"Vidalia was unable to check for available software updates because Tor's "
"update process exited unexpectedly."
-msgstr "Vidalia var ude af stand til at søge efter tilgængelige softwareopdateringer, fordi Tor's opdateringsproces afsluttede uventet."
+msgstr ""
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 ""
"Another Vidalia process is possibly already running. If there really is not another Vidalia process running, you can choose to continue anyway.\n"
"\n"
"Would you like to continue starting Vidalia?"
-msgstr "En anden Vidalia-proces kører muligvis allerede. Hvis der ikke kører andre processer, så kan du vælge alligevel at fortsætte.\n\nVil du gerne fortsætte med at starte Vidalia? "
+msgstr ""
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 c750922..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:
-# 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"
@@ -202,7 +199,9 @@ msgctxt "QFileDialog"
msgid ""
"%1 already exists.\n"
"Do you want to replace it?"
-msgstr "Die Datei %1 existiert bereits.\nSoll sie überschrieben werden?"
+msgstr ""
+"Die Datei %1 existiert bereits.\n"
+"Soll sie überschrieben werden?"
#: qfiledialog.cpp:1690
msgctxt "QFileDialog"
@@ -210,7 +209,10 @@ msgid ""
"%1\n"
"File not found.\n"
"Please verify the correct file name was given."
-msgstr "%1\nDie Datei konnte nicht gefunden werden.\nStellen Sie sicher, dass der Dateiname richtig ist."
+msgstr ""
+"%1\n"
+"Die Datei konnte nicht gefunden werden.\n"
+"Stellen Sie sicher, dass der Dateiname richtig ist."
#: qdirmodel.cpp:833
msgctxt "QFileDialog"
@@ -268,14 +270,19 @@ msgid ""
"%1\n"
"Directory not found.\n"
"Please verify the correct directory name was given."
-msgstr "%1\nDas Verzeichnis konnte nicht gefunden werden.\nStellen Sie sicher, dass der Verzeichnisname richtig ist."
+msgstr ""
+"%1\n"
+"Das Verzeichnis konnte nicht gefunden werden.\n"
+"Stellen Sie sicher, dass der Verzeichnisname richtig ist."
#: qfiledialog.cpp:2281
msgctxt "QFileDialog"
msgid ""
"'%1' is write protected.\n"
"Do you want to delete it anyway?"
-msgstr "'%1' ist schreibgeschützt.\nMöchten Sie die Datei trotzdem löschen?"
+msgstr ""
+"'%1' ist schreibgeschützt.\n"
+"Möchten Sie die Datei trotzdem löschen?"
#: qfiledialog.cpp:2286
msgctxt "QFileDialog"
@@ -372,7 +379,9 @@ msgctxt "QFileSystemModel"
msgid ""
"<b>The name \"%1\" can not be used.</b><p>Try using another name, with fewer"
" characters or no punctuations marks."
-msgstr "<b>Der Name \"%1\" kann nicht verwendet werden.</b><p>Versuchen Sie, die Sonderzeichen zu entfernen oder einen kürzeren Namen zu verwenden."
+msgstr ""
+"<b>Der Name \"%1\" kann nicht verwendet werden.</b><p>Versuchen Sie, die "
+"Sonderzeichen zu entfernen oder einen kürzeren Namen zu verwenden."
#: qfilesystemmodel.cpp:832
msgctxt "QFileSystemModel"
diff --git a/src/vidalia/i18n/po/de/vidalia_de.po b/src/vidalia/i18n/po/de/vidalia_de.po
index 904fef0..10d5c10 100644
--- a/src/vidalia/i18n/po/de/vidalia_de.po
+++ b/src/vidalia/i18n/po/de/vidalia_de.po
@@ -1,17 +1,13 @@
#
# Translators:
-# bastik <bastik.tor at googlemail.com>, 2011.
-# cosimacosa <leccefv at libero.it>, 2011.
-# <f.schima at googlemail.com>, 2012.
-# Hendrik Richter <hendrikr at gnome.org>, 2011.
-# <koloman375 at gmail.com>, 2012.
# runasand <runa.sandvik at gmail.com>, 2011.
+# 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: 2012-03-21 17:52+0000\n"
-"PO-Revision-Date: 2012-04-23 19:14+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"
@@ -199,17 +195,6 @@ 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 ""
-"You've checked the autoconfiguration option for the ControlPort, but "
-"provided no Data Directory. Please add one, or uncheck the \"Configure "
-"ControlPort automatically\" option."
-msgstr "Du hast die Option für die automatische Konfiguration für ControlPort ausgewählt, allerdings kein Datenverzeichniss angegeben. Bitte füge ein Datenverzeichniss hinzu, oder schalte die \"Konfiguriere ControlPort automatisch\" Option ab."
-
-msgctxt "AdvancedPage"
msgid ""
"Vidalia was unable to remove the Tor service.\n"
"\n"
@@ -236,23 +221,6 @@ msgctxt "AppearancePage"
msgid "Vidalia was unable to load the selected language translation."
msgstr "Vidalia konnte die gewählte Sprache nicht laden."
-msgctxt "AppearancePage"
-msgid ""
-"System Icon Preferences (changes will take effect when you restart Vidalia)"
-msgstr "System Icon Einstellungen (Änderungen werden nach Vidalia Neustart wirksam)"
-
-msgctxt "AppearancePage"
-msgid "Show the Tray Icon and Dock Icon (default)"
-msgstr "Tray Icon und Dock Icon anzeigen (Standard)"
-
-msgctxt "AppearancePage"
-msgid "Hide the Tray Icon"
-msgstr "Tray Icon verstecken"
-
-msgctxt "AppearancePage"
-msgid "Hide the Dock Icon"
-msgstr "Dock Icon verstecken"
-
msgctxt "BandwidthGraph"
msgid "Since:"
msgstr "Seit:"
@@ -266,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"
@@ -309,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..."
@@ -462,18 +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 ""
+"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 "Remember my password"
-msgstr "Mein Passwort speichern"
+msgid ""
+"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 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:"
+"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."
@@ -1296,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"
@@ -1313,28 +1308,17 @@ msgid ""
"manually."
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 "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 "Verbinde..."
-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"
@@ -1674,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"
@@ -1710,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"
@@ -1778,6 +1730,10 @@ msgid "Connected to the Tor network!"
msgstr "Verbindung zum Tor-Netzwerk hergestellt!"
msgctxt "MainWindow"
+msgid "Unrecognized startup status"
+msgstr "Nicht erkannter Startzustand"
+
+msgctxt "MainWindow"
msgid "miscellaneous"
msgstr "Verschiedenes"
@@ -1822,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"
@@ -1908,18 +1860,6 @@ msgid ""
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."
-
-msgctxt "MainWindow"
msgid "Tor Update Available"
msgstr "Tor-Update verfügbar"
@@ -1960,82 +1900,11 @@ 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."
@@ -2083,53 +1952,44 @@ 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. "
msgctxt "MainWindow"
-msgid "Bootstrapping torrc from %1 to %2"
-msgstr "Bootstrapping torrc von %1 zu %2"
+msgid "toolBar"
+msgstr "toolBar"
msgctxt "MainWindow"
-msgid "(probably Telnet)"
-msgstr "(vermutlich Telnet)"
+msgid "Start"
+msgstr "Start"
msgctxt "MainWindow"
-msgid "(probably an email client)"
-msgstr "(vermutlich ein Email Client)"
+msgid "Stop"
+msgstr "Stop"
msgctxt "MainWindow"
-msgid ""
-"One of your applications %1 appears to be making a potentially unencrypted "
-"and unsafe connection to port %2."
-msgstr "Eine ihrer Anwendungen %1 versucht anscheinend eine potentiell unverschlüsselte und unsichere Verbindung zum Port %2 herzustellen."
-
-msgctxt "MainWindow"
-msgid "failed (%1)"
-msgstr "fehlgeschlagen (%1)"
+msgid "Restart"
+msgstr "Neustart"
msgctxt "MainWindow"
-msgid ""
-"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."
+msgid "Reload Tor's config"
+msgstr "Lade Tor's config neu"
msgctxt "MainWindow"
-msgid ""
-"Vidalia can't find out how to talk to Tor because it can't access this file: %1\n"
-"\n"
-"Here's the last error message:\n"
-"%2"
-msgstr "Vidalia kann nicht mit Tor kommunizieren, da es keinen zugriff auf diese datei hat: %1\n\nHier ist die letzte Fehlermeldung:\n%2"
+msgid "Actions"
+msgstr "Aktionen"
msgctxt "MainWindow"
-msgid ""
-"It seems Tor has stopped running since Vidalia started it.\n"
-"\n"
-"See the Advanced Message Log for more information."
-msgstr "Es scheint als würde Tor nicht mehr funktionieren seit Vidalia es gestartet hat.\n\nSiehe im Erweiterten Nachrichten-Log nach, um mehr Informationen zu erhalten."
+msgid "Bootstrapping torrc from %1 to %2"
+msgstr "Bootstrapping torrc von %1 auf %2"
msgctxt "MainWindow"
msgid ""
@@ -2145,6 +2005,38 @@ msgid ""
"Please check the message log for recent warning or error messages."
msgstr "Vidalia entdeckte dass Tor unerwartet beendet wurde.\n\nBitte überprüfen Sie das Nachrichtenprotoll auf Fehler und Warnungen."
+msgctxt "MainWindow"
+msgid ""
+"Vidalia tried to restart Tor, but was not able to. Please check your Task "
+"Manager to ensure there are no other Tor processes running."
+msgstr "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 "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 ""
+"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"
msgstr "Fehler beim Setzen des Filters"
@@ -2398,22 +2290,14 @@ 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."
@@ -2431,13 +2315,13 @@ 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\nund nicht offensichtlich als Fehler erkennbar sind\nsollten unkritisch sein. \nDennoch 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 \nim laufenden Betrieb erscheinen."
+msgstr "Meldungen die in regelmäßigen Abständen im laufenden\\Betrieb erscheinen."
msgctxt "MessageLog"
msgid ""
@@ -2453,10 +2337,6 @@ msgid ""
msgstr "Kann Datei %1 nicht speichern\n\n%2"
msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr "Tor-Netzwerk-Karte"
-
-msgctxt "NetViewer"
msgid "Refresh"
msgstr "Aktualisieren"
@@ -2556,6 +2436,30 @@ 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"
+
+msgctxt "NetworkPage"
+msgid "The specified bridge identifier is not valid."
+msgstr "Die angegebene Brücke ist nicht gültig."
+
msgctxt "NetworkPage"
msgid "Copy (Ctrl+C)"
msgstr "Kopieren (Strg+C)"
@@ -2689,12 +2593,12 @@ msgid "SOCKS 5"
msgstr "SOCKS 5"
msgctxt "NetworkPage"
-msgid "HTTP / HTTPS"
-msgstr "HTTP / HTTPS"
+msgid "HTTP"
+msgstr "HTTP"
msgctxt "NetworkPage"
-msgid "You must specify one or more bridges."
-msgstr "Du musst eine oder mehrere Bridges festlegen."
+msgid "HTTP / HTTPS"
+msgstr "HTTP / HTTPS"
msgctxt "Policy"
msgid "accept"
@@ -3014,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)"
@@ -3088,7 +2992,7 @@ 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 ""
@@ -3102,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>"
@@ -3117,12 +3021,12 @@ msgid "Automatically distribute my bridge address"
msgstr "Meine Bridge-Adresse automatisch verteilen"
msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network (exit relay)"
-msgstr "Relais-Verkehr für das Tor-Netzwerk (ausgangs Relais)"
+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 inside the Tor network (non-exit relay)"
-msgstr "Relais-Verkehr im Tor-Netzwerk (kein ausgangs Relais)"
+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"
@@ -3132,7 +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 \nProblemes 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"
@@ -3169,10 +3073,6 @@ 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"
@@ -3346,7 +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"
@@ -3437,7 +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"
@@ -3461,6 +3361,22 @@ msgid ""
" 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!"
+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"
msgstr "Neu"
@@ -3497,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]"
@@ -3575,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"
@@ -3703,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"
@@ -3796,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:"
diff --git a/src/vidalia/i18n/po/de_CH/qt_de_CH.po b/src/vidalia/i18n/po/de_CH/qt_de_CH.po
index 0fb7c54..65a6e3b 100644
--- a/src/vidalia/i18n/po/de_CH/qt_de_CH.po
+++ b/src/vidalia/i18n/po/de_CH/qt_de_CH.po
@@ -1,11 +1,10 @@
#
-# Translators:
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-08-20 03:25+0000\n"
-"PO-Revision-Date: 2010-12-05 19:59+0000\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"
@@ -431,5 +430,3 @@ msgstr ""
msgctxt "QFileSystemModel"
msgid "%1 bytes"
msgstr ""
-
-
diff --git a/src/vidalia/i18n/po/de_CH/vidalia_de_CH.po b/src/vidalia/i18n/po/de_CH/vidalia_de_CH.po
index 526ccea..24c54be 100755
--- a/src/vidalia/i18n/po/de_CH/vidalia_de_CH.po
+++ b/src/vidalia/i18n/po/de_CH/vidalia_de_CH.po
@@ -1,11 +1,10 @@
#
-# Translators:
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-09-07 14:40+0000\n"
-"PO-Revision-Date: 2010-12-05 20:03+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"
@@ -193,10 +192,6 @@ 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"
@@ -236,10 +231,6 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr ""
-
-msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -279,6 +270,10 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr ""
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -432,17 +427,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"
@@ -1266,44 +1270,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"
@@ -1331,10 +1342,6 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr ""
-
-msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1362,6 +1369,10 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr ""
+
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1644,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 ""
@@ -1680,10 +1663,6 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1796,10 +1775,6 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1882,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 ""
@@ -1934,82 +1897,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 ""
@@ -2057,19 +1949,39 @@ 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)"
+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"
@@ -2091,17 +2003,35 @@ msgid ""
msgstr ""
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"
@@ -2357,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"
@@ -2412,10 +2334,6 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2515,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 ""
@@ -2840,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 ""
@@ -3088,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 ""
@@ -3132,10 +3070,6 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
-msgid "Form"
-msgstr ""
-
-msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3424,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 ""
@@ -3460,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 ""
@@ -3538,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 ""
@@ -3666,6 +3646,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 ""
@@ -3759,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 ""
@@ -3812,5 +3796,3 @@ msgstr ""
msgctxt "stringutil.h"
msgid "%1 mins"
msgstr ""
-
-
diff --git a/src/vidalia/i18n/po/de_DE/qt_de_DE.po b/src/vidalia/i18n/po/de_DE/qt_de_DE.po
index a44116d..65e9f5d 100644
--- a/src/vidalia/i18n/po/de_DE/qt_de_DE.po
+++ b/src/vidalia/i18n/po/de_DE/qt_de_DE.po
@@ -1,11 +1,10 @@
#
-# Translators:
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-08-20 03:25+0000\n"
-"PO-Revision-Date: 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"
@@ -431,5 +430,3 @@ msgstr ""
msgctxt "QFileSystemModel"
msgid "%1 bytes"
msgstr ""
-
-
diff --git a/src/vidalia/i18n/po/de_DE/vidalia_de_DE.po b/src/vidalia/i18n/po/de_DE/vidalia_de_DE.po
index 554b5d3..cd31a6d 100755
--- a/src/vidalia/i18n/po/de_DE/vidalia_de_DE.po
+++ b/src/vidalia/i18n/po/de_DE/vidalia_de_DE.po
@@ -1,3816 +1,2682 @@
-#
-# Translators:
+#, fuzzy
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: 2010-12-05 20:03+0000\n"
-"Last-Translator: \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: 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: de_DE\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
"X-Generator: Vidalia ts2po 0.2\n"
+#: aboutdialog.ui:16
msgctxt "AboutDialog"
msgid "About Vidalia"
msgstr ""
+#: aboutdialog.ui:53
msgctxt "AboutDialog"
-msgid "License"
+msgid "Vidalia"
+msgstr ""
+
+#: aboutdialog.ui:88
+msgctxt "AboutDialog"
+msgid "Qt"
+msgstr ""
+
+#: aboutdialog.ui:69
+msgctxt "AboutDialog"
+msgid "Tor"
+msgstr ""
+
+#: aboutdialog.cpp:53
+msgctxt "AboutDialog"
+msgid "Unavailable"
+msgstr ""
+
+#: aboutdialog.cpp:57
+msgctxt "AboutDialog"
+msgid "Not Running"
+msgstr ""
+
+#: aboutdialog.ui:81
+msgctxt "AboutDialog"
+msgid "0.2.0"
+msgstr ""
+
+#: aboutdialog.ui:106
+msgctxt "AboutDialog"
+msgid "0.2.0.31-alpha-dev (r123456)"
msgstr ""
+#: aboutdialog.ui:131
msgctxt "AboutDialog"
-msgid "Vidalia 0.2.0"
+msgid "4.4.2"
msgstr ""
+#: aboutdialog.ui:107
msgctxt "AboutDialog"
-msgid "Tor 0.2.0.32"
+msgid "License"
msgstr ""
+#: aboutdialog.ui:163
msgctxt "AboutDialog"
-msgid "Qt 4.4.2"
+msgid "version"
msgstr ""
+#: advancedpage.cpp:109
msgctxt "AdvancedPage"
msgid "'%1' is not a valid IP address."
msgstr ""
+#: advancedpage.cpp:120
msgctxt "AdvancedPage"
-msgid ""
-"You selected 'Password' authentication, but did not specify a password."
+msgid "You selected 'Password' authentication, but did not specify a password."
msgstr ""
+#: advancedpage.cpp:223
msgctxt "AdvancedPage"
msgid "Select Tor Configuration File"
msgstr ""
+#: advancedpage.cpp:236
msgctxt "AdvancedPage"
msgid "File Not Found"
msgstr ""
+#: advancedpage.cpp:238
msgctxt "AdvancedPage"
msgid "%1 does not exist. Would you like to create it?"
msgstr ""
+#: advancedpage.cpp:249
msgctxt "AdvancedPage"
msgid "Failed to Create File"
msgstr ""
+#: advancedpage.cpp:250
msgctxt "AdvancedPage"
msgid "Unable to create %1 [%2]"
msgstr ""
+#: advancedpage.cpp:265
msgctxt "AdvancedPage"
msgid "Select a Directory to Use for Tor Data"
msgstr ""
+#: advancedpage.cpp:287
msgctxt "AdvancedPage"
msgid "Unable to remove Tor Service"
msgstr ""
+#: advancedpage.cpp:289
+msgctxt "AdvancedPage"
+msgid "Vidalia was unable to remove the Tor service."
+""
+"You may need to remove it manually."
+msgstr ""
+
+#: advancedpage.cpp:298
msgctxt "AdvancedPage"
msgid "Unable to install Tor Service"
msgstr ""
+#: advancedpage.cpp:299
msgctxt "AdvancedPage"
msgid "Vidalia was unable to install the Tor service."
msgstr ""
+#: advancedpage.ui:28
+msgctxt "AdvancedPage"
+msgid "Control Port"
+msgstr ""
+
+#: advancedpage.ui:48
msgctxt "AdvancedPage"
msgid "Authentication:"
msgstr ""
+#: advancedpage.ui:58
msgctxt "AdvancedPage"
msgid "Address:"
msgstr ""
+#: advancedpage.ui:86
msgctxt "AdvancedPage"
msgid "None"
msgstr ""
+#: advancedpage.ui:91
msgctxt "AdvancedPage"
msgid "Cookie"
msgstr ""
+#: advancedpage.ui:96
msgctxt "AdvancedPage"
msgid "Password"
msgstr ""
+#: advancedpage.ui:111
msgctxt "AdvancedPage"
msgid "Randomly Generate"
msgstr ""
+#: advancedpage.ui:157
msgctxt "AdvancedPage"
msgid ":"
msgstr ""
+#: advancedpage.ui:219
msgctxt "AdvancedPage"
msgid "Tor Configuration File"
msgstr ""
+#: advancedpage.ui:240
msgctxt "AdvancedPage"
msgid "Start the Tor software with the specified configuration file (torrc)"
msgstr ""
+#: advancedpage.ui:259
msgctxt "AdvancedPage"
msgid "Select path to your configuration file"
msgstr ""
+#: advancedpage.ui:318
msgctxt "AdvancedPage"
msgid "Browse"
msgstr ""
+#: advancedpage.ui:275
msgctxt "AdvancedPage"
msgid "Data Directory"
msgstr ""
+#: advancedpage.ui:296
msgctxt "AdvancedPage"
msgid "Store data for the Tor software in the following directory"
msgstr ""
+#: advancedpage.ui:315
msgctxt "AdvancedPage"
msgid "Select the directory used to store data for the Tor software"
msgstr ""
-msgctxt "AdvancedPage"
-msgid "Tor Control"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "Use TCP connection (ControlPort)"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "Path:"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "Use Unix domain socket (ControlSocket)"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "Edit current torrc"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "NOTE: this will edit the currently loaded torrc"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "ControlSocket path doesn't exist."
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid ""
-"The specified Tor configuration file location contains characters that "
-"cannot be represented in your system's current 8-bit character encoding."
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid ""
-"The specified Tor data directory location contains characters that cannot be"
-" represented in your system's current 8-bit character encoding."
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "Warning"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "You changed torrc path, would you like to restart Tor?"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "Tor Configuration File (torrc);;All Files (*)"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "Select a file to use for Tor socket path"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "Configure ControlPort automatically"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid ""
-"Vidalia was unable to remove the Tor service.\n"
-"\n"
-"You may need to remove it manually."
-msgstr ""
-
+#: appearancepage.ui:22
msgctxt "AppearancePage"
msgid "Language"
msgstr ""
+#: appearancepage.ui:37
msgctxt "AppearancePage"
msgid "Choose the language used in Vidalia"
msgstr ""
+#: appearancepage.ui:75
msgctxt "AppearancePage"
msgid "Style"
msgstr ""
+#: appearancepage.ui:103
msgctxt "AppearancePage"
msgid "Choose Vidalia's interface style"
msgstr ""
+#: appearancepage.cpp:67
msgctxt "AppearancePage"
msgid "Vidalia was unable to load the selected language translation."
msgstr ""
+#: bwgraph.cpp:166
msgctxt "BandwidthGraph"
msgid "Since:"
msgstr ""
+#: bwgraph.cpp:232
msgctxt "BandwidthGraph"
msgid "Hide Settings"
msgstr ""
+#: bwgraph.ui:40
msgctxt "BandwidthGraph"
msgid "Show Settings"
msgstr ""
+#: bwgraph.ui:16
msgctxt "BandwidthGraph"
msgid "Tor Bandwidth Usage"
msgstr ""
+#: bwgraph.ui:63
msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
+#: bwgraph.ui:151
msgctxt "BandwidthGraph"
msgid "Receive Rate"
msgstr ""
+#: bwgraph.ui:170
msgctxt "BandwidthGraph"
msgid "Send Rate"
msgstr ""
+#: bwgraph.ui:183
msgctxt "BandwidthGraph"
msgid "Always on Top"
msgstr ""
+#: bwgraph.ui:234
msgctxt "BandwidthGraph"
msgid "Style"
msgstr ""
+#: bwgraph.ui:284
msgctxt "BandwidthGraph"
msgid "Changes the transparency of the Bandwidth Graph"
msgstr ""
+#: bwgraph.ui:368
msgctxt "BandwidthGraph"
msgid "100"
msgstr ""
+#: bwgraph.ui:383
msgctxt "BandwidthGraph"
msgid "% Opaque"
msgstr ""
+#: bwgraph.ui:443
msgctxt "BandwidthGraph"
msgid "Save"
msgstr ""
+#: bwgraph.ui:450
msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
-msgctxt "BridgeDownloader"
-msgid "Starting HTTPS bridge request..."
-msgstr ""
-
-msgctxt "BridgeDownloader"
-msgid "Connecting to %1:%2..."
-msgstr ""
-
-msgctxt "BridgeDownloader"
-msgid "Sending an HTTPS request for bridges..."
-msgstr ""
-
-msgctxt "BridgeDownloader"
-msgid "Downloading a list of bridges..."
-msgstr ""
-
-msgctxt "BridgeDownloaderProgressDialog"
-msgid "Downloading Bridges"
-msgstr ""
-
-msgctxt "BridgeDownloaderProgressDialog"
-msgid "Unable to download bridges: %1"
-msgstr ""
-
-msgctxt "BridgeDownloaderProgressDialog"
-msgid "Retrying bridge request..."
-msgstr ""
-
-msgctxt "BridgeUsageDialog"
-msgid "Country"
-msgstr ""
-
-msgctxt "BridgeUsageDialog"
-msgid "# Clients"
-msgstr ""
-
-msgctxt "BridgeUsageDialog"
-msgid "Clients from the following countries have used your relay since %1"
-msgstr ""
-
-msgctxt "BridgeUsageDialog"
-msgid "Bridge Usage Summary"
-msgstr ""
-
-msgctxt "BridgeUsageDialog"
-msgid "Client Summary"
-msgstr ""
-
+#: circuit.cpp:112
msgctxt "Circuit"
msgid "New"
msgstr ""
+#: circuit.cpp:113
msgctxt "Circuit"
msgid "Open"
msgstr ""
+#: circuit.cpp:114
msgctxt "Circuit"
msgid "Building"
msgstr ""
+#: circuit.cpp:115
msgctxt "Circuit"
msgid "Failed"
msgstr ""
+#: circuit.cpp:116
msgctxt "Circuit"
msgid "Closed"
msgstr ""
+#: circuit.cpp:117
msgctxt "Circuit"
msgid "Unknown"
msgstr ""
+#: circuititem.cpp:39
msgctxt "CircuitItem"
msgid "<Path Empty>"
msgstr ""
+#: circuitlistwidget.cpp:55
msgctxt "CircuitListWidget"
msgid "Connection"
msgstr ""
+#: circuitlistwidget.cpp:55
msgctxt "CircuitListWidget"
msgid "Status"
msgstr ""
+#: circuitlistwidget.cpp:87
msgctxt "CircuitListWidget"
msgid "Zoom to Circuit"
msgstr ""
+#: circuitlistwidget.cpp:89
msgctxt "CircuitListWidget"
msgid "Close Circuit (Del)"
msgstr ""
+#: circuitlistwidget.cpp:110
msgctxt "CircuitListWidget"
msgid "Close Stream (Del)"
msgstr ""
+#: configdialog.cpp:77
msgctxt "ConfigDialog"
msgid "General"
msgstr ""
+#: configdialog.cpp:81
msgctxt "ConfigDialog"
msgid "Network"
msgstr ""
+#: configdialog.cpp:85
msgctxt "ConfigDialog"
msgid "Sharing"
msgstr ""
+#: configdialog.cpp:89
msgctxt "ConfigDialog"
msgid "Services"
msgstr ""
+#: configdialog.cpp:93
msgctxt "ConfigDialog"
msgid "Appearance"
msgstr ""
+#: configdialog.cpp:97
msgctxt "ConfigDialog"
msgid "Advanced"
msgstr ""
+#: configdialog.cpp:111
msgctxt "ConfigDialog"
msgid "Help"
msgstr ""
+#: configdialog.cpp:196
msgctxt "ConfigDialog"
msgid "Error Saving Settings"
msgstr ""
+#: configdialog.cpp:198
msgctxt "ConfigDialog"
msgid "Vidalia was unable to save your %1 settings."
msgstr ""
+#: configdialog.cpp:225
msgctxt "ConfigDialog"
msgid "Error Applying Settings"
msgstr ""
+#: configdialog.cpp:227
msgctxt "ConfigDialog"
msgid "Vidalia was unable to apply your %1 settings to Tor."
msgstr ""
+#: configdialog.ui:16
msgctxt "ConfigDialog"
msgid "Settings"
msgstr ""
+#: controlconnection.cpp:134
msgctxt "ControlConnection"
msgid "Vidalia was unable to connect to Tor. (%1)"
msgstr ""
+#: controlconnection.cpp:331
msgctxt "ControlConnection"
msgid "Control socket is not connected."
msgstr ""
+#: controlpasswordinputdialog.ui:28
msgctxt "ControlPasswordInputDialog"
msgid "Password Required"
msgstr ""
+#: controlpasswordinputdialog.ui:80
msgctxt "ControlPasswordInputDialog"
-msgid "Remember my password"
+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:"
+msgid "Remember my password"
msgstr ""
+#: controlsocket.cpp:70
msgctxt "ControlSocket"
msgid "Control socket is not connected."
msgstr ""
+#: controlsocket.cpp:80
msgctxt "ControlSocket"
msgid "Error sending control command. [%1]"
msgstr ""
+#: controlsocket.cpp:117
msgctxt "ControlSocket"
msgid "Socket disconnected while attempting to read a line of data."
msgstr ""
+#: controlsocket.cpp:156
msgctxt "ControlSocket"
msgid "Invalid control reply. [%1]"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Afghanistan"
+#: generalpage.cpp:62
+msgctxt "GeneralPage"
+msgid "Executables (*.exe)"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Andorra"
+#: generalpage.cpp:75
+msgctxt "GeneralPage"
+msgid "Select Path to Tor"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Angola"
+#: generalpage.cpp:85
+msgctxt "GeneralPage"
+msgid "Select Proxy Executable"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Antigua & Barbuda"
+#: generalpage.cpp:98
+msgctxt "GeneralPage"
+msgid "You must specify the name of your Tor executable."
msgstr ""
-msgctxt "CountryInfo"
-msgid "Argentina"
+#: generalpage.cpp:106
+msgctxt "GeneralPage"
+msgid "The proxy arguments specified are not properly formatted."
msgstr ""
-msgctxt "CountryInfo"
-msgid "Armenia"
+#: generalpage.ui:28
+msgctxt "GeneralPage"
+msgid "Start Vidalia when my system starts"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Australia"
+#: generalpage.ui:121
+msgctxt "GeneralPage"
+msgid "Browse"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Azerbaijan"
+#: generalpage.ui:57
+msgctxt "GeneralPage"
+msgid "Start the Tor software when Vidalia starts"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Bahamas"
+#: generalpage.ui:51
+msgctxt "GeneralPage"
+msgid "Tor"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Bangladesh"
+#: generalpage.ui:93
+msgctxt "GeneralPage"
+msgid "Proxy Application (optional)"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Barbados"
+#: generalpage.ui:99
+msgctxt "GeneralPage"
+msgid "Start a proxy application when Tor starts"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Belarus"
+#: generalpage.ui:135
+msgctxt "GeneralPage"
+msgid "Proxy Application Arguments:"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Belgium"
+#: graphframe.cpp:238
+msgctxt "GraphFrame"
+msgid "Recv: "
msgstr ""
-msgctxt "CountryInfo"
-msgid "Belize"
+#: graphframe.cpp:298
+msgctxt "GraphFrame"
+msgid "%1 KB/s"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Bhutan"
+#: graphframe.cpp:247
+msgctxt "GraphFrame"
+msgid "Sent: "
msgstr ""
-msgctxt "CountryInfo"
-msgid "Bolivia"
+#: graphframe.cpp:259
+msgctxt "GraphFrame"
+msgid "%1 KB"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Bosnia & Herzegovina"
+#: graphframe.cpp:262
+msgctxt "GraphFrame"
+msgid "%1 MB"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Botswana"
+#: graphframe.cpp:265
+msgctxt "GraphFrame"
+msgid "%1 GB"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Brazil"
+#: helpbrowser.cpp:135
+msgctxt "HelpBrowser"
+msgid "Error Loading Help Contents: "
msgstr ""
-msgctxt "CountryInfo"
-msgid "Brunei Darussalam"
+#: helpbrowser.cpp:147
+msgctxt "HelpBrowser"
+msgid "Supplied XML file is not a valid Contents document."
msgstr ""
-msgctxt "CountryInfo"
-msgid "Bulgaria"
+#: helpbrowser.cpp:396
+msgctxt "HelpBrowser"
+msgid "Search reached end of document"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Burkina Faso"
+#: helpbrowser.cpp:398
+msgctxt "HelpBrowser"
+msgid "Search reached start of document"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Burundi"
+#: helpbrowser.cpp:400
+msgctxt "HelpBrowser"
+msgid "Text not found in document"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Cambodia"
+#: helpbrowser.cpp:445
+msgctxt "HelpBrowser"
+msgid "Found %1 results"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Cameroon"
+#: helpbrowser.ui:33
+msgctxt "HelpBrowser"
+msgid "Vidalia Help"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Canada"
+#: helpbrowser.ui:484
+msgctxt "HelpBrowser"
+msgid "Back"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Cape Verde"
+#: helpbrowser.ui:487
+msgctxt "HelpBrowser"
+msgid "Move to previous page (Backspace)"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Central African Republic"
+#: helpbrowser.ui:490
+msgctxt "HelpBrowser"
+msgid "Backspace"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Chad"
+#: helpbrowser.ui:498
+msgctxt "HelpBrowser"
+msgid "Forward"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Chile"
+#: helpbrowser.ui:501
+msgctxt "HelpBrowser"
+msgid "Move to next page (Shift+Backspace)"
msgstr ""
-msgctxt "CountryInfo"
-msgid "China"
+#: helpbrowser.ui:504
+msgctxt "HelpBrowser"
+msgid "Shift+Backspace"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Colombia"
+#: helpbrowser.ui:512
+msgctxt "HelpBrowser"
+msgid "Home"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Comoros"
+#: helpbrowser.ui:515
+msgctxt "HelpBrowser"
+msgid "Move to the Home page (Ctrl+H)"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Congo, The Democratic Republic of the"
+#: helpbrowser.ui:518
+msgctxt "HelpBrowser"
+msgid "Ctrl+H"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Congo"
+#: helpbrowser.ui:535
+msgctxt "HelpBrowser"
+msgid "Find"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Costa Rica"
+#: helpbrowser.ui:538
+msgctxt "HelpBrowser"
+msgid "Search for a word or phrase on current page (Ctrl+F)"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Cote d’Ivoire"
+#: helpbrowser.ui:541
+msgctxt "HelpBrowser"
+msgid "Ctrl+F"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Croatia"
+#: helpbrowser.ui:549
+msgctxt "HelpBrowser"
+msgid "Close"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Cuba"
+#: helpbrowser.ui:552
+msgctxt "HelpBrowser"
+msgid "Close Vidalia Help"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Cyprus"
+#: helpbrowser.ui:555
+msgctxt "HelpBrowser"
+msgid "Esc"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Czech Republic"
+#: helpbrowser.ui:152
+msgctxt "HelpBrowser"
+msgid "Find:"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Denmark"
+#: helpbrowser.ui:174
+msgctxt "HelpBrowser"
+msgid "Find Previous"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Djibouti"
+#: helpbrowser.ui:187
+msgctxt "HelpBrowser"
+msgid "Find Next"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Dominica"
+#: helpbrowser.ui:221
+msgctxt "HelpBrowser"
+msgid "Case sensitive"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Dominican Republic"
+#: helpbrowser.ui:231
+msgctxt "HelpBrowser"
+msgid "Whole words only"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Ecuador"
+#: helpbrowser.ui:305
+msgctxt "HelpBrowser"
+msgid "Help Topics"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Egypt"
+#: helpbrowser.ui:260
+msgctxt "HelpBrowser"
+msgid "Contents"
msgstr ""
-msgctxt "CountryInfo"
-msgid "El Salvador"
+#: helpbrowser.ui:350
+msgctxt "HelpBrowser"
+msgid "Search"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Equatorial Guinea"
+#: helpbrowser.ui:362
+msgctxt "HelpBrowser"
+msgid "Searching for:"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Eritrea"
+#: helpbrowser.ui:405
+msgctxt "HelpBrowser"
+msgid "Found Documents"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Estonia"
+#: helptextbrowser.cpp:54
+msgctxt "HelpTextBrowser"
+msgid "Error opening help file: "
msgstr ""
-msgctxt "CountryInfo"
-msgid "France"
+#: helptextbrowser.cpp:72
+msgctxt "HelpTextBrowser"
+msgid "Opening External Link"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Gabon"
+#: 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."
msgstr ""
-msgctxt "CountryInfo"
-msgid "Gambia"
+#: helptextbrowser.cpp:78
+msgctxt "HelpTextBrowser"
+msgid "Do you want Vidalia to open the link in your Web browser?"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Georgia"
+#: helptextbrowser.cpp:88
+msgctxt "HelpTextBrowser"
+msgid "Unable to Open Link"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Germany"
+#: helptextbrowser.cpp:90
+msgctxt "HelpTextBrowser"
+msgid "Vidalia was unable to open the selected link in your Web browser. You can still copy the URL and paste it into your browser."
msgstr ""
-msgctxt "CountryInfo"
-msgid "Ghana"
+#: licensedialog.ui:13
+msgctxt "LicenseDialog"
+msgid "License Information"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Grenada"
+#: licensedialog.ui:43
+msgctxt "LicenseDialog"
+msgid "License"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Guatemala"
+#: licensedialog.ui:76
+msgctxt "LicenseDialog"
+msgid "Credits"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Guinea"
+#: logevent.cpp:57
+msgctxt "LogEvent"
+msgid "Debug"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Guinea-Bissau"
+#: logevent.cpp:58
+msgctxt "LogEvent"
+msgid "Info"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Guyana"
+#: logevent.cpp:59
+msgctxt "LogEvent"
+msgid "Notice"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Hong Kong"
+#: logevent.cpp:60
+msgctxt "LogEvent"
+msgid "Warning"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Haiti"
+#: logevent.cpp:61
+msgctxt "LogEvent"
+msgid "Error"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Honduras"
+#: logevent.cpp:62
+msgctxt "LogEvent"
+msgid "Unknown"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Israel"
+#: mainwindow.ui:233
+msgctxt "MainWindow"
+msgid "Start Tor"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Italy"
+#: mainwindow.ui:443
+msgctxt "MainWindow"
+msgid "Exit"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Jamaica"
+#: mainwindow.ui:304
+msgctxt "MainWindow"
+msgid "Bandwidth Graph"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Japan"
+#: mainwindow.ui:317
+msgctxt "MainWindow"
+msgid "Message Log"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Jordan"
+#: mainwindow.cpp:348
+msgctxt "MainWindow"
+msgid "Network Map"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Kazakhstan"
+#: mainwindow.cpp:354
+msgctxt "MainWindow"
+msgid "Control Panel"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Kenya"
+#: mainwindow.ui:380
+msgctxt "MainWindow"
+msgid "Settings"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Kiribati"
+#: mainwindow.ui:430
+msgctxt "MainWindow"
+msgid "About"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Kuwait"
+#: mainwindow.ui:367
+msgctxt "MainWindow"
+msgid "Help"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Kyrgyzstan"
+#: mainwindow.cpp:1391
+msgctxt "MainWindow"
+msgid "New Identity"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Laos"
+#: mainwindow.cpp:437
+msgctxt "MainWindow"
+msgid "Ctrl+T"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Latvia"
+#: mainwindow.cpp:438
+msgctxt "MainWindow"
+msgid "Ctrl+B"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Lebanon"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Lesotho"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Liberia"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Liechtenstein"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Lithuania"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Luxembourg"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Macedonia"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Madagascar"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Malawi"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Malaysia"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Mali"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Malta"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Marshall Islands"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Mauritania"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Mauritius"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Micronesia"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Moldova"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Monaco"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Mongolia"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Montenegro"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Morocco"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Mozambique"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Namibia"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Nauru"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Nepal"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Netherlands"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "New Zealand"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Nicaragua"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Niger"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Nigeria"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Norway"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Oman"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Pakistan"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Palau"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Palestine"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Panama"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Papua New Guinea"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Paraguay"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Peru"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Philippines"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Poland"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Portugal"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Qatar"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Romania"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Russia"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Rwanda"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Saint Kitts & Nevis"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Saint Lucia"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Saint Vincent & the Grenadines"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Samoa"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "San Marino"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Sao Tome & Principe"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Saudi Arabia"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Senegal"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Serbia"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Seychelles"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Sierra Leone"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Singapore"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Slovakia"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Slovenia"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Solomon Islands"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Somalia"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "South Africa"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Spain"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Sri Lanka"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Sudan"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Suriname"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Swaziland"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Sweden"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Switzerland"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Syria"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Tajikistan"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Tanzania"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Thailand"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Timor-Leste (East Timor)"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Togo"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Tonga"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Trinidad & Tobago"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Tunisia"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Turkey"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Turkmenistan"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Tuvalu"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Uganda"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Ukraine"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "United Arab Emirates"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "United Kingdom"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "United States"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Uruguay"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Uzbekistan"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Vanuatu"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Vatican"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Venezuela"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Vietnam"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Western Sahara"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Yemen"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Zambia"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Zimbabwe"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Zaire"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Albania"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Algeria"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Austria"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Bahrain"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Benin"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Ethiopia"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Fiji"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Finland"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Greece"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Guam"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Hungary"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Iceland"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "India"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Indonesia"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Iran"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Iraq"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Ireland"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Korea, North"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Korea, South"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Libya"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Maldives"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Mexico"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Myanmar"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Taiwan"
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid "Submit a Crash Report"
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid "Vidalia encountered an error and needed to close"
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid "Restart Vidalia"
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid "Don't Restart"
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid "Unable to restart Vidalia"
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid ""
-"We were unable to automatically restart Vidalia. Please restart Vidalia "
-"manually."
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid "Please fill a ticket in:"
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid ""
-"<a "
-"href=\"https://trac.torproject.org/projects/tor/newticket\">https://trac.torproject.org/projects/tor/newticket</a>"
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid ""
-"A crash report has been created that you can send to the Vidalia developers "
-"to help identify and fix the problem. The submitted report does not contain "
-"any personally identifying information."
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid ""
-"with a description of what you were doing before the application crashed, "
-"along with the following files corresponding to the crash report:"
-msgstr ""
-
-msgctxt "GeneralPage"
-msgid "Executables (*.exe)"
-msgstr ""
-
-msgctxt "GeneralPage"
-msgid "Select Path to Tor"
-msgstr ""
-
-msgctxt "GeneralPage"
-msgid "Select Proxy Executable"
-msgstr ""
-
-msgctxt "GeneralPage"
-msgid "You must specify the name of your Tor executable."
-msgstr ""
-
-msgctxt "GeneralPage"
-msgid "Start Vidalia when my system starts"
-msgstr ""
-
-msgctxt "GeneralPage"
-msgid "Browse"
-msgstr ""
-
-msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr ""
-
-msgctxt "GeneralPage"
-msgid "Tor"
-msgstr ""
-
-msgctxt "GeneralPage"
-msgid "Proxy Application (optional)"
-msgstr ""
-
-msgctxt "GeneralPage"
-msgid "Start a proxy application when Tor starts"
-msgstr ""
-
-msgctxt "GeneralPage"
-msgid "Proxy Application Arguments:"
-msgstr ""
-
-msgctxt "GeneralPage"
-msgid "Software Updates"
-msgstr ""
-
-msgctxt "GeneralPage"
-msgid "Check for new software updates automatically"
-msgstr ""
-
-msgctxt "GeneralPage"
-msgid "Check Now"
-msgstr ""
-
-msgctxt "GraphFrame"
-msgid "%1 KB/s"
-msgstr ""
-
-msgctxt "GraphFrame"
-msgid "%1 KB"
-msgstr ""
-
-msgctxt "GraphFrame"
-msgid "%1 MB"
-msgstr ""
-
-msgctxt "GraphFrame"
-msgid "%1 GB"
-msgstr ""
-
-msgctxt "GraphFrame"
-msgid "Recv:"
-msgstr ""
-
-msgctxt "GraphFrame"
-msgid "Sent:"
-msgstr ""
-
-msgctxt "HelpBrowser"
-msgid "Supplied XML file is not a valid Contents document."
-msgstr ""
-
-msgctxt "HelpBrowser"
-msgid "Search reached end of document"
-msgstr ""
-
-msgctxt "HelpBrowser"
-msgid "Search reached start of document"
-msgstr ""
-
-msgctxt "HelpBrowser"
-msgid "Text not found in document"
-msgstr ""
-
-msgctxt "HelpBrowser"
-msgid "Found %1 results"
-msgstr ""
-
-msgctxt "HelpBrowser"
-msgid "Vidalia Help"
-msgstr ""
-
-msgctxt "HelpBrowser"
-msgid "Back"
-msgstr ""
-
-msgctxt "HelpBrowser"
-msgid "Move to previous page (Backspace)"
-msgstr ""
-
-msgctxt "HelpBrowser"
-msgid "Backspace"
-msgstr ""
-
-msgctxt "HelpBrowser"
-msgid "Forward"
-msgstr ""
-
-msgctxt "HelpBrowser"
-msgid "Move to next page (Shift+Backspace)"
-msgstr ""
-
-msgctxt "HelpBrowser"
-msgid "Shift+Backspace"
-msgstr ""
-
-msgctxt "HelpBrowser"
-msgid "Home"
-msgstr ""
-
-msgctxt "HelpBrowser"
-msgid "Move to the Home page (Ctrl+H)"
-msgstr ""
-
-msgctxt "HelpBrowser"
-msgid "Ctrl+H"
-msgstr ""
-
-msgctxt "HelpBrowser"
-msgid "Find"
-msgstr ""
-
-msgctxt "HelpBrowser"
-msgid "Search for a word or phrase on current page (Ctrl+F)"
-msgstr ""
-
-msgctxt "HelpBrowser"
-msgid "Ctrl+F"
-msgstr ""
-
-msgctxt "HelpBrowser"
-msgid "Close"
-msgstr ""
-
-msgctxt "HelpBrowser"
-msgid "Close Vidalia Help"
-msgstr ""
-
-msgctxt "HelpBrowser"
-msgid "Esc"
-msgstr ""
-
-msgctxt "HelpBrowser"
-msgid "Find:"
-msgstr ""
-
-msgctxt "HelpBrowser"
-msgid "Find Previous"
-msgstr ""
-
-msgctxt "HelpBrowser"
-msgid "Find Next"
-msgstr ""
-
-msgctxt "HelpBrowser"
-msgid "Case sensitive"
-msgstr ""
-
-msgctxt "HelpBrowser"
-msgid "Whole words only"
-msgstr ""
-
-msgctxt "HelpBrowser"
-msgid "Help Topics"
-msgstr ""
-
-msgctxt "HelpBrowser"
-msgid "Contents"
-msgstr ""
-
-msgctxt "HelpBrowser"
-msgid "Search"
-msgstr ""
-
-msgctxt "HelpBrowser"
-msgid "Searching for:"
-msgstr ""
-
-msgctxt "HelpBrowser"
-msgid "Found Documents"
-msgstr ""
-
-msgctxt "HelpBrowser"
-msgid "Error Loading Help Contents:"
-msgstr ""
-
-msgctxt "HelpTextBrowser"
-msgid "Opening External Link"
-msgstr ""
-
-msgctxt "HelpTextBrowser"
-msgid ""
-"Vidalia can open the link you selected in your default Web browser. If your "
-"browser is not currently configured to use Tor then the request will not be "
-"anonymous."
-msgstr ""
-
-msgctxt "HelpTextBrowser"
-msgid "Do you want Vidalia to open the link in your Web browser?"
-msgstr ""
-
-msgctxt "HelpTextBrowser"
-msgid "Unable to Open Link"
-msgstr ""
-
-msgctxt "HelpTextBrowser"
-msgid ""
-"Vidalia was unable to open the selected link in your Web browser. You can "
-"still copy the URL and paste it into your browser."
-msgstr ""
-
-msgctxt "HelpTextBrowser"
-msgid "Error opening help file:"
-msgstr ""
-
-msgctxt "LicenseDialog"
-msgid "License Information"
-msgstr ""
-
-msgctxt "LicenseDialog"
-msgid "License"
-msgstr ""
-
-msgctxt "LicenseDialog"
-msgid "Credits"
-msgstr ""
-
-msgctxt "LogEvent"
-msgid "Debug"
-msgstr ""
-
-msgctxt "LogEvent"
-msgid "Info"
-msgstr ""
-
-msgctxt "LogEvent"
-msgid "Notice"
-msgstr ""
-
-msgctxt "LogEvent"
-msgid "Warning"
-msgstr ""
-
-msgctxt "LogEvent"
-msgid "Error"
-msgstr ""
-
-msgctxt "LogEvent"
-msgid "Unknown"
-msgstr ""
-
-msgctxt "LogTreeItem"
-msgid "Debug"
-msgstr ""
-
-msgctxt "LogTreeItem"
-msgid "Info"
-msgstr ""
-
-msgctxt "LogTreeItem"
-msgid "Notice"
-msgstr ""
-
-msgctxt "LogTreeItem"
-msgid "Warning"
-msgstr ""
-
-msgctxt "LogTreeItem"
-msgid "Error"
-msgstr ""
-
-msgctxt "LogTreeItem"
-msgid "Unknown"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Start Tor"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Exit"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Bandwidth Graph"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Message Log"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Network Map"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Control Panel"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Settings"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "About"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Help"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "New Identity"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+T"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+B"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+L"
+#: mainwindow.cpp:439
+msgctxt "MainWindow"
+msgid "Ctrl+L"
msgstr ""
+#: mainwindow.cpp:440
msgctxt "MainWindow"
msgid "Ctrl+N"
msgstr ""
+#: mainwindow.cpp:441
msgctxt "MainWindow"
msgid "Ctrl+?"
msgstr ""
+#: mainwindow.cpp:442
msgctxt "MainWindow"
msgid "Ctrl+I"
msgstr ""
+#: mainwindow.cpp:443
msgctxt "MainWindow"
msgid "Ctrl+P"
msgstr ""
+#: mainwindow.cpp:463
msgctxt "MainWindow"
msgid "Tor"
msgstr ""
+#: mainwindow.cpp:468
msgctxt "MainWindow"
msgid "View"
msgstr ""
+#: mainwindow.cpp:476
msgctxt "MainWindow"
msgid "Vidalia Help"
msgstr ""
+#: mainwindow.cpp:527
msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
+#: mainwindow.cpp:528
msgctxt "MainWindow"
msgid "Vidalia was unable to start the configured web browser"
msgstr ""
+#: mainwindow.cpp:540
msgctxt "MainWindow"
msgid "Error starting IM client"
msgstr ""
+#: mainwindow.cpp:541
msgctxt "MainWindow"
msgid "Vidalia was unable to start the configured IM client"
msgstr ""
+#: mainwindow.cpp:562
msgctxt "MainWindow"
msgid "Error starting proxy server"
msgstr ""
+#: mainwindow.cpp:563
msgctxt "MainWindow"
msgid "Vidalia was unable to start the configured proxy server"
msgstr ""
+#: mainwindow.cpp:579
msgctxt "MainWindow"
msgid "Connecting to a relay directory"
msgstr ""
+#: mainwindow.cpp:583
msgctxt "MainWindow"
msgid "Establishing an encrypted directory connection"
msgstr ""
+#: mainwindow.cpp:586
msgctxt "MainWindow"
msgid "Retrieving network status"
msgstr ""
+#: mainwindow.cpp:589
msgctxt "MainWindow"
msgid "Loading network status"
msgstr ""
+#: mainwindow.cpp:592
msgctxt "MainWindow"
msgid "Loading authority certificates"
msgstr ""
+#: mainwindow.cpp:595
msgctxt "MainWindow"
msgid "Requesting relay information"
msgstr ""
+#: mainwindow.cpp:598
msgctxt "MainWindow"
msgid "Loading relay information"
msgstr ""
+#: mainwindow.cpp:1132
msgctxt "MainWindow"
msgid "Connecting to the Tor network"
msgstr ""
+#: mainwindow.cpp:605
msgctxt "MainWindow"
msgid "Establishing a Tor circuit"
msgstr ""
+#: mainwindow.cpp:1297
msgctxt "MainWindow"
msgid "Connected to the Tor network!"
msgstr ""
+#: mainwindow.cpp:612
msgctxt "MainWindow"
msgid "Unrecognized startup status"
msgstr ""
+#: mainwindow.cpp:619
msgctxt "MainWindow"
msgid "miscellaneous"
msgstr ""
+#: mainwindow.cpp:622
msgctxt "MainWindow"
msgid "identity mismatch"
msgstr ""
+#: mainwindow.cpp:625
msgctxt "MainWindow"
msgid "done"
msgstr ""
+#: mainwindow.cpp:628
msgctxt "MainWindow"
msgid "connection refused"
msgstr ""
+#: mainwindow.cpp:631
msgctxt "MainWindow"
msgid "connection timeout"
msgstr ""
+#: mainwindow.cpp:634
msgctxt "MainWindow"
msgid "read/write error"
msgstr ""
+#: mainwindow.cpp:637
msgctxt "MainWindow"
msgid "no route to host"
msgstr ""
+#: mainwindow.cpp:640
msgctxt "MainWindow"
msgid "insufficient resources"
msgstr ""
+#: mainwindow.cpp:643
msgctxt "MainWindow"
msgid "unknown"
msgstr ""
+#: mainwindow.cpp:645
+msgctxt "MainWindow"
+msgid " failed (%1)"
+msgstr ""
+
+#: mainwindow.ui:168
msgctxt "MainWindow"
msgid "Tor is not running"
msgstr ""
+#: mainwindow.cpp:686
+msgctxt "MainWindow"
+msgid "Your relay is shutting down."
+"Click 'Stop' again to stop your relay now."
+msgstr ""
+
+#: mainwindow.cpp:688
msgctxt "MainWindow"
msgid "Tor is shutting down"
msgstr ""
+#: mainwindow.cpp:693
msgctxt "MainWindow"
msgid "Stop Tor Now"
msgstr ""
+#: mainwindow.cpp:695
msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
+#: mainwindow.cpp:711
msgctxt "MainWindow"
msgid "Starting the Tor software"
msgstr ""
+#: mainwindow.ui:75
msgctxt "MainWindow"
msgid "Starting Tor"
msgstr ""
+#: mainwindow.cpp:859
msgctxt "MainWindow"
msgid "Error Starting Tor"
msgstr ""
+#: mainwindow.cpp:862
msgctxt "MainWindow"
-msgid ""
-"Vidalia was unable to start Tor. Check your settings to ensure the correct "
-"name and location of your Tor executable is specified."
+msgid "Vidalia was unable to start Tor. Check your settings to ensure the correct name and location of your Tor executable is specified."
msgstr ""
+#: mainwindow.cpp:896
msgctxt "MainWindow"
msgid "Connecting to Tor"
msgstr ""
+#: mainwindow.cpp:906
msgctxt "MainWindow"
msgid "Connection Error"
msgstr ""
+#: mainwindow.cpp:938
msgctxt "MainWindow"
msgid "Relaying is Enabled"
msgstr ""
+#: mainwindow.cpp:943
+msgctxt "MainWindow"
+msgid "You are currently running a relay. Terminating your relay will interrupt any open connections from clients."
+""
+"Would you like to shutdown gracefully and give clients time to find a new relay?"
+msgstr ""
+
+#: mainwindow.cpp:965
msgctxt "MainWindow"
msgid "Error Shutting Down"
msgstr ""
+#: mainwindow.cpp:966
msgctxt "MainWindow"
msgid "Vidalia was unable to stop the Tor software."
msgstr ""
+#: mainwindow.cpp:997
msgctxt "MainWindow"
msgid "Unexpected Error"
msgstr ""
+#: mainwindow.cpp:1001
+msgctxt "MainWindow"
+msgid "Vidalia detected that the Tor software exited unexpectedly."
+""
+"Please check the message log for recent warning or error messages."
+msgstr ""
+
+#: mainwindow.cpp:1055
msgctxt "MainWindow"
msgid "Authenticating to Tor"
msgstr ""
+#: mainwindow.cpp:1075
msgctxt "MainWindow"
msgid "Cookie Authentication Required"
msgstr ""
+#: mainwindow.cpp:1078
msgctxt "MainWindow"
-msgid ""
-"The Tor software requires Vidalia to send the contents of an authentication "
-"cookie, but Vidalia was unable to find one."
+msgid "The Tor software requires Vidalia to send the contents of an authentication cookie, but Vidalia was unable to find one."
msgstr ""
+#: mainwindow.cpp:1080
msgctxt "MainWindow"
msgid "Would you like to browse for the file 'control_auth_cookie' yourself?"
msgstr ""
+#: mainwindow.cpp:1087
msgctxt "MainWindow"
msgid "Data Directory"
msgstr ""
+#: mainwindow.cpp:1089
msgctxt "MainWindow"
msgid "Control Cookie (control_auth_cookie)"
msgstr ""
+#: mainwindow.cpp:1141
msgctxt "MainWindow"
msgid "Error Registering for Events"
msgstr ""
+#: mainwindow.cpp:1143
msgctxt "MainWindow"
-msgid ""
-"Vidalia was unable to register for some events. Many of Vidalia's features "
-"may be unavailable."
+msgid "Vidalia was unable to register for some events. Many of Vidalia's features may be unavailable."
msgstr ""
+#: mainwindow.cpp:1222
msgctxt "MainWindow"
msgid "Authentication Error"
msgstr ""
+#: mainwindow.cpp:1224
msgctxt "MainWindow"
msgid "Vidalia was unable to authenticate to the Tor software. (%1)"
msgstr ""
+#: mainwindow.cpp:1226
msgctxt "MainWindow"
msgid "Please check your control port authentication settings."
msgstr ""
+#: mainwindow.cpp:1330
msgctxt "MainWindow"
msgid "Tor Update Available"
msgstr ""
+#: mainwindow.cpp:1333
msgctxt "MainWindow"
-msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended. Please visit the Tor website to download the latest version."
+msgid "The currently installed version of Tor is out of date or no longer recommended. Please visit the Tor website to download the latest version."
msgstr ""
+#: mainwindow.cpp:1333
msgctxt "MainWindow"
msgid "Tor website: %1"
msgstr ""
+#: mainwindow.cpp:1394
msgctxt "MainWindow"
-msgid ""
-"All subsequent connections will appear to be different than your old "
-"connections."
+msgid "All subsequent connections will appear to be different than your old connections."
msgstr ""
+#: mainwindow.cpp:1409
msgctxt "MainWindow"
msgid "Failed to Create New Identity"
msgstr ""
+#: mainwindow.cpp:1458
msgctxt "MainWindow"
msgid "Port Forwarding Failed"
msgstr ""
+#: mainwindow.cpp:1459
msgctxt "MainWindow"
msgid "Vidalia was unable to configure automatic port forwarding."
msgstr ""
+#: mainwindow.ui:19
msgctxt "MainWindow"
msgid "Vidalia Control Panel"
msgstr ""
+#: mainwindow.ui:49
msgctxt "MainWindow"
msgid "Status"
msgstr ""
+#: mainwindow.ui:218
msgctxt "MainWindow"
msgid "Vidalia Shortcuts"
msgstr ""
+#: mainwindow.ui:243
msgctxt "MainWindow"
msgid "Setup Relaying"
msgstr ""
+#: mainwindow.ui:246
msgctxt "MainWindow"
msgid "Set up a relay and help the network grow"
msgstr ""
+#: mainwindow.ui:256
msgctxt "MainWindow"
msgid "View the Network"
msgstr ""
+#: mainwindow.ui:259
msgctxt "MainWindow"
msgid "View a map of the Tor network"
msgstr ""
+#: mainwindow.ui:272
msgctxt "MainWindow"
msgid "Use a New Identity"
msgstr ""
+#: mainwindow.ui:275
msgctxt "MainWindow"
msgid "Make subsequent connections appear new"
msgstr ""
+#: mainwindow.ui:307
msgctxt "MainWindow"
msgid "View recent bandwidth usage"
msgstr ""
+#: mainwindow.ui:320
msgctxt "MainWindow"
-msgid "View log message history"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "View help documentation"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Configure Vidalia"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "View version and license information"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Exit Vidalia"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Show this window on startup"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Hide"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Hide this window"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Password Reset Failed"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid ""
-"Vidalia tried to reset Tor's control password, but was not able to restart "
-"the Tor software. Please check your Task Manager to ensure there are no "
-"other Tor processes running."
-msgstr ""
-
-msgctxt "MainWindow"
-msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended."
-msgstr ""
-
-msgctxt "MainWindow"
-msgid ""
-"Would you like to check if a newer package is available for installation?"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Potentially Unsafe Connection"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid ""
-"Tor has automatically closed your connection in order to protect your "
-"anonymity."
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Update Failed"
+msgid "View log message history"
msgstr ""
+#: mainwindow.ui:370
msgctxt "MainWindow"
-msgid "Your software is up to date"
+msgid "View help documentation"
msgstr ""
+#: mainwindow.ui:383
msgctxt "MainWindow"
-msgid ""
-"There are no new Tor software packages available for your computer at this "
-"time."
+msgid "Configure Vidalia"
msgstr ""
+#: mainwindow.ui:433
msgctxt "MainWindow"
-msgid "Installation Failed"
+msgid "View version and license information"
msgstr ""
+#: mainwindow.ui:446
msgctxt "MainWindow"
-msgid "Vidalia was unable to install your software updates."
+msgid "Exit Vidalia"
msgstr ""
+#: mainwindow.ui:498
msgctxt "MainWindow"
-msgid "The following error occurred:"
+msgid "Show this window on startup"
msgstr ""
+#: mainwindow.ui:517
msgctxt "MainWindow"
-msgid ""
-"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 "Hide"
msgstr ""
+#: mainwindow.ui:520
msgctxt "MainWindow"
-msgid "failed (%1)"
+msgid "Hide this window"
msgstr ""
+#: mainwindow.cpp:1210
msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+msgid "Password Reset Failed"
msgstr ""
+#: mainwindow.cpp:1213
msgctxt "MainWindow"
-msgid "Bootstrapping torrc from %1 to %2"
+msgid "Vidalia tried to reset Tor's control 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 ""
-"You are currently running a relay. Terminating your relay 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 ""
-msgctxt "MainWindow"
-msgid "(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)"
+#: 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."
+#: 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 ""
+#: messagelog.cpp:190
msgctxt "MessageLog"
msgid "Vidalia was unable to register for Tor's log events."
msgstr ""
+#: messagelog.cpp:205
msgctxt "MessageLog"
msgid "Error Opening Log File"
msgstr ""
+#: messagelog.cpp:206
msgctxt "MessageLog"
msgid "Vidalia was unable to open the specified log file."
msgstr ""
+#: messagelog.cpp:227
msgctxt "MessageLog"
msgid "Log Filename Required"
msgstr ""
+#: messagelog.cpp:229
msgctxt "MessageLog"
msgid "You must enter a filename to be able to save log messages to a file."
msgstr ""
+#: messagelog.cpp:280
msgctxt "MessageLog"
msgid "Select Log File"
msgstr ""
+#: messagelog.cpp:297
msgctxt "MessageLog"
msgid "Save Log Messages"
msgstr ""
+#: messagelog.cpp:300
msgctxt "MessageLog"
msgid "Text Files (*.txt)"
msgstr ""
+#: messagelog.cpp:309
msgctxt "MessageLog"
msgid "Vidalia"
msgstr ""
+#: messagelog.cpp:310
+msgctxt "MessageLog"
+msgid "Cannot write file %1"
+""
+"%2."
+msgstr ""
+
+#: messagelog.cpp:360
msgctxt "MessageLog"
msgid "Find in Message Log"
msgstr ""
+#: messagelog.cpp:361
msgctxt "MessageLog"
msgid "Find:"
msgstr ""
+#: messagelog.cpp:367
msgctxt "MessageLog"
msgid "Not Found"
msgstr ""
+#: messagelog.cpp:368
msgctxt "MessageLog"
msgid "Search found 0 matches."
msgstr ""
+#: messagelog.ui:19
msgctxt "MessageLog"
msgid "Message Log"
msgstr ""
+#: messagelog.ui:452
msgctxt "MessageLog"
msgid "Message Filters..."
msgstr ""
+#: messagelog.ui:455
msgctxt "MessageLog"
msgid "Set message filters"
msgstr ""
+#: messagelog.ui:463
msgctxt "MessageLog"
msgid "History Size..."
msgstr ""
+#: messagelog.ui:466
msgctxt "MessageLog"
msgid "Set maximum number of messages to display"
msgstr ""
+#: messagelog.ui:477
msgctxt "MessageLog"
msgid "Clear"
msgstr ""
+#: messagelog.ui:480
msgctxt "MessageLog"
msgid "Clear all messages from the Message Log (Ctrl+E)"
msgstr ""
+#: messagelog.ui:483
msgctxt "MessageLog"
msgid "Ctrl+E"
msgstr ""
+#: messagelog.ui:497
msgctxt "MessageLog"
msgid "Copy"
msgstr ""
+#: messagelog.ui:500
msgctxt "MessageLog"
msgid "Copy the selected messages to the clipboard (Ctrl+C)"
msgstr ""
+#: messagelog.ui:503
msgctxt "MessageLog"
msgid "Ctrl+C"
msgstr ""
+#: messagelog.ui:514
msgctxt "MessageLog"
msgid "Select All"
msgstr ""
+#: messagelog.ui:517
msgctxt "MessageLog"
msgid "Select all messages (Ctrl+A)"
msgstr ""
+#: messagelog.ui:520
msgctxt "MessageLog"
msgid "Ctrl+A"
msgstr ""
+#: messagelog.ui:528
msgctxt "MessageLog"
msgid "Save All"
msgstr ""
+#: messagelog.ui:531
msgctxt "MessageLog"
msgid "Save all messages to a file"
msgstr ""
+#: messagelog.ui:539
msgctxt "MessageLog"
msgid "Save Selected"
msgstr ""
+#: messagelog.ui:542
msgctxt "MessageLog"
msgid "Save selected messages to a file"
msgstr ""
+#: messagelog.ui:553
msgctxt "MessageLog"
msgid "Settings"
msgstr ""
+#: messagelog.ui:556
msgctxt "MessageLog"
msgid "Adjust Message Log Settings"
msgstr ""
+#: messagelog.ui:559
msgctxt "MessageLog"
msgid "Ctrl+T"
msgstr ""
+#: messagelog.ui:567
msgctxt "MessageLog"
msgid "Help"
msgstr ""
+#: messagelog.ui:570
msgctxt "MessageLog"
msgid "Show the help browser"
msgstr ""
+#: messagelog.ui:573
msgctxt "MessageLog"
msgid "F1"
msgstr ""
+#: messagelog.ui:581
msgctxt "MessageLog"
msgid "Close"
msgstr ""
+#: messagelog.ui:584
msgctxt "MessageLog"
msgid "Close the Message Log"
msgstr ""
+#: messagelog.ui:587
msgctxt "MessageLog"
msgid "Esc"
msgstr ""
+#: messagelog.ui:598
msgctxt "MessageLog"
msgid "Find"
msgstr ""
+#: messagelog.ui:601
msgctxt "MessageLog"
msgid "Find all messages containing the search text (Ctrl+F)"
msgstr ""
+#: messagelog.ui:604
msgctxt "MessageLog"
msgid "Ctrl+F"
msgstr ""
+#: messagelog.ui:66
msgctxt "MessageLog"
msgid "Time"
msgstr ""
+#: messagelog.ui:71
msgctxt "MessageLog"
msgid "Type"
msgstr ""
+#: messagelog.ui:76
msgctxt "MessageLog"
msgid "Message"
msgstr ""
+#: messagelog.ui:160
msgctxt "MessageLog"
msgid "Saves the current Message Log settings"
msgstr ""
+#: messagelog.ui:163
msgctxt "MessageLog"
msgid "Save Settings"
msgstr ""
+#: messagelog.ui:179
msgctxt "MessageLog"
msgid "Cancels changes made to settings"
msgstr ""
+#: messagelog.ui:182
msgctxt "MessageLog"
msgid "Cancel"
msgstr ""
+#: messagelog.ui:196
msgctxt "MessageLog"
msgid "Message Filter"
msgstr ""
+#: messagelog.ui:217
msgctxt "MessageLog"
msgid "Error"
msgstr ""
+#: messagelog.ui:233
msgctxt "MessageLog"
msgid "Warning"
msgstr ""
+#: messagelog.ui:249
msgctxt "MessageLog"
msgid "Notice"
msgstr ""
+#: messagelog.ui:265
msgctxt "MessageLog"
msgid "Info"
msgstr ""
+#: messagelog.ui:281
msgctxt "MessageLog"
msgid "Debug"
msgstr ""
+#: messagelog.ui:297
msgctxt "MessageLog"
msgid "Message Log History"
msgstr ""
+#: messagelog.ui:318
msgctxt "MessageLog"
msgid "Number of messages to display in the message log window"
msgstr ""
+#: messagelog.ui:337
msgctxt "MessageLog"
msgid "messages"
msgstr ""
-msgctxt "MessageLog"
-msgid "Browse"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Enable automatically saving all new log messages to a file"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Automatically save new log messages to a file"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Basic"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Tor Status"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Advanced"
-msgstr ""
-
+#: messagelog.ui:356
msgctxt "MessageLog"
msgid "Always Save New Log Messages"
msgstr ""
+#: messagelog.ui:371
msgctxt "MessageLog"
-msgid ""
-"Messages that appear when something has \n"
-"gone very wrong and Tor cannot proceed."
-msgstr ""
-
-msgctxt "MessageLog"
-msgid ""
-"Messages that only appear when \n"
-"something has gone wrong with Tor."
-msgstr ""
-
-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 ""
-
-msgctxt "MessageLog"
-msgid ""
-"Messages that appear frequently \n"
-"during normal Tor operation."
+msgid "Browse"
msgstr ""
+#: messagelog.ui:394
msgctxt "MessageLog"
-msgid ""
-"Hyper-verbose messages primarily of \n"
-"interest to Tor developers."
+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 ""
+#: netviewer.ui:24
msgctxt "NetViewer"
msgid "Tor Network Map"
msgstr ""
+#: netviewer.ui:239
msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
+#: netviewer.ui:245
msgctxt "NetViewer"
msgid "Refresh the list of Tor relays and connections"
msgstr ""
+#: netviewer.ui:248
msgctxt "NetViewer"
msgid "Ctrl+R"
msgstr ""
+#: netviewer.ui:256
msgctxt "NetViewer"
msgid "Help"
msgstr ""
+#: netviewer.ui:259
msgctxt "NetViewer"
msgid "Show the network map help"
msgstr ""
+#: netviewer.ui:262
msgctxt "NetViewer"
msgid "Show network map help"
msgstr ""
+#: netviewer.ui:265
msgctxt "NetViewer"
msgid "F1"
msgstr ""
+#: netviewer.ui:273
msgctxt "NetViewer"
msgid "Close"
msgstr ""
+#: netviewer.ui:279
msgctxt "NetViewer"
msgid "Close the network map"
msgstr ""
+#: netviewer.ui:282
msgctxt "NetViewer"
msgid "Esc"
msgstr ""
+#: netviewer.ui:290
msgctxt "NetViewer"
msgid "Zoom In"
msgstr ""
+#: netviewer.ui:296
msgctxt "NetViewer"
msgid "Zoom in on the network map"
msgstr ""
+#: netviewer.ui:299
msgctxt "NetViewer"
msgid "+"
msgstr ""
+#: netviewer.ui:307
msgctxt "NetViewer"
msgid "Zoom Out"
msgstr ""
+#: netviewer.ui:313
msgctxt "NetViewer"
msgid "Zoom out on the network map"
msgstr ""
+#: netviewer.ui:316
msgctxt "NetViewer"
msgid "-"
msgstr ""
+#: netviewer.ui:324
msgctxt "NetViewer"
msgid "Zoom To Fit"
msgstr ""
+#: netviewer.ui:330
msgctxt "NetViewer"
msgid "Zooms to fit all currently displayed circuits"
msgstr ""
+#: netviewer.ui:333
msgctxt "NetViewer"
msgid "Ctrl+Z"
msgstr ""
-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 ""
-
+#: networkpage.cpp:193
msgctxt "NetworkPage"
msgid "Invalid Bridge"
msgstr ""
+#: networkpage.cpp:194
msgctxt "NetworkPage"
msgid "The specified bridge identifier is not valid."
msgstr ""
+#: networkpage.cpp:241
msgctxt "NetworkPage"
msgid "Copy (Ctrl+C)"
msgstr ""
+#: networkpage.cpp:272
msgctxt "NetworkPage"
-msgid ""
-"You must specify both an IP address or hostname and a port number to "
-"configure Tor to use a proxy to access the Internet."
+msgid "You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet."
msgstr ""
+#: networkpage.cpp:278
msgctxt "NetworkPage"
-msgid ""
-"You must specify one or more ports to which your firewall allows you to "
-"connect."
+msgid "You must specify one or more ports to which your firewall allows you to connect."
msgstr ""
+#: networkpage.cpp:314
msgctxt "NetworkPage"
msgid "'%1' is not a valid port number."
msgstr ""
+#: networkpage.ui:25
msgctxt "NetworkPage"
msgid "Check if your local network requires a proxy to access the Internet"
msgstr ""
+#: networkpage.ui:28
msgctxt "NetworkPage"
msgid "I use a proxy to access the Internet"
msgstr ""
+#: networkpage.ui:58
msgctxt "NetworkPage"
msgid "Proxy Settings"
msgstr ""
+#: networkpage.ui:70
+msgctxt "NetworkPage"
+msgid "HTTP Proxy:"
+msgstr ""
+
+#: networkpage.ui:80
msgctxt "NetworkPage"
msgid "Username:"
msgstr ""
+#: networkpage.ui:90
+msgctxt "NetworkPage"
+msgid "Use this proxy for HTTPS also"
+msgstr ""
+
+#: networkpage.ui:108
msgctxt "NetworkPage"
msgid "Password:"
msgstr ""
+#: networkpage.ui:135
msgctxt "NetworkPage"
msgid "Port:"
msgstr ""
+#: networkpage.ui:176
msgctxt "NetworkPage"
msgid "Check to only connect to relays using ports allowed by your firewall"
msgstr ""
+#: networkpage.ui:179
msgctxt "NetworkPage"
msgid "My firewall only lets me connect to certain ports"
msgstr ""
+#: networkpage.ui:203
msgctxt "NetworkPage"
msgid "Firewall Settings"
msgstr ""
+#: networkpage.ui:215
msgctxt "NetworkPage"
msgid "Allowed Ports:"
msgstr ""
+#: networkpage.ui:225
msgctxt "NetworkPage"
msgid "80, 443"
msgstr ""
+#: networkpage.ui:235
msgctxt "NetworkPage"
-msgid ""
-"Check to encrypt directory requests and, optionally, use bridge relays to "
-"access the Tor network"
+msgid "Check to encrypt directory requests and, optionally, use bridge relays to access the Tor network"
msgstr ""
+#: networkpage.ui:238
msgctxt "NetworkPage"
msgid "My ISP blocks connections to the Tor network"
msgstr ""
+#: networkpage.ui:262
msgctxt "NetworkPage"
msgid "Bridge Settings"
msgstr ""
+#: networkpage.ui:274
msgctxt "NetworkPage"
-msgid "Add a Bridge:"
-msgstr ""
-
-msgctxt "NetworkPage"
-msgid "Remove the selected bridges from the list"
-msgstr ""
-
-msgctxt "NetworkPage"
-msgid "Copy the selected bridges to the clipboard"
-msgstr ""
-
-msgctxt "NetworkPage"
-msgid "Find Bridges Now"
-msgstr ""
-
-msgctxt "NetworkPage"
-msgid "<a href=\"bridges.finding\">How else can I find bridges?</a>"
-msgstr ""
-
-msgctxt "NetworkPage"
-msgid "<a href=\"bridges.finding\">How can I find bridges?</a>"
-msgstr ""
-
-msgctxt "NetworkPage"
-msgid ""
-"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:"
+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 "You must select the proxy type."
-msgstr ""
-
-msgctxt "NetworkPage"
-msgid "SOCKS 4"
+msgid "Add a Bridge:"
msgstr ""
+#: networkpage.ui:318
msgctxt "NetworkPage"
-msgid "SOCKS 5"
+msgid "<a href=\"bridges.finding\">How do I find a bridge?</a>"
msgstr ""
+#: networkpage.ui:383
msgctxt "NetworkPage"
-msgid "HTTP"
+msgid "Remove the selected bridges from the list"
msgstr ""
+#: networkpage.ui:399
msgctxt "NetworkPage"
-msgid "HTTP / HTTPS"
+msgid "Copy the selected bridges to the clipboard"
msgstr ""
+#: policy.cpp:167
msgctxt "Policy"
msgid "accept"
msgstr ""
+#: policy.cpp:167
msgctxt "Policy"
msgid "reject"
msgstr ""
+#: routerdescriptor.cpp:76
msgctxt "RouterDescriptor"
msgid "Online"
msgstr ""
+#: routerdescriptor.cpp:78
msgctxt "RouterDescriptor"
msgid "Hibernating"
msgstr ""
+#: routerdescriptor.cpp:80
msgctxt "RouterDescriptor"
msgid "Offline"
msgstr ""
+#: routerdescriptorview.cpp:139
msgctxt "RouterDescriptorView"
msgid "Location:"
msgstr ""
+#: routerdescriptorview.cpp:143
msgctxt "RouterDescriptorView"
msgid "IP Address:"
msgstr ""
+#: routerdescriptorview.cpp:144
msgctxt "RouterDescriptorView"
msgid "Platform:"
msgstr ""
+#: routerdescriptorview.cpp:148
msgctxt "RouterDescriptorView"
msgid "Bandwidth:"
msgstr ""
+#: routerdescriptorview.cpp:150
msgctxt "RouterDescriptorView"
msgid "Uptime:"
msgstr ""
+#: routerdescriptorview.cpp:156
msgctxt "RouterDescriptorView"
msgid "Last Updated:"
msgstr ""
+#: routerdescriptorview.cpp:100
msgctxt "RouterDescriptorView"
-msgid "Copy"
-msgstr ""
-
-msgctxt "RouterInfoDialog"
-msgid "Hibernating"
-msgstr ""
-
-msgctxt "RouterInfoDialog"
-msgid "Online"
-msgstr ""
-
-msgctxt "RouterInfoDialog"
-msgid "Offline"
+msgid "%1 days "
msgstr ""
-msgctxt "RouterInfoDialog"
-msgid "Unknown"
-msgstr ""
-
-msgctxt "RouterInfoDialog"
-msgid "Relay Details"
-msgstr ""
-
-msgctxt "RouterInfoDialog"
-msgid "Summary"
-msgstr ""
-
-msgctxt "RouterInfoDialog"
-msgid "Name:"
-msgstr ""
-
-msgctxt "RouterInfoDialog"
-msgid "Status:"
-msgstr ""
-
-msgctxt "RouterInfoDialog"
-msgid "Location:"
-msgstr ""
-
-msgctxt "RouterInfoDialog"
-msgid "IP Address:"
-msgstr ""
-
-msgctxt "RouterInfoDialog"
-msgid "Platform:"
-msgstr ""
-
-msgctxt "RouterInfoDialog"
-msgid "Bandwidth:"
-msgstr ""
-
-msgctxt "RouterInfoDialog"
-msgid "Uptime:"
+#: routerdescriptorview.cpp:103
+msgctxt "RouterDescriptorView"
+msgid "%1 hours "
msgstr ""
-msgctxt "RouterInfoDialog"
-msgid "Contact:"
+#: routerdescriptorview.cpp:106
+msgctxt "RouterDescriptorView"
+msgid "%1 mins "
msgstr ""
-msgctxt "RouterInfoDialog"
-msgid "Last Updated:"
+#: routerdescriptorview.cpp:109
+msgctxt "RouterDescriptorView"
+msgid "%1 secs"
msgstr ""
-msgctxt "RouterInfoDialog"
-msgid "Descriptor"
+#: routerdescriptorview.cpp:48
+msgctxt "RouterDescriptorView"
+msgid "Copy"
msgstr ""
+#: routerlistitem.cpp:67
msgctxt "RouterListItem"
msgid "Offline"
msgstr ""
+#: routerlistitem.cpp:71
msgctxt "RouterListItem"
msgid "Hibernating"
msgstr ""
+#: routerlistitem.cpp:83
msgctxt "RouterListItem"
msgid "%1 KB/s"
msgstr ""
+#: routerlistwidget.cpp:49
msgctxt "RouterListWidget"
msgid "Relay"
msgstr ""
+#: routerlistwidget.cpp:74
msgctxt "RouterListWidget"
msgid "Zoom to Relay"
msgstr ""
+#: routerlistwidget.cpp:220
msgctxt "RouterListWidget"
msgid "%1 relays online"
msgstr ""
+#: routerlistwidget.cpp:67
msgctxt "RouterListWidget"
msgid "Copy"
msgstr ""
+#: routerlistwidget.cpp:68
msgctxt "RouterListWidget"
msgid "Nickname"
msgstr ""
+#: routerlistwidget.cpp:71
msgctxt "RouterListWidget"
msgid "Fingerprint"
msgstr ""
+#: serverpage.cpp:140
msgctxt "ServerPage"
msgid "Bridge Support Unavailable"
msgstr ""
+#: serverpage.cpp:143
msgctxt "ServerPage"
-msgid ""
-"You have configured Tor to act as a bridge relay for censored users, but "
-"your version of Tor does not support bridges."
+msgid "You have configured Tor to act as a bridge relay for censored users, but your version of Tor does not support bridges."
msgstr ""
+#: serverpage.cpp:145
msgctxt "ServerPage"
-msgid ""
-"Please upgrade your Tor software or configure Tor to act as a normal Tor "
-"relay."
+msgid "Please upgrade your Tor software or configure Tor to act as a normal Tor relay."
msgstr ""
+#: serverpage.cpp:199
msgctxt "ServerPage"
msgid "Your bridge relay is not running."
msgstr ""
+#: serverpage.cpp:263
msgctxt "ServerPage"
msgid "You must specify at least a relay nickname and port."
msgstr ""
+#: serverpage.ui:25
msgctxt "ServerPage"
msgid "Run as a client only"
msgstr ""
+#: serverpage.ui:32
msgctxt "ServerPage"
msgid "Relay traffic for the Tor network"
msgstr ""
+#: serverpage.ui:39
+msgctxt "ServerPage"
+msgid "Help censored users reach the Tor network (Tor 0.2.0.8-alpha or newer)"
+msgstr ""
+
+#: serverpage.ui:91
msgctxt "ServerPage"
msgid "Relay Port:"
msgstr ""
+#: serverpage.ui:110
msgctxt "ServerPage"
msgid "Enable to mirror the relay directory"
msgstr ""
+#: serverpage.ui:113
+msgctxt "ServerPage"
+msgid "Mirror the Relay Directory "
+msgstr ""
+
+#: serverpage.ui:139
msgctxt "ServerPage"
msgid "Attempt to automatically configure port forwarding"
msgstr ""
+#: serverpage.ui:154
msgctxt "ServerPage"
msgid "Test"
msgstr ""
+#: serverpage.ui:164
msgctxt "ServerPage"
msgid "Show help topic on port forwarding"
msgstr ""
+#: serverpage.ui:204
+msgctxt "ServerPage"
+msgid "Email address at which you may be reached if there is a"
+"problem with your relay. You might also include your PGP or GPG fingerprint."
+msgstr ""
+
+#: serverpage.ui:234
msgctxt "ServerPage"
msgid "Directory Port:"
msgstr ""
+#: serverpage.ui:267
msgctxt "ServerPage"
msgid "Directory Port Number"
msgstr ""
+#: serverpage.ui:279
msgctxt "ServerPage"
msgid "Contact Info:"
msgstr ""
+#: serverpage.ui:337
msgctxt "ServerPage"
msgid "Name of your relay"
msgstr ""
+#: serverpage.ui:370
msgctxt "ServerPage"
msgid "Port on which users and other relays can communicate with your relay"
msgstr ""
+#: serverpage.ui:380
msgctxt "ServerPage"
msgid "Nickname:"
msgstr ""
+#: serverpage.ui:76
msgctxt "ServerPage"
msgid "Basic Settings"
msgstr ""
+#: serverpage.ui:435
msgctxt "ServerPage"
-msgid ""
-"For Internet connections with fast download speed but slow upload, please "
-"list your upload speed here."
+msgid "For Internet connections with fast download speed but slow upload, please list your upload speed here."
msgstr ""
+#: serverpage.ui:466
msgctxt "ServerPage"
msgid "Cable/DSL 256 Kbps"
msgstr ""
+#: serverpage.ui:471
msgctxt "ServerPage"
msgid "Cable/DSL 512 Kbps"
msgstr ""
+#: serverpage.ui:476
msgctxt "ServerPage"
msgid "Cable/DSL 768 Kbps"
msgstr ""
+#: serverpage.ui:481
msgctxt "ServerPage"
msgid "T1/Cable/DSL 1.5 Mbps"
msgstr ""
+#: serverpage.ui:486
msgctxt "ServerPage"
msgid "> 1.5 Mbps"
msgstr ""
+#: serverpage.ui:491
msgctxt "ServerPage"
msgid "Custom"
msgstr ""
+#: serverpage.ui:456
msgctxt "ServerPage"
msgid "Select the entry that most closely resembles your Internet connection"
msgstr ""
+#: serverpage.ui:502
msgctxt "ServerPage"
msgid "Show help topic on bandwidth rate limits"
msgstr ""
+#: serverpage.ui:591
msgctxt "ServerPage"
-msgid "Average Rate"
-msgstr ""
-
-msgctxt "ServerPage"
-msgid "Long-term average bandwidth limit"
-msgstr ""
-
-msgctxt "ServerPage"
-msgid "KB/s"
-msgstr ""
-
-msgctxt "ServerPage"
-msgid "Maximum Rate"
-msgstr ""
-
-msgctxt "ServerPage"
-msgid "Peak bandwidth rate limit"
-msgstr ""
-
-msgctxt "ServerPage"
-msgid ""
-"Your maximum bandwidth rate must be greater than or equal to your average "
-"bandwidth rate. Both values must be at least 20 KB/s."
-msgstr ""
-
-msgctxt "ServerPage"
-msgid "Bandwidth Limits"
-msgstr ""
-
-msgctxt "ServerPage"
-msgid "Ports 6660 - 6669 and 6697"
-msgstr ""
-
-msgctxt "ServerPage"
-msgid "Internet Relay Chat (IRC)"
-msgstr ""
-
-msgctxt "ServerPage"
-msgid "Ports 110, 143, 993 and 995"
-msgstr ""
-
-msgctxt "ServerPage"
-msgid "Retrieve Mail (POP, IMAP)"
-msgstr ""
-
-msgctxt "ServerPage"
-msgid "Ports unspecified by other checkboxes"
-msgstr ""
-
-msgctxt "ServerPage"
-msgid "Misc Other Services"
-msgstr ""
-
-msgctxt "ServerPage"
-msgid "Ports 706, 1863, 5050, 5190, 5222, 5223, 8300 and 8888"
+msgid "Average Rate"
msgstr ""
+#: serverpage.ui:620
msgctxt "ServerPage"
-msgid "Instant Messaging (IM)"
+msgid "Long-term average bandwidth limit"
msgstr ""
+#: serverpage.ui:708
msgctxt "ServerPage"
-msgid "Port 443"
+msgid "KB/s"
msgstr ""
+#: serverpage.ui:666
msgctxt "ServerPage"
-msgid "Secure Websites (SSL)"
+msgid "Maximum Rate"
msgstr ""
+#: serverpage.ui:695
msgctxt "ServerPage"
-msgid "Port 80"
+msgid "Peak bandwidth rate limit"
msgstr ""
+#: serverpage.ui:737
msgctxt "ServerPage"
-msgid "Websites"
+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 "Show help topic on exit policies"
+msgid "Bandwidth Limits"
msgstr ""
+#: serverpage.ui:802
msgctxt "ServerPage"
-msgid ""
-"What Internet resources should users be able to access from your relay?"
+msgid "Ports 6660 - 6669 and 6697"
msgstr ""
+#: serverpage.ui:805
msgctxt "ServerPage"
-msgid ""
-"Tor will still block some outgoing mail and file sharing applications by "
-"default to reduce spam and other abuse."
+msgid "Internet Relay Chat (IRC)"
msgstr ""
+#: serverpage.ui:815
msgctxt "ServerPage"
-msgid "Exit Policies"
+msgid "Ports 110, 143, 993 and 995"
msgstr ""
+#: serverpage.ui:818
msgctxt "ServerPage"
-msgid "Let others access your bridge by giving them this line:"
+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"
+msgid "Ports unspecified by other checkboxes"
msgstr ""
+#: serverpage.ui:831
msgctxt "ServerPage"
-msgid "Copy your bridge relay's identity to the clipboard"
+msgid "Misc Other Services"
msgstr ""
+#: serverpage.ui:841
msgctxt "ServerPage"
-msgid "No Recent Usage"
+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."
+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."
+msgid "Port 443"
msgstr ""
+#: serverpage.ui:857
msgctxt "ServerPage"
-msgid "Bridge History"
+msgid "Secure Websites (SSL)"
msgstr ""
+#: serverpage.ui:867
msgctxt "ServerPage"
-msgid "Vidalia was unable to retrieve your bridge's usage history."
+msgid "Port 80"
msgstr ""
+#: serverpage.ui:870
msgctxt "ServerPage"
-msgid ""
-"Tor returned an improperly formatted response when Vidalia requested your "
-"bridge's usage history."
+msgid "Websites"
msgstr ""
+#: serverpage.ui:896
msgctxt "ServerPage"
-msgid "The returned response was: %1"
+msgid "Show help topic on exit policies"
msgstr ""
+#: serverpage.ui:969
msgctxt "ServerPage"
-msgid "Help censored users reach the Tor network"
+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>"
+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>"
+msgid "Exit Policies"
msgstr ""
+#: serverpage.ui:1015
msgctxt "ServerPage"
-msgid "Automatically distribute my bridge address"
+msgid "Let others access your bridge by giving them this line:"
msgstr ""
+#: serverpage.ui:1039
msgctxt "ServerPage"
-msgid "Mirror the Relay Directory"
+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 ""
+#: servicepage.cpp:116
msgctxt "ServicePage"
msgid "Error while trying to unpublish all services"
msgstr ""
+#: servicepage.cpp:123
msgctxt "ServicePage"
-msgid ""
-"Please configure at least a service directory and a virtual port for each "
-"service you want to save. Remove the other ones."
+msgid "Please configure at least a service directory and a virtual port for each service you want to save. Remove the other ones."
msgstr ""
+#: servicepage.cpp:597
msgctxt "ServicePage"
msgid "Error"
msgstr ""
+#: servicepage.cpp:452
msgctxt "ServicePage"
msgid "Please select a Service."
msgstr ""
+#: servicepage.cpp:458
msgctxt "ServicePage"
msgid "Select Service Directory"
msgstr ""
+#: servicepage.cpp:547
msgctxt "ServicePage"
msgid "Virtual Port may only contain valid port numbers [1..65535]."
msgstr ""
+#: servicepage.cpp:578
msgctxt "ServicePage"
msgid "Target may only contain address:port, address, or port."
msgstr ""
+#: servicepage.cpp:598
msgctxt "ServicePage"
msgid "Directory already in use by another service."
msgstr ""
+#: servicepage.ui:19
msgctxt "ServicePage"
msgid "Form"
msgstr ""
+#: servicepage.ui:31
msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
+#: servicepage.ui:56
msgctxt "ServicePage"
msgid "Onion Address"
msgstr ""
+#: servicepage.ui:61
msgctxt "ServicePage"
msgid "Virtual Port"
msgstr ""
+#: servicepage.ui:66
msgctxt "ServicePage"
msgid "Target"
msgstr ""
+#: servicepage.ui:71
msgctxt "ServicePage"
msgid "Directory Path"
msgstr ""
+#: servicepage.ui:76
msgctxt "ServicePage"
msgid "Enabled"
msgstr ""
+#: servicepage.ui:84
msgctxt "ServicePage"
msgid "Add new service to list"
msgstr ""
+#: servicepage.ui:97
msgctxt "ServicePage"
msgid "Remove selected service from list"
msgstr ""
+#: servicepage.ui:110
msgctxt "ServicePage"
msgid "Copy onion address of selected service to clipboard"
msgstr ""
+#: servicepage.ui:123
msgctxt "ServicePage"
msgid "Browse in local file system and choose directory for selected service"
msgstr ""
+#: servicepage.cpp:384
msgctxt "ServicePage"
msgid "Created by Tor"
msgstr ""
-msgctxt "StatusEventWidget"
-msgid "Copy to Clipboard"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "The Tor Software is Running"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "You are currently running version \"%1\" of the Tor software."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "The Tor Software is not Running"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Click \"Start Tor\" in the Vidalia Control Panel to restart the Tor "
-"software. If Tor exited unexpectedly, select the \"Advanced\" tab above for "
-"details about any errors encountered."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"You are currently running version \"%1\" of the Tor software, which is no "
-"longer recommended. Please upgrade to the most recent version of the "
-"software, which may contain important security, reliability and performance "
-"fixes."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"You are currently running version \"%1\" of the Tor software, which may no "
-"longer work with the current Tor network. Please upgrade to the most recent "
-"version of the software, which may contain important security, reliability "
-"and performance fixes."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Your Tor Software is Out-of-date"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Connected to the Tor Network"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"We were able to successfully establish a connection to the Tor network. You "
-"can now configure your applications to use the Internet anonymously."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Tor Software Error"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"The Tor software encountered an internal bug. Please report the following "
-"error message to the Tor developers at bugs.torproject.org: \"%1\""
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Tor has determined that your computer's clock may be set to %1 seconds in "
-"the past compared to the source \"%2\". If your clock is not correct, Tor "
-"will not be able to function. Please verify your computer displays the "
-"correct time."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Tor has determined that your computer's clock may be set to %1 seconds in "
-"the future compared to the source \"%2\". If your clock is not correct, Tor "
-"will not be able to function. Please verify your computer displays the "
-"correct time."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Your Computer's Clock is Potentially Incorrect"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"One of the applications on your computer may have attempted to make an "
-"unencrypted connection through Tor to port %1. Sending unencrypted "
-"information over the Tor network is dangerous and not recommended. For your "
-"protection, Tor has automatically closed this connection."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"One of the applications on your computer may have attempted to make an "
-"unencrypted connection through Tor to port %1. Sending unencrypted "
-"information over the Tor network is dangerous and not recommended."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Potentially Dangerous Connection!"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"One of your applications established a connection through Tor to \"%1\" "
-"using a protocol that may leak information about your destination. Please "
-"ensure you configure your applications to use only SOCKS4a or SOCKS5 with "
-"remote hostname resolution."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Unknown SOCKS Protocol"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"One of your applications tried to establish a connection through Tor using a"
-" protocol that Tor does not understand. Please ensure you configure your "
-"applications to use only SOCKS4a or SOCKS5 with remote hostname resolution."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Invalid Destination Hostname"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"One of your applications tried to establish a connection through Tor to "
-"\"%1\", which Tor does not recognize as a valid hostname. Please check your "
-"application's configuration."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "External IP Address Changed"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Tor has determined your relay's public IP address is currently %1%2. If that"
-" is not correct, please consider setting the 'Address' option in your "
-"relay's configuration."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "DNS Hijacking Detected"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Tor detected that your DNS provider is providing false responses for domains"
-" that do not exist. Some ISPs and other DNS providers, such as OpenDNS, are "
-"known to do this in order to display their own search or advertising pages."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Tor detected that your DNS provider is providing false responses for well "
-"known domains. Since clients rely on Tor network relays to provide accurate "
-"DNS repsonses, your relay will not be configured as an exit relay."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Checking Server Port Reachability"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Tor is trying to determine if your relay's server port is reachable from the"
-" Tor network by connecting to itself at %1:%2. This test could take several "
-"minutes."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Server Port Reachability Test Successful!"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Your relay's server port is reachable from the Tor network!"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Server Port Reachability Test Failed"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Your relay's server port is not reachable by other Tor clients. This can "
-"happen if you are behind a router or firewall that requires you to set up "
-"port forwarding. If %1:%2 is not your correct IP address and server port, "
-"please check your relay's configuration."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Checking Directory Port Reachability"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Tor is trying to determine if your relay's directory port is reachable from "
-"the Tor network by connecting to itself at %1:%2. This test could take "
-"several minutes."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Directory Port Reachability Test Successful!"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Your relay's directory port is reachable from the Tor network!"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Directory Port Reachability Test Failed"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Your relay's directory port is not reachable by other Tor clients. This can "
-"happen if you are behind a router or firewall that requires you to set up "
-"port forwarding. If %1:%2 is not your correct IP address and directory port,"
-" please check your relay's configuration."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Relay Descriptor Rejected"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Your relay's descriptor, which enables clients to connect to your relay, was"
-" rejected by the directory server at %1:%2. The reason given was: %3"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Your Relay is Online"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Your relay is now online and available for Tor clients to use. You should "
-"see an increase in network traffic shown by the Bandwidth Graph within a few"
-" hours as more clients learn about your relay. Thank you for contributing to"
-" the Tor network!"
-msgstr ""
-
+#: stream.cpp:131
msgctxt "Stream"
msgid "New"
msgstr ""
+#: stream.cpp:133
msgctxt "Stream"
msgid "Resolving"
msgstr ""
+#: stream.cpp:134
msgctxt "Stream"
msgid "Connecting"
msgstr ""
+#: stream.cpp:135
msgctxt "Stream"
msgid "Open"
msgstr ""
+#: stream.cpp:136
msgctxt "Stream"
msgid "Failed"
msgstr ""
+#: stream.cpp:137
msgctxt "Stream"
msgid "Closed"
msgstr ""
+#: stream.cpp:138
msgctxt "Stream"
msgid "Retrying"
msgstr ""
+#: stream.cpp:139
msgctxt "Stream"
msgid "Remapped"
msgstr ""
+#: stream.cpp:140
msgctxt "Stream"
msgid "Unknown"
msgstr ""
+#: torprocess.cpp:107
msgctxt "TorProcess"
msgid "Process %1 failed to stop. [%2]"
msgstr ""
+#: torservice.cpp:143
msgctxt "TorService"
msgid "The Tor service is not installed."
msgstr ""
+#: torservice.cpp:161
msgctxt "TorService"
msgid "Unable to start the Tor service."
msgstr ""
+#: torsettings.cpp:103
msgctxt "TorSettings"
msgid "Failed to hash the control password."
msgstr ""
-msgctxt "TorrcDialog"
-msgid "Editing torrc"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid ""
-"Save settings. If unchecked it will only apply settings to the current Tor "
-"instance."
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Cut"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Copy"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Paste"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Undo"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Redo"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Select All"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Apply all"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Apply selection only"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Error connecting to Tor"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Selection is empty. Please select some text, or check \"Apply all\""
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Error at line %1: \"%2\""
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Error"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "An error ocurred while opening torrc file"
-msgstr ""
-
+#: upnpcontrol.cpp:139
msgctxt "UPNPControl"
msgid "Success"
msgstr ""
+#: upnpcontrol.cpp:141
msgctxt "UPNPControl"
msgid "No UPnP-enabled devices found"
msgstr ""
+#: upnpcontrol.cpp:143
msgctxt "UPNPControl"
msgid "No valid UPnP-enabled Internet gateway devices found"
msgstr ""
+#: upnpcontrol.cpp:145
msgctxt "UPNPControl"
msgid "WSAStartup failed"
msgstr ""
+#: upnpcontrol.cpp:147
msgctxt "UPNPControl"
msgid "Failed to add a port mapping"
msgstr ""
+#: upnpcontrol.cpp:149
msgctxt "UPNPControl"
msgid "Failed to retrieve a port mapping"
msgstr ""
+#: upnpcontrol.cpp:151
msgctxt "UPNPControl"
msgid "Failed to remove a port mapping"
msgstr ""
+#: upnpcontrol.cpp:153
msgctxt "UPNPControl"
msgid "Unknown error"
msgstr ""
+#: upnptestdialog.cpp:112
msgctxt "UPNPTestDialog"
msgid "Discovering UPnP-enabled devices"
msgstr ""
+#: upnptestdialog.cpp:117
msgctxt "UPNPTestDialog"
msgid "Updating directory port mapping"
msgstr ""
+#: upnptestdialog.cpp:122
msgctxt "UPNPTestDialog"
msgid "Updating relay port mapping"
msgstr ""
+#: upnptestdialog.cpp:127
msgctxt "UPNPTestDialog"
msgid "Test completed successfully!"
msgstr ""
+#: upnptestdialog.ui:13
msgctxt "UPNPTestDialog"
msgid "Testing UPnP Support"
msgstr ""
+#: upnptestdialog.ui:92
msgctxt "UPNPTestDialog"
msgid "Testing Universal Plug & Play Support"
msgstr ""
-msgctxt "UpdateProcess"
-msgid ""
-"Vidalia was unable to check for available software updates because it could "
-"not find '%1'."
-msgstr ""
-
-msgctxt "UpdateProcess"
-msgid ""
-"Vidalia was unable to check for available software updates because Tor's "
-"update process exited unexpectedly."
-msgstr ""
-
-msgctxt "UpdateProgressDialog"
-msgid "Checking for available updates..."
-msgstr ""
-
-msgctxt "UpdateProgressDialog"
-msgid "Hide"
-msgstr ""
-
-msgctxt "UpdateProgressDialog"
-msgid "Downloading updates..."
-msgstr ""
-
-msgctxt "UpdateProgressDialog"
-msgid "Installing updated software..."
-msgstr ""
-
-msgctxt "UpdateProgressDialog"
-msgid "Done! Your software is now up to date."
-msgstr ""
-
-msgctxt "UpdateProgressDialog"
-msgid "OK"
-msgstr ""
-
-msgctxt "UpdateProgressDialog"
-msgid "Software Updates"
-msgstr ""
-
-msgctxt "UpdateProgressDialog"
-msgid "Checking for updates..."
-msgstr ""
-
-msgctxt "UpdateProgressDialog"
-msgid "Cancel"
-msgstr ""
-
-msgctxt "UpdatesAvailableDialog"
-msgid "Software Updates Available"
-msgstr ""
-
-msgctxt "UpdatesAvailableDialog"
-msgid "Remind Me Later"
-msgstr ""
-
-msgctxt "UpdatesAvailableDialog"
-msgid "Install"
-msgstr ""
-
-msgctxt "UpdatesAvailableDialog"
-msgid "The following updated software packages are ready for installation:"
-msgstr ""
-
-msgctxt "UpdatesAvailableDialog"
-msgid "Package"
-msgstr ""
-
-msgctxt "UpdatesAvailableDialog"
-msgid "Version"
-msgstr ""
-
+#: vmessagebox.cpp:77
msgctxt "VMessageBox"
msgid "OK"
msgstr ""
+#: vmessagebox.cpp:78
msgctxt "VMessageBox"
msgid "Cancel"
msgstr ""
+#: vmessagebox.cpp:79
msgctxt "VMessageBox"
msgid "Yes"
msgstr ""
+#: vmessagebox.cpp:80
msgctxt "VMessageBox"
msgid "No"
msgstr ""
+#: vmessagebox.cpp:81
msgctxt "VMessageBox"
msgid "Help"
msgstr ""
+#: vmessagebox.cpp:82
msgctxt "VMessageBox"
msgid "Retry"
msgstr ""
+#: vmessagebox.cpp:83
msgctxt "VMessageBox"
msgid "Show Log"
msgstr ""
+#: vmessagebox.cpp:84
msgctxt "VMessageBox"
msgid "Show Settings"
msgstr ""
+#: vmessagebox.cpp:85
msgctxt "VMessageBox"
msgid "Continue"
msgstr ""
+#: vmessagebox.cpp:86
msgctxt "VMessageBox"
msgid "Quit"
msgstr ""
+#: vmessagebox.cpp:87
msgctxt "VMessageBox"
msgid "Browse"
msgstr ""
+#: main.cpp:75
msgctxt "Vidalia"
msgid "Invalid Argument"
msgstr ""
+#: main.cpp:89
msgctxt "Vidalia"
msgid "Vidalia is already running"
msgstr ""
+#: main.cpp:95
+msgctxt "Vidalia"
+msgid "Another Vidalia process is possibly already running. If there really is not another Vidalia process running, you can choose to continue anyway."
+""
+"Would you like to continue starting Vidalia?"
+msgstr ""
+
+#: vidalia.cpp:169
msgctxt "Vidalia"
msgid "Displays this usage message and exits."
msgstr ""
+#: vidalia.cpp:171
msgctxt "Vidalia"
msgid "Resets ALL stored Vidalia settings."
msgstr ""
+#: vidalia.cpp:173
msgctxt "Vidalia"
msgid "Sets the directory Vidalia uses for data files."
msgstr ""
+#: vidalia.cpp:175
msgctxt "Vidalia"
msgid "Sets the name and location of Vidalia's pidfile."
msgstr ""
+#: vidalia.cpp:177
msgctxt "Vidalia"
msgid "Sets the name and location of Vidalia's logfile."
msgstr ""
+#: vidalia.cpp:180
msgctxt "Vidalia"
msgid "Sets the verbosity of Vidalia's logging."
msgstr ""
+#: vidalia.cpp:183
msgctxt "Vidalia"
msgid "Sets Vidalia's interface style."
msgstr ""
+#: vidalia.cpp:186
msgctxt "Vidalia"
msgid "Sets Vidalia's language."
msgstr ""
+#: vidalia.cpp:190
msgctxt "Vidalia"
msgid "Vidalia Usage Information"
msgstr ""
+#: vidalia.cpp:238
msgctxt "Vidalia"
-msgid "Unable to open log file '%1': %2"
-msgstr ""
-
-msgctxt "Vidalia"
-msgid "Value required for parameter :"
-msgstr ""
-
-msgctxt "Vidalia"
-msgid "Invalid language code specified:"
+msgid "Invalid language code specified: "
msgstr ""
+#: vidalia.cpp:245
msgctxt "Vidalia"
-msgid "Invalid GUI style specified:"
+msgid "Invalid GUI style specified: "
msgstr ""
+#: vidalia.cpp:251
msgctxt "Vidalia"
-msgid "Invalid log level specified:"
+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?"
-msgstr ""
-
-msgctxt "stringutil.h"
-msgid "%1 secs"
-msgstr ""
-
-msgctxt "stringutil.h"
-msgid "%1 B/s"
-msgstr ""
-
-msgctxt "stringutil.h"
-msgid "%1 KB/s"
-msgstr ""
-
-msgctxt "stringutil.h"
-msgid "%1 MB/s"
-msgstr ""
-
-msgctxt "stringutil.h"
-msgid "%1 GB/s"
-msgstr ""
-
-msgctxt "stringutil.h"
-msgid "%1 days"
-msgstr ""
-
-msgctxt "stringutil.h"
-msgid "%1 hours"
-msgstr ""
-
-msgctxt "stringutil.h"
-msgid "%1 mins"
+msgid "Unable to open log file '%1': %2"
msgstr ""
-
-
diff --git a/src/vidalia/i18n/po/dz/qt_dz.po b/src/vidalia/i18n/po/dz/qt_dz.po
index a8f65b8..3404096 100644
--- a/src/vidalia/i18n/po/dz/qt_dz.po
+++ b/src/vidalia/i18n/po/dz/qt_dz.po
@@ -1,11 +1,10 @@
#
-# Translators:
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-08-20 03:25+0000\n"
-"PO-Revision-Date: 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"
@@ -431,5 +430,3 @@ msgstr ""
msgctxt "QFileSystemModel"
msgid "%1 bytes"
msgstr ""
-
-
diff --git a/src/vidalia/i18n/po/dz/vidalia_dz.po b/src/vidalia/i18n/po/dz/vidalia_dz.po
index cea7325..3cefc2a 100644
--- a/src/vidalia/i18n/po/dz/vidalia_dz.po
+++ b/src/vidalia/i18n/po/dz/vidalia_dz.po
@@ -1,11 +1,10 @@
#
-# Translators:
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-09-07 14:40+0000\n"
-"PO-Revision-Date: 2010-12-05 20:03+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"
@@ -193,10 +192,6 @@ 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"
@@ -236,10 +231,6 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr ""
-
-msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -279,6 +270,10 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr ""
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -432,17 +427,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"
@@ -1266,44 +1270,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"
@@ -1331,10 +1342,6 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr ""
-
-msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1362,6 +1369,10 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr ""
+
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1644,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 ""
@@ -1680,10 +1663,6 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1796,10 +1775,6 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1882,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 ""
@@ -1934,82 +1897,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 ""
@@ -2057,19 +1949,39 @@ 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)"
+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"
@@ -2091,17 +2003,35 @@ msgid ""
msgstr ""
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"
@@ -2357,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"
@@ -2412,10 +2334,6 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2515,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 ""
@@ -2840,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 ""
@@ -3088,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 ""
@@ -3132,10 +3070,6 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
-msgid "Form"
-msgstr ""
-
-msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3424,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 ""
@@ -3460,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 ""
@@ -3538,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 ""
@@ -3666,6 +3646,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 ""
@@ -3759,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 ""
@@ -3812,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 82545d2..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:
-# 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: 2012-02-14 09:47+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"
@@ -202,7 +199,9 @@ msgctxt "QFileDialog"
msgid ""
"%1 already exists.\n"
"Do you want to replace it?"
-msgstr "%1 είδη υπάρχει.\nΘέλετε να το αντικαταστήσετε?"
+msgstr ""
+"%1 είδη υπάρχει.\n"
+"Θέλετε να το αντικαταστήσετε?"
#: qfiledialog.cpp:1690
msgctxt "QFileDialog"
@@ -210,7 +209,10 @@ msgid ""
"%1\n"
"File not found.\n"
"Please verify the correct file name was given."
-msgstr "%1\nΤο αρχείο δε βρέθηκε.\nΠαρακαλώ βεβαιώστε ότι δόθηκε το σωστό όνομα αρχείου."
+msgstr ""
+"%1\n"
+"Το αρχείο δε βρέθηκε.\n"
+"Παρακαλώ βεβαιώστε ότι δόθηκε το σωστό όνομα αρχείου."
#: qdirmodel.cpp:833
msgctxt "QFileDialog"
@@ -268,14 +270,19 @@ msgid ""
"%1\n"
"Directory not found.\n"
"Please verify the correct directory name was given."
-msgstr "%1\nΟ καταλογος δεν βρέθηκε.\nΠαρακαλούμε βεβαιώστε ότι δόθηκε το σωστό όνομα καταλόγου."
+msgstr ""
+"%1\n"
+"Ο καταλογος δεν βρέθηκε.\n"
+"Παρακαλούμε βεβαιώστε ότι δόθηκε το σωστό όνομα καταλόγου."
#: qfiledialog.cpp:2281
msgctxt "QFileDialog"
msgid ""
"'%1' is write protected.\n"
"Do you want to delete it anyway?"
-msgstr "%1 έχει προστασία εγγραφής.\nΘέλετε να το διαγράψετε οπωσδήποτε?"
+msgstr ""
+"%1 έχει προστασία εγγραφής.\n"
+"Θέλετε να το διαγράψετε οπωσδήποτε?"
#: qfiledialog.cpp:2286
msgctxt "QFileDialog"
@@ -372,7 +379,9 @@ msgctxt "QFileSystemModel"
msgid ""
"<b>The name \"%1\" can not be used.</b><p>Try using another name, with fewer"
" characters or no punctuations marks."
-msgstr "<b>Το όνομα %1 δε μπορεί να χρησιμοποιηθεί.</b><p>Δοκιμάστε να δώσετε άλλο όνομα με λιγότερους χαρακτήρες ή/και χωρίς σημεία στίξης."
+msgstr ""
+"<b>Το όνομα %1 δε μπορεί να χρησιμοποιηθεί.</b><p>Δοκιμάστε να δώσετε άλλο "
+"όνομα με λιγότερους χαρακτήρες ή/και χωρίς σημεία στίξης."
#: qfilesystemmodel.cpp:832
msgctxt "QFileSystemModel"
diff --git a/src/vidalia/i18n/po/el/vidalia_el.po b/src/vidalia/i18n/po/el/vidalia_el.po
index c49cf97..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: 2012-03-21 17:52+0000\n"
-"PO-Revision-Date: 2012-04-22 10:08+0000\n"
-"Last-Translator: anvo <fragos.george at hotmail.com>\n"
+"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,70 +139,59 @@ 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-μπιτ κωδικοποίηση χαρακτήρων του συστήματός σας."
+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 "Η τοποθεσία καταλόγου δεδομένων του Tor που δόθηκε περιέχει χαρακτήρες οι οποίοι δεν μπορούν να εμφανιστούν στην τρέχουσα 8-μπιτ κωδικοποίηση χαρακτήρων του συστήματός σας."
+msgstr ""
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 ""
-"You've checked the autoconfiguration option for the ControlPort, but "
-"provided no Data Directory. Please add one, or uncheck the \"Configure "
-"ControlPort automatically\" option."
-msgstr "Επιλέξατε την αυτόματη ρύθμιση για το ControlPort, αλλά δεν καθορίσατε Κατάλογο Δεδομένων. Προσθέστε ένα τέτοιο κατάλογο, ή αποεπιλέξτε την \"Αυτόμαρη ρύθμιση του ControlPort\"."
+msgstr ""
msgctxt "AdvancedPage"
msgid ""
@@ -234,23 +220,6 @@ msgctxt "AppearancePage"
msgid "Vidalia was unable to load the selected language translation."
msgstr "Αδυναμία φόρτωσης επιλεγμένου αρχείου μετάφρασης."
-msgctxt "AppearancePage"
-msgid ""
-"System Icon Preferences (changes will take effect when you restart Vidalia)"
-msgstr "Προτιμήσεις Εικονιδίου Συστήματος (οι αλλαγές θα εφαρμοστούν όταν επανεκκινήσετε το Vidalia)"
-
-msgctxt "AppearancePage"
-msgid "Show the Tray Icon and Dock Icon (default)"
-msgstr "Εμφάνιση Εικονιδίου Συστήματος και Εικονιδίου Συντόμευσης (αρχική ρύθμιση)"
-
-msgctxt "AppearancePage"
-msgid "Hide the Tray Icon"
-msgstr "Απόκρυψη του Εικονιδίου Συστήματος"
-
-msgctxt "AppearancePage"
-msgid "Hide the Dock Icon"
-msgstr "Απόκρυψη του Εικονιδίου Συντόμευσης"
-
msgctxt "BandwidthGraph"
msgid "Since:"
msgstr "Από:"
@@ -264,10 +233,6 @@ msgid "Show Settings"
msgstr "Εμφάνιση ρυθμίσεων"
msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr "Χρήση Ευρούς Ζώνης Tor"
-
-msgctxt "BandwidthGraph"
msgid "Reset"
msgstr "Μηδενισμός"
@@ -307,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..."
@@ -317,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"
@@ -341,19 +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"
+msgstr ""
msgctxt "BridgeUsageDialog"
msgid "Bridge Usage Summary"
-msgstr "Σύνοψη Χρήσης της Γέφυρας"
+msgstr ""
msgctxt "BridgeUsageDialog"
msgid "Client Summary"
-msgstr "Σύνοψη Πελάτου"
+msgstr ""
msgctxt "Circuit"
msgid "New"
@@ -460,18 +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 ""
-"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 ""
+
+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"
msgid "Control socket is not connected."
@@ -1187,7 +1165,7 @@ msgstr "Ζιμπάμπουε"
msgctxt "CountryInfo"
msgid "Zaire"
-msgstr "Zaire"
+msgstr ""
msgctxt "CountryInfo"
msgid "Albania"
@@ -1287,52 +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 "Συμπληρώστε το εισητήριο:"
+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 "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."
-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:"
-msgstr "με μια περιγραφή των ενεργειών σας πριν την κατάρρευση της εφαρμογής, μαζί με τα ακόλουθα αρχεία που σχετίζονται με την αναφορά κατάρρευσης:"
+msgctxt "CrashReportUploader"
+msgid "Receiving response..."
+msgstr ""
msgctxt "GeneralPage"
msgid "Executables (*.exe)"
@@ -1359,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"
@@ -1390,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"
@@ -1408,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."
@@ -1540,7 +1525,7 @@ msgstr "Βρέθηκαν Έγγραφα"
msgctxt "HelpBrowser"
msgid "Error Loading Help Contents:"
-msgstr "Σφάλμα κατά την φόρτωση των περιεχομένων της Βοήθειας:"
+msgstr ""
msgctxt "HelpTextBrowser"
msgid "Opening External Link"
@@ -1569,7 +1554,7 @@ msgstr "Το Vidalia δεν μπόρεσε να ανοίξει τον σύνδε
msgctxt "HelpTextBrowser"
msgid "Error opening help file:"
-msgstr "Σφάλμα κατά το άνοιγμα του αρχείου βοηθείας:"
+msgstr ""
msgctxt "LicenseDialog"
msgid "License Information"
@@ -1609,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"
@@ -1672,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"
@@ -1708,10 +1665,6 @@ msgid "View"
msgstr "Εμφάνιση"
msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr "Βοήθεια για το Vidalia"
-
-msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr "Σφάλμα κατά την εκκίνηση του περιηγητή ιστού"
@@ -1776,6 +1729,10 @@ msgid "Connected to the Tor network!"
msgstr "Συνδέθηκε στο δίκτυο Tor!"
msgctxt "MainWindow"
+msgid "Unrecognized startup status"
+msgstr "Άγνωστη κατάσταση εκκίνησης"
+
+msgctxt "MainWindow"
msgid "miscellaneous"
msgstr "διάφορα"
@@ -1820,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"
@@ -1906,18 +1859,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"
@@ -1958,100 +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 είναι ξεπερασμένη ή δεν συνιστάται πλέον."
+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 "Το Tor έκλεισε αυτόματα την σύνδεσή σας ώστε να προστατευθεί η ανωνυμία σας."
+msgstr ""
msgctxt "MainWindow"
msgid "Update Failed"
@@ -2059,13 +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 για τον υπολογιστή σας."
+msgstr ""
msgctxt "MainWindow"
msgid "Installation Failed"
@@ -2077,71 +1947,94 @@ 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 ""
"Anything sent over this connection could be monitored. Please check your "
"application's configuration and use only encrypted protocols, such as SSL, "
"if possible."
-msgstr "Ο,τιδήποτε σταλεί μέσω αυτής της σύνδεσης μπορεί να ανασχεθεί. Ελέγξτε τις ρυθμίσεις της εφαρμογής σας και χρησιμοποιή(σ)τε μόνον κρυπτογραφημένα πρωτόκολα, όπως SSL, αν είναι εφικτό."
-
-msgctxt "MainWindow"
-msgid "Bootstrapping torrc from %1 to %2"
-msgstr "Ρύθμιση του torrc για εκκίνηση από %1 σε %2"
+msgstr ""
msgctxt "MainWindow"
-msgid "(probably Telnet)"
-msgstr "(πιθανόν Telnet)"
+msgid "toolBar"
+msgstr ""
msgctxt "MainWindow"
-msgid "(probably an email client)"
-msgstr "(πιθανόν κάποιο πρόγραμμα ηλεκτρονικής αλληλογραφίας)"
+msgid "Start"
+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."
+msgid "Stop"
+msgstr ""
msgctxt "MainWindow"
-msgid "failed (%1)"
-msgstr "απέτυχε (%1)"
+msgid "Restart"
+msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
-msgstr "Ο αναμεταδότης σας πρόκειται να κλείσει.\nΠατήστε 'Stop' ξανά για να διακόψετε τον αναμεταδότη σας τώρα."
+msgid "Reload Tor's config"
+msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Vidalia can't find out how to talk to Tor because it can't access this file: %1\n"
-"\n"
-"Here's the last error message:\n"
-"%2"
-msgstr "Το Vidalia δεν γνωρίζει πώς να επικοινωνήσει με το Tor διότι δεν έχει πρόσβαση σε αυτό το αρχείο: %1\n\nΤο τελευταίο μήνυμα σφάλματος ήταν:\n%2"
+msgid "Actions"
+msgstr ""
msgctxt "MainWindow"
-msgid ""
-"It seems Tor has stopped running since Vidalia started it.\n"
-"\n"
-"See the Advanced Message Log for more information."
-msgstr "Φαίνεται ότι το Tor έχει πάψει να λειτουργεί από τότε που το εκκίνησε το Vidalia.\nΔείτε τις Προχωρημένες Καταγραφές Μηνυμάτων για περισσότερες πληροφορίες."
+msgid "Bootstrapping torrc from %1 to %2"
+msgstr ""
msgctxt "MainWindow"
msgid ""
"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
"\n"
"Would you like to shutdown gracefully and give clients time to find a new relay?"
-msgstr "Αυτή τη στιγμή εκτελείτε έναν αναμεταδότη. Ο τερματισμός του αναμεταδότη σας θα διακόψει κάθε ανοικτή επικοινωνία από άλλα προγράμματα.\nΘέλετε η διακοπή να γίνει ομαλά ώστε να δοθεί χρόνος στα προγράμματα-πελάτες για να βρουν νέο αναμεταδότη;"
+msgstr ""
msgctxt "MainWindow"
msgid ""
"Vidalia detected that the Tor software exited unexpectedly.\n"
"\n"
"Please check the message log for recent warning or error messages."
-msgstr "Το Vidalia διαπίστωσε ότι το Tor τερμάτισε αναπάντεχα.\nΕλέγξτε τα μηνύματα καταγραφής για πρόσφατες προειδοποιήσεις και μηνύματα σφάλματος."
+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 ""
+
+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"
@@ -2396,32 +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 δεν μπορεί να προχωρήσει."
+msgstr ""
msgctxt "MessageLog"
msgid ""
"Messages that only appear when \n"
"something has gone wrong with Tor."
-msgstr "Μηνύματα που εμφανίζονται μόνον όταν\nκάτι σοβαρό συμβαίνει με το Tor."
+msgstr ""
msgctxt "MessageLog"
msgid ""
@@ -2429,30 +2314,26 @@ msgid ""
"during normal Tor operation and are \n"
"not considered errors, but you may \n"
"care about."
-msgstr "Μηνύματα που εμφανίζονται σπάνια\nστην διάρκεια φυσιολογικών λειτουργιών του Tor και δεν\nθεωρούνται σφάλματα, αλλά που θα πρέπει να τα ελέγξετε."
+msgstr ""
msgctxt "MessageLog"
msgid ""
"Messages that appear frequently \n"
"during normal Tor operation."
-msgstr "Μηνύματα που εμφανίζονται συχνά\nστη διάρκεια φυσιολογικών λειτουργιών του Tor."
+msgstr ""
msgctxt "MessageLog"
msgid ""
"Hyper-verbose messages primarily of \n"
"interest to Tor developers."
-msgstr "Υπερφλύαρα μηνύματα που κυρίως\nαφορούν στους προγραμματιστές του Tor."
+msgstr ""
msgctxt "MessageLog"
msgid ""
"Cannot write file %1\n"
"\n"
"%2."
-msgstr "Αδυναμία εγγραφής του αρχείου %1\n\n%2."
-
-msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr "Χάρτης δικτύου Tor"
+msgstr ""
msgctxt "NetViewer"
msgid "Refresh"
@@ -2532,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"
@@ -2548,12 +2429,36 @@ 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 "Μη έγκυρη γέφυρα"
+
+msgctxt "NetworkPage"
+msgid "The specified bridge identifier is not valid."
+msgstr "Ο καθορισμένος αριθμός αναγνώρισης της γέφυρας δεν είναι έγκυρος"
+
msgctxt "NetworkPage"
msgid "Copy (Ctrl+C)"
msgstr "Αντιγραφή (Ctrl+C)"
@@ -2646,53 +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 "Δεν υπάρχουν διαθέσιμες γέφυρες αυτή τη στιγμή. Μπορείτε είτε να περιμένετε για λίγο και να προσπαθήσετε εκ νέου, είτε να δοκιμάσετε διαφορετική μέθοδο αναζήτησης νέων γεφυρών."
+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 / HTTPS"
-msgstr "HTTP / HTTPS"
+msgid "HTTP"
+msgstr ""
msgctxt "NetworkPage"
-msgid "You must specify one or more bridges."
-msgstr "Πρέπει να καθορίσετε μια ή περισσότερες γέφυρες."
+msgid "HTTP / HTTPS"
+msgstr ""
msgctxt "Policy"
msgid "accept"
@@ -2756,11 +2661,11 @@ msgstr "Αποσυνδεδεμένο"
msgctxt "RouterInfoDialog"
msgid "Unknown"
-msgstr "Άγνωστο"
+msgstr ""
msgctxt "RouterInfoDialog"
msgid "Relay Details"
-msgstr "Λεπτομέρειες αναμεταδότη"
+msgstr ""
msgctxt "RouterInfoDialog"
msgid "Summary"
@@ -2784,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:"
@@ -2804,7 +2709,7 @@ msgstr "Τελευταία Ενημέρωση:"
msgctxt "RouterInfoDialog"
msgid "Descriptor"
-msgstr "Περιγραφή:"
+msgstr ""
msgctxt "RouterListItem"
msgid "Offline"
@@ -3068,69 +2973,69 @@ 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 "Αφήστε τον αναμεταδότη σας να εκτελείται συνεχώς, ώστε τα προγράμματα-πελάτες να έχουν την ευκαιρία να τον εντοπίσουν και να τον χρησιμοποιήσουν."
+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 απέστηλε αίτημα για το ιστορικό σας χρήσης γεφυρών."
+msgstr ""
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 for the Tor network (exit relay)"
-msgstr "Αναμετάδοση κυκλοφορίας για το δίκτυο Tor (αναμεταδότης εξόδου)"
+msgid "Relay traffic inside the Tor network (non-exit relay)"
+msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic inside the Tor network (non-exit relay)"
-msgstr "Αναμετάδοση κυκλοφορίας για το δίκτυο Tor (αναμεταδότης μη-εξόδου)"
+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."
+msgstr ""
msgctxt "ServicePage"
msgid "Error while trying to unpublish all services"
@@ -3167,10 +3072,6 @@ msgid "Directory already in use by another service."
msgstr "Ο φάκελος χρησιμοποιήτε ήδη από άλλη υπηρεσία."
msgctxt "ServicePage"
-msgid "Form"
-msgstr "Φόρμα"
-
-msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr "Παρεχόμενες κρυφές υπηρεσίες"
@@ -3216,26 +3117,26 @@ 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 ""
"Click \"Start Tor\" in the Vidalia Control Panel to restart the Tor "
"software. If Tor exited unexpectedly, select the \"Advanced\" tab above for "
"details about any errors encountered."
-msgstr "Πατήστε \"Start Tor\" στον Πίνακα Ελέγχου του Vidalia για να επανεκκινήσετε το Tor. Αν το Tor τερματίστηκε αναπάντεχα, επιλέξτε το tab \"Advanced\" για λεπτομέρειες για πιθανά σφάλματα."
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
@@ -3243,7 +3144,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 ""
@@ -3251,31 +3152,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 "Αυτή τη στιγμή εκτελείτε την έκδοση \"%1\" του Tor, η οποία ίσως δεν λειτουργεί με το τρέχον δίκτυο Tor. Αναβαθμίστε το πρόγραμμα στην πιο πρόσφατη έκδοσή του η οποία ίσως περιέχει σημαντικές βελτιώσεις ασφαλείας, αξιοπιστίας και επιδόσεων."
+msgstr ""
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 αποκαταστάθηκε με επιτυχία. Μπορείτε τώρα να ρυθμίσετε τις εφαρμογές σας ώστε να χρησιμοποιούν το Διαδίκτυο ανώνυμα."
+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 έχει κάποιο εσωτερικό σφάλμα. Παρακαλούμε, αναφέρετε το μήνυμα σφάλματος που ακολουθεί στους προγραμματιστές του Tor, στην διεύθυνση bugs.torproject.org: \"%1\"."
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
@@ -3283,7 +3184,7 @@ msgid ""
"the past compared to the source \"%2\". If your clock is not correct, Tor "
"will not be able to function. Please verify your computer displays the "
"correct time."
-msgstr "To Tor διαπίστωσε ότι το ρολόι του υπολογιστή σας είναι ρυθμισμένο πάει πίσω %1 δευτερολέπτα ως προς τον ρυθμιστικό υπολογιστή \"%2\". Αν το ρολόι του υπολογιστή σας δεν είναι σωστό, το Tor δεν θα μπορέσει να λειτουργήσει. Επιβεβαιώστε ότι ο υπολογιστής σας εμφανίζει την σωστή ώρα."
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
@@ -3291,11 +3192,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 διαπίστωσε ότι το ρολόι του υπολογιστή σας είνα ρυθμισμένο πάει μπροστά %1 δευτερόλεπτα ως προς τον ρυθμιστικό υπολογιστή \"%2\". Αν το ρολόι του υπολογιστή σς δεν είναι σωστό, το Tor δεν θα μπορέσει να λειτουργήσει. Επιβεβαιώστε ότι ο υπολογιστής σας εμφανίζει την σωστή ώρα."
+msgstr ""
msgctxt "StatusEventWidget"
msgid "Your Computer's Clock is Potentially Incorrect"
-msgstr "Το ρολόϊ του Υπολογιστή σας είναι δυνητικά λανθασμένο"
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
@@ -3303,18 +3204,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 "Κάποια εφαρμογή του υπολογιστή σας ίσως προσπάθησε να συνδεθεί χωρίς κρυπτογράφηση μέσω του Tor στην θύρα %1. Η αποστολή μη κρυπτογραφημένων πληροφοριών μέσω του δικτύου Tor είναι επικίνδυνη και δεν συνιστάται. Για την δική σας προστασία το Tor έκλεισε την σύνδεση αυτή."
+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 "Κάποια εφαρμογή του υπολογιστή σας ίσως προσπάθησε να συνδεθεί χωρίς κρυπτογράφηση μέσω του Tor στην θύρα %1. Η αποστολή μη κρυπτογραφημένων πληροφοριών μέσω του δικτύου Tor είναι επικίνδυνη και δεν συνιστάται."
+msgstr ""
msgctxt "StatusEventWidget"
msgid "Potentially Dangerous Connection!"
-msgstr "Πιθανά Επικίνδυνη Σύνδεση!"
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
@@ -3322,81 +3223,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 "Κάποια από τις εφαρμογές σας πραγματοποίησε σύνδεση μέσω του Tor στον/στην \"%1\" χρησιμοποιώντας ένα πρωτόκολο που μπορεί να διοχετεύει πληροφορίες σχετικές με τον προορισμό της. Βεβαιωθείτε ότι έχετε ρυθμίσει τις εφαρμογές σας ώστε να χρησιμοποιούν μόνον SOCKS4a ή SOCKS5 για την ανάλυση των ονομάτων των απομακρυσμένων υπολογιστών."
+msgstr ""
msgctxt "StatusEventWidget"
msgid "Unknown SOCKS Protocol"
-msgstr "Άγνωστο Πρωτόκολο SOCKS"
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
"One of your applications tried to establish a connection through Tor using a"
" protocol that Tor does not understand. Please ensure you configure your "
"applications to use only SOCKS4a or SOCKS5 with remote hostname resolution."
-msgstr "Κάποια από τις εφαρμογές σας πραγματοποίησε σύνδεση μέσω του Tor χρησιμοποιώντας πρωτόκολο που το Tor δεν καταλαβαίνει. Βεβαιωθείτε ότι έχετε ρυθμίσει τις εφαρμογές σας ώστε να χρησιμοποιούν μόνον SOCKS4a ή SOCKS5 για την ανάλυση των ονομάτων των απομακρυσμένων υπολογιστών."
+msgstr ""
msgctxt "StatusEventWidget"
msgid "Invalid Destination Hostname"
-msgstr "Το Όνομα του υπολογιστή Προορισμού δεν είναι έγκυρο."
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
"One of your applications tried to establish a connection through Tor to "
"\"%1\", which Tor does not recognize as a valid hostname. Please check your "
"application's configuration."
-msgstr "Κάποια από τις εφαρμογές σας πραγματοποίησε σύνδεση μέσω του Tor στον \"%1\", τον οποίο το Tor δεν αναγνωρίζει ως έγκυρο όνομα υπολογιστή. Ελέγξτε τις ρυθμίσεις της εφαρμογής σας."
+msgstr ""
msgctxt "StatusEventWidget"
msgid "External IP Address Changed"
-msgstr "Η εξωτερική διεύθυνση ΙΡ άλλαξε"
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
"Tor has determined your relay's public IP address is currently %1%2. If that"
" is not correct, please consider setting the 'Address' option in your "
"relay's configuration."
-msgstr "Το Tor διαπίστωσε ότι η δημόσια διεύθυνση ΙΡ του αναμεταδότη σας αυτή τη στιγμή είναι %1%2. Αν αυτό δεν είναι σωστό, προσαρμόστε κατάλληλα την επιλογή 'Address' στις ρυθμίσεις του αναμεταδότη σας."
+msgstr ""
msgctxt "StatusEventWidget"
msgid "DNS Hijacking Detected"
-msgstr "Ανυχνεύθηκε Παραβίαση του DNS"
+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 "Το Tor εντόπισε ότι ο πάροχος DNS παρέχει εσφαλμένα μηνύματα για περιοχές που δεν υπάρχουν. Μερικοί ISP και άλλοι πάροχοι DNS, όπως η OpenDNS, είναι γνωστό ότι αυτό το κάνουν για να προβάλουν τις δικές τους σελίδες αναζήτησης ή διαφήμισης."
+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 "Το Tor εντόπισε ότι ο πάροχος DNS παρέχει εσφαλμένα μηνύματα για γνωστές περιοχές. Εφόσον τα προγράμματα-πελάτες βασίζονται στους ανεμεταδότες Tor για την διαβίβαση ακριβών μηνυμάτων DNS, ο αναμεταδότης σας δεν θα ρυθμιστεί ως αναμεταδότης εξόδου."
+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 ""
@@ -3404,30 +3305,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 "Η θύρα διακομηστή του αναμεταδότη σας δεν είναι προσεγγίσημη από άλλα προγράμματα-πελάτες Tor. Αυτό μπορεί να συμβεί όταν συνδέεστε μέσω δρομολογητή ή τείχους προστασίας που απαιτούν ρυθμίσεις προώθησης θύρας. Αν η διεύθυνση %1:%2 δεν είναι η σωστή διεύθυνση ΙΡ και θύρα, ελέγξτε τις ρυθμίσεις του αναμεταδότη σας."
+msgstr ""
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 "Το Tor προσπαθεί να προσδιορίσει αν η θύρα καταλόγου του αναμεταδότη σας είναι προσεγγίσιμη από το δίκτυο Tor συνδεόμενο στον υπολογιστή %1:%2. Ο έλεγχος αυτός ίσως διαρκέσει πολλά λεπτά."
+msgstr ""
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!"
+msgstr ""
msgctxt "StatusEventWidget"
msgid "Directory Port Reachability Test Failed"
-msgstr "Ο Έλεγχος Προσσεγιστικότητας της Θύρας Καταλόγου απέτυχε!"
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
@@ -3435,21 +3336,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 "Η θύρα καταλόγου του αναμεταδότη σας δεν είναι προσβάσιμη από άλλα προγράμματα-πελάτες Tor. Αυτό μπορεί να συμβαίνει αν συνδέεστε μέσω δρομολογητή ή τείχους προστασίας τα οποία απαιτούν ρυθμίσεις προώθησης θύρας. Αν η διεύθυνση %1:%2 δεν είναι η σωστή διεύθυνση ΙΡ και θύρα, ελέγξτε τις ρυθμίσεις του αναμεταδότη σας."
+msgstr ""
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"
+msgstr ""
msgctxt "StatusEventWidget"
msgid "Your Relay is Online"
-msgstr "Ο Αναμεταδότης σας είναι Συνδεδεμένος"
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
@@ -3457,7 +3358,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 ""
+
+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"
@@ -3495,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]"
@@ -3513,65 +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."
+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 "Η επιλογή είναι άδεια. Παρακαλώ επιλέξτε κάποιο κείμενο, ή τσεκάρετε \"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"
@@ -3633,13 +3580,13 @@ 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..."
@@ -3683,7 +3630,7 @@ msgstr "Υπάρχουν Ενημερώσεις Λογισμικού"
msgctxt "UpdatesAvailableDialog"
msgid "Remind Me Later"
-msgstr "Υπενθύμιση για αργότερα"
+msgstr ""
msgctxt "UpdatesAvailableDialog"
msgid "Install"
@@ -3691,7 +3638,7 @@ msgstr "Εγκατάσταση"
msgctxt "UpdatesAvailableDialog"
msgid "The following updated software packages are ready for installation:"
-msgstr "Τα ακόλουθα ενημερωμένα πακέτα λογισμικού είναι έτοιμα για εγκατάσταση:"
+msgstr ""
msgctxt "UpdatesAvailableDialog"
msgid "Package"
@@ -3701,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 "ΟΚ"
@@ -3794,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 "Δόθηκε μη έγκυρο είδος GUI:"
+msgstr ""
msgctxt "Vidalia"
msgid "Invalid log level specified:"
-msgstr "Δόθηκε μη έγκυρο επίπεδο καταγραφών:"
+msgstr ""
msgctxt "Vidalia"
msgid ""
diff --git a/src/vidalia/i18n/po/eo/qt_eo.po b/src/vidalia/i18n/po/eo/qt_eo.po
index c41e894..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:
-# 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: 2012-02-14 09:47+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"
@@ -201,7 +199,9 @@ msgctxt "QFileDialog"
msgid ""
"%1 already exists.\n"
"Do you want to replace it?"
-msgstr "%1 jam eksistas.\nĈu vi volas ĝin anstataŭigi?"
+msgstr ""
+"%1 jam eksistas.\n"
+"Ĉu vi volas ĝin anstataŭigi?"
#: qfiledialog.cpp:1690
msgctxt "QFileDialog"
@@ -209,7 +209,10 @@ msgid ""
"%1\n"
"File not found.\n"
"Please verify the correct file name was given."
-msgstr "%1\nDosiero ne trovita.\nBonvolu kontroli ĉu la korekta dosiernomo estis tajpata."
+msgstr ""
+"%1\n"
+"Dosiero ne trovita.\n"
+"Bonvolu kontroli ĉu la korekta dosiernomo estis tajpata."
#: qdirmodel.cpp:833
msgctxt "QFileDialog"
@@ -267,14 +270,19 @@ msgid ""
"%1\n"
"Directory not found.\n"
"Please verify the correct directory name was given."
-msgstr "%1\nDosierujo ne trovita.\nBonvolu kontroli ĉu la korekta dosierujnomo estis tajpata."
+msgstr ""
+"%1\n"
+"Dosierujo ne trovita.\n"
+"Bonvolu kontroli ĉu la korekta dosierujnomo estis tajpata."
#: qfiledialog.cpp:2281
msgctxt "QFileDialog"
msgid ""
"'%1' is write protected.\n"
"Do you want to delete it anyway?"
-msgstr "'%1' estas neskribalirebla.\nĈu vi volas ĝin anstataŭigi ĉiukaze?"
+msgstr ""
+"'%1' estas neskribalirebla.\n"
+"Ĉu vi volas ĝin anstataŭigi ĉiukaze?"
#: qfiledialog.cpp:2286
msgctxt "QFileDialog"
@@ -371,7 +379,9 @@ msgctxt "QFileSystemModel"
msgid ""
"<b>The name \"%1\" can not be used.</b><p>Try using another name, with fewer"
" characters or no punctuations marks."
-msgstr "<b>La nomo \"%1\" ne uzeblas.</b><p>Klopodi uzi alian nomon, kun malpli da signoj aŭ sen interpunkcio."
+msgstr ""
+"<b>La nomo \"%1\" ne uzeblas.</b><p>Klopodi uzi alian nomon, kun malpli da "
+"signoj aŭ sen interpunkcio."
#: qfilesystemmodel.cpp:832
msgctxt "QFileSystemModel"
diff --git a/src/vidalia/i18n/po/eo/vidalia_eo.po b/src/vidalia/i18n/po/eo/vidalia_eo.po
index 14be4a8..0f67fe2 100644
--- a/src/vidalia/i18n/po/eo/vidalia_eo.po
+++ b/src/vidalia/i18n/po/eo/vidalia_eo.po
@@ -1,13 +1,13 @@
#
# Translators:
-# identity <eeemsi at googlemail.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: 2012-03-21 17:52+0000\n"
-"PO-Revision-Date: 2012-03-22 08:52+0000\n"
-"Last-Translator: identity <eeemsi at googlemail.com>\n"
+"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"
@@ -194,17 +194,6 @@ msgid "Select a file to use for Tor socket path"
msgstr ""
msgctxt "AdvancedPage"
-msgid "Configure ControlPort automatically"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid ""
-"You've checked the autoconfiguration option for the ControlPort, but "
-"provided no Data Directory. Please add one, or uncheck the \"Configure "
-"ControlPort automatically\" option."
-msgstr ""
-
-msgctxt "AdvancedPage"
msgid ""
"Vidalia was unable to remove the Tor service.\n"
"\n"
@@ -231,23 +220,6 @@ msgctxt "AppearancePage"
msgid "Vidalia was unable to load the selected language translation."
msgstr "Vidalia ne povis ŝarĝi la elektitan lingvotradukon."
-msgctxt "AppearancePage"
-msgid ""
-"System Icon Preferences (changes will take effect when you restart Vidalia)"
-msgstr ""
-
-msgctxt "AppearancePage"
-msgid "Show the Tray Icon and Dock Icon (default)"
-msgstr ""
-
-msgctxt "AppearancePage"
-msgid "Hide the Tray Icon"
-msgstr ""
-
-msgctxt "AppearancePage"
-msgid "Hide the Dock Icon"
-msgstr ""
-
msgctxt "BandwidthGraph"
msgid "Since:"
msgstr "Ekde:"
@@ -261,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"
@@ -304,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..."
@@ -457,18 +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:"
-msgstr "Vidalia konektis al Tor-proceso kiu bezonas pasvorton.\nBonvolu entajpi vian stirpasvorton:"
+"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"
msgid "Control socket is not connected."
@@ -1291,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"
@@ -1356,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"
@@ -1387,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"
@@ -1669,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"
@@ -1705,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"
@@ -1773,6 +1729,10 @@ msgid "Connected to the Tor network!"
msgstr "Konektita al Tor-reto"
msgctxt "MainWindow"
+msgid "Unrecognized startup status"
+msgstr "Nerekonita startstato"
+
+msgctxt "MainWindow"
msgid "miscellaneous"
msgstr "diversaĵoj"
@@ -1817,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"
@@ -1903,18 +1859,6 @@ msgid ""
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 ""
-
-msgctxt "MainWindow"
msgid "Tor Update Available"
msgstr "Tor-ĝisdatigo disponebla"
@@ -1955,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 ""
@@ -2078,52 +1951,43 @@ 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 "Bootstrapping torrc from %1 to %2"
+msgid "toolBar"
msgstr ""
msgctxt "MainWindow"
-msgid "(probably Telnet)"
+msgid "Start"
msgstr ""
msgctxt "MainWindow"
-msgid "(probably an email client)"
+msgid "Stop"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"One of your applications %1 appears to be making a potentially unencrypted "
-"and unsafe connection to port %2."
+msgid "Restart"
msgstr ""
msgctxt "MainWindow"
-msgid "failed (%1)"
-msgstr "fiaskis (%1)"
-
-msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+msgid "Reload Tor's config"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Vidalia can't find out how to talk to Tor because it can't access this file: %1\n"
-"\n"
-"Here's the last error message:\n"
-"%2"
+msgid "Actions"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"It seems Tor has stopped running since Vidalia started it.\n"
-"\n"
-"See the Advanced Message Log for more information."
+msgid "Bootstrapping torrc from %1 to %2"
msgstr ""
msgctxt "MainWindow"
@@ -2140,6 +2004,38 @@ msgid ""
"Please check the message log for recent warning or error messages."
msgstr ""
+msgctxt "MainWindow"
+msgid ""
+"Vidalia tried to restart Tor, but was not able to. Please check your Task "
+"Manager to ensure there are no other Tor processes running."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "failed (%1)"
+msgstr "fiaskis (%1)"
+
+msgctxt "MainWindow"
+msgid ", probably Telnet,"
+msgstr ", eble Telnet,"
+
+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"
@@ -2393,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"
@@ -2448,10 +2336,6 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2551,6 +2435,30 @@ 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 ""
+
+msgctxt "NetworkPage"
+msgid "The specified bridge identifier is not valid."
+msgstr ""
+
msgctxt "NetworkPage"
msgid "Copy (Ctrl+C)"
msgstr ""
@@ -2684,11 +2592,11 @@ msgid "SOCKS 5"
msgstr ""
msgctxt "NetworkPage"
-msgid "HTTP / HTTPS"
+msgid "HTTP"
msgstr ""
msgctxt "NetworkPage"
-msgid "You must specify one or more bridges."
+msgid "HTTP / HTTPS"
msgstr ""
msgctxt "Policy"
@@ -3112,11 +3020,11 @@ msgid "Automatically distribute my bridge address"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network (exit relay)"
+msgid "Relay traffic inside the Tor network (non-exit relay)"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic inside the Tor network (non-exit relay)"
+msgid "Relay traffic for the Tor network (exit relay)"
msgstr ""
msgctxt "ServerPage"
@@ -3164,10 +3072,6 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
-msgid "Form"
-msgstr ""
-
-msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3456,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 ""
@@ -3492,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 ""
@@ -3570,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 ""
@@ -3698,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 ""
@@ -3791,10 +3749,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 ""
diff --git a/src/vidalia/i18n/po/es/qt_es.po b/src/vidalia/i18n/po/es/qt_es.po
index a14c8ba..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:
-# 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/language/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"
@@ -209,7 +207,10 @@ msgid ""
"%1\n"
"File not found.\n"
"Please verify the correct file name was given."
-msgstr "%1\nArchivo no encontrado.\nVerifique que el nombre del archivo es correcto."
+msgstr ""
+"%1\n"
+"Archivo no encontrado.\n"
+"Verifique que el nombre del archivo es correcto."
#: qdirmodel.cpp:833
msgctxt "QFileDialog"
@@ -267,14 +268,18 @@ msgid ""
"%1\n"
"Directory not found.\n"
"Please verify the correct directory name was given."
-msgstr "%1\nArchivo no encontrado.\nVerifique que el nombre del directorio es correcto."
+msgstr ""
+"%1\n"
+"Archivo no encontrado.\n"
+"Verifique que el nombre del directorio es correcto."
#: qfiledialog.cpp:2281
msgctxt "QFileDialog"
msgid ""
"'%1' is write protected.\n"
"Do you want to delete it anyway?"
-msgstr "«%1» está protegido contra escritura. ¿Desea eliminarlo de todas formas?"
+msgstr ""
+"«%1» está protegido contra escritura. ¿Desea eliminarlo de todas formas?"
#: qfiledialog.cpp:2286
msgctxt "QFileDialog"
@@ -371,7 +376,9 @@ msgctxt "QFileSystemModel"
msgid ""
"<b>The name \"%1\" can not be used.</b><p>Try using another name, with fewer"
" characters or no punctuations marks."
-msgstr "<b>No se puede utilizar el nombre «%1».</b><p>Intente usar otro nombre con menos caracteres o sin signos de puntuación."
+msgstr ""
+"<b>No se puede utilizar el nombre «%1».</b><p>Intente usar otro nombre con "
+"menos caracteres o sin signos de puntuación."
#: qfilesystemmodel.cpp:832
msgctxt "QFileSystemModel"
diff --git a/src/vidalia/i18n/po/es/vidalia_es.po b/src/vidalia/i18n/po/es/vidalia_es.po
index 236dbc7..43569da 100644
--- a/src/vidalia/i18n/po/es/vidalia_es.po
+++ b/src/vidalia/i18n/po/es/vidalia_es.po
@@ -1,17 +1,15 @@
#
# Translators:
-# Daniel Franganillo <dfranganillo at gmail.com>, 2011.
-# <lenazun at gmail.com>, 2011.
-# <mavtra724 at gmail.com>, 2012.
+# <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: 2012-03-21 17:52+0000\n"
-"PO-Revision-Date: 2012-03-30 10:59+0000\n"
-"Last-Translator: mavtra <mavtra724 at gmail.com>\n"
+"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"
@@ -47,7 +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 autentificació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"
@@ -147,39 +145,39 @@ 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 "Ruta:"
+msgstr "Ruta de acceso:"
msgctxt "AdvancedPage"
msgid "Use Unix domain socket (ControlSocket)"
-msgstr "Utilizar un socket de dominio 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 actualmente cargado"
+msgstr "NOTA: esto será editado mientras torrc se carga"
msgctxt "AdvancedPage"
msgid "ControlSocket path doesn't exist."
-msgstr "No existe la ruta al 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 especificado contiene caracteres que no pueden ser representados en la codificación de caracteres de 8 bits utilizada por su 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 del directorio de datos de Tor contiene caracteres que no pueden ser representados en la codificación de caracteres de 8 bits utilizada por su sistema."
+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"
@@ -187,33 +185,22 @@ msgstr "Advertencia"
msgctxt "AdvancedPage"
msgid "You changed torrc path, would you like to restart Tor?"
-msgstr "Ha cambiado la ruta a torrc. ¿Desea 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 "Seleccione un archivo a utilizar para la ruta del socket de Tor"
-
-msgctxt "AdvancedPage"
-msgid "Configure ControlPort automatically"
-msgstr "Configurar ControlPort automáticamente"
-
-msgctxt "AdvancedPage"
-msgid ""
-"You've checked the autoconfiguration option for the ControlPort, but "
-"provided no Data Directory. Please add one, or uncheck the \"Configure "
-"ControlPort automatically\" option."
-msgstr "Ha seleccionado la opción de autoconfiguración para ControlPort, pero no ha indicado un Directorio de datos. Añada uno, o desmarque la opción \"Configurar ControlPort automáticamente\"."
+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 pudo suprimir el servicio Tor.\n\nPuede tener que suprimirlo de forma manual."
+msgstr "Vidalia no fue capaz de eliminar el servicio de Tor.\n\nPuede que necesite eliminarlo de manera manual."
msgctxt "AppearancePage"
msgid "Language"
@@ -235,23 +222,6 @@ msgctxt "AppearancePage"
msgid "Vidalia was unable to load the selected language translation."
msgstr "Vidalia no pudo cargar la traducción al idioma seleccionado."
-msgctxt "AppearancePage"
-msgid ""
-"System Icon Preferences (changes will take effect when you restart Vidalia)"
-msgstr "Preferencias de iconos del sistema (los cambios se implementarán al reiniciar Vidalia)"
-
-msgctxt "AppearancePage"
-msgid "Show the Tray Icon and Dock Icon (default)"
-msgstr "Mostrar el Icono de bandeja y el Icono de dock (predeterminado)"
-
-msgctxt "AppearancePage"
-msgid "Hide the Tray Icon"
-msgstr "Ocultar el Icono de bandeja"
-
-msgctxt "AppearancePage"
-msgid "Hide the Dock Icon"
-msgstr "Ocultar el Icono de dock"
-
msgctxt "BandwidthGraph"
msgid "Since:"
msgstr "Desde:"
@@ -265,10 +235,6 @@ msgid "Show Settings"
msgstr "Mostrar Preferencias"
msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr "Uso de ancho de banda de Tor"
-
-msgctxt "BandwidthGraph"
msgid "Reset"
msgstr "Reiniciar"
@@ -282,7 +248,7 @@ msgstr "Tasa de Envío"
msgctxt "BandwidthGraph"
msgid "Always on Top"
-msgstr "Siempre arriba"
+msgstr "Siempre Arriba"
msgctxt "BandwidthGraph"
msgid "Style"
@@ -290,7 +256,7 @@ msgstr "Estilo"
msgctxt "BandwidthGraph"
msgid "Changes the transparency of the Bandwidth Graph"
-msgstr "Cambia la transparencia del Gráfico de ancho de banda"
+msgstr "Cambia la transparencia del Gráfico de Ancho de Banda"
msgctxt "BandwidthGraph"
msgid "100"
@@ -308,9 +274,13 @@ 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..."
+msgstr "Iniciando la solicitud de puente HTTPS."
msgctxt "BridgeDownloader"
msgid "Connecting to %1:%2..."
@@ -318,7 +288,7 @@ msgstr "Conectando a %1:%2..."
msgctxt "BridgeDownloader"
msgid "Sending an HTTPS request for bridges..."
-msgstr "Enviando una solicitud HTTPS de puentes..."
+msgstr "Enviando una solicitud HTTPS para puentes."
msgctxt "BridgeDownloader"
msgid "Downloading a list of bridges..."
@@ -330,7 +300,7 @@ msgstr "Descargando puentes"
msgctxt "BridgeDownloaderProgressDialog"
msgid "Unable to download bridges: %1"
-msgstr "No se pudieron descargar puentes: %1"
+msgstr "No pudo descargar puentes: %1"
msgctxt "BridgeDownloaderProgressDialog"
msgid "Retrying bridge request..."
@@ -342,11 +312,11 @@ msgstr "País"
msgctxt "BridgeUsageDialog"
msgid "# Clients"
-msgstr "N.º de clientes"
+msgstr "Nº. de Clientes"
msgctxt "BridgeUsageDialog"
msgid "Clients from the following countries have used your relay since %1"
-msgstr "Clientes de los siguientes países han usado su repetidor desde %1"
+msgstr "Clientes de los siguientes países han usado su retransmisor desde %1"
msgctxt "BridgeUsageDialog"
msgid "Bridge Usage Summary"
@@ -382,7 +352,7 @@ msgstr "Desconocido"
msgctxt "CircuitItem"
msgid "<Path Empty>"
-msgstr "<Ruta vacía>"
+msgstr "<Ruta Vacía>"
msgctxt "CircuitListWidget"
msgid "Connection"
@@ -398,11 +368,11 @@ msgstr "Acercamiento al circuito"
msgctxt "CircuitListWidget"
msgid "Close Circuit (Del)"
-msgstr "Cerrar Circuito (Supr)"
+msgstr "Cerrar Circuito (Del)"
msgctxt "CircuitListWidget"
msgid "Close Stream (Del)"
-msgstr "Cerrar flujo (Supr)"
+msgstr "Cerrar flujo (Del)"
msgctxt "ConfigDialog"
msgid "General"
@@ -434,7 +404,7 @@ msgstr "Ayuda"
msgctxt "ConfigDialog"
msgid "Error Saving Settings"
-msgstr "Error al guardar las preferencias"
+msgstr "Error al Guardar las Preferencias"
msgctxt "ConfigDialog"
msgid "Vidalia was unable to save your %1 settings."
@@ -442,7 +412,7 @@ msgstr "Vidalia no pudo guardar sus preferencias de %1."
msgctxt "ConfigDialog"
msgid "Error Applying Settings"
-msgstr "Error al aplicar las preferencias"
+msgstr "Error al Aplicar Preferencias"
msgctxt "ConfigDialog"
msgid "Vidalia was unable to apply your %1 settings to Tor."
@@ -454,37 +424,46 @@ msgstr "Preferencias"
msgctxt "ControlConnection"
msgid "Vidalia was unable to connect to Tor. (%1)"
-msgstr "Vidalia no pudo conectarse a Tor. (%1)"
+msgstr "Vidalia no pudo conectarse con Tor. (%1)"
msgctxt "ControlConnection"
msgid "Control socket is not connected."
-msgstr "El socket de control no está conectado."
+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 ""
+"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 "Remember my password"
-msgstr "Recordar mi contraseña"
+msgid ""
+"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 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 ejecución que requiere una contraseña. Introduzca su contraseña de control:"
+"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."
-msgstr "El socket de control no está conectado."
+msgstr "La conexión de control no esta conectada."
msgctxt "ControlSocket"
msgid "Error sending control command. [%1]"
-msgstr "Error al enviar una orden de control. [%1]"
+msgstr "Error enviando comando de control. [%1]"
msgctxt "ControlSocket"
msgid "Socket disconnected while attempting to read a line of data."
-msgstr "Socket desconectado mientras se intentaba leer una línea de datos."
+msgstr "Conexión desconectada mientras se trataba de leer una línea de información."
msgctxt "ControlSocket"
msgid "Invalid control reply. [%1]"
@@ -520,7 +499,7 @@ msgstr "Australia"
msgctxt "CountryInfo"
msgid "Azerbaijan"
-msgstr "Azerbaiyán"
+msgstr "Azerbaidzhán"
msgctxt "CountryInfo"
msgid "Bahamas"
@@ -560,7 +539,7 @@ msgstr "Bosnia y Herzegovina"
msgctxt "CountryInfo"
msgid "Botswana"
-msgstr "Botsuana"
+msgstr "Botswana"
msgctxt "CountryInfo"
msgid "Brazil"
@@ -584,7 +563,7 @@ msgstr "Burundi"
msgctxt "CountryInfo"
msgid "Cambodia"
-msgstr "Camboya"
+msgstr "Cambodia"
msgctxt "CountryInfo"
msgid "Cameroon"
@@ -660,7 +639,7 @@ msgstr "Dinamarca"
msgctxt "CountryInfo"
msgid "Djibouti"
-msgstr "Yibuti"
+msgstr "Djibutí"
msgctxt "CountryInfo"
msgid "Dominica"
@@ -772,11 +751,11 @@ msgstr "Jordania"
msgctxt "CountryInfo"
msgid "Kazakhstan"
-msgstr "Kazajistán"
+msgstr "Kazajhstán"
msgctxt "CountryInfo"
msgid "Kenya"
-msgstr "Kenia"
+msgstr "Kenya"
msgctxt "CountryInfo"
msgid "Kiribati"
@@ -788,7 +767,7 @@ msgstr "Kuwait"
msgctxt "CountryInfo"
msgid "Kyrgyzstan"
-msgstr "Kirguizistán"
+msgstr "Kirguistán"
msgctxt "CountryInfo"
msgid "Laos"
@@ -804,7 +783,7 @@ msgstr "Líbano"
msgctxt "CountryInfo"
msgid "Lesotho"
-msgstr "Lesoto"
+msgstr "Lesotho"
msgctxt "CountryInfo"
msgid "Liberia"
@@ -916,7 +895,7 @@ msgstr "Níger"
msgctxt "CountryInfo"
msgid "Nigeria"
-msgstr "Nigeria"
+msgstr "Níger"
msgctxt "CountryInfo"
msgid "Norway"
@@ -984,7 +963,7 @@ msgstr "Ruanda"
msgctxt "CountryInfo"
msgid "Saint Kitts & Nevis"
-msgstr "San Cristóbal y Nieves"
+msgstr "Saint Kitts y Nevis"
msgctxt "CountryInfo"
msgid "Saint Lucia"
@@ -1004,7 +983,7 @@ msgstr "San Marino"
msgctxt "CountryInfo"
msgid "Sao Tome & Principe"
-msgstr "Santo Tomé y Príncipe"
+msgstr "Sao Tomé y Príncipe"
msgctxt "CountryInfo"
msgid "Saudi Arabia"
@@ -1084,7 +1063,7 @@ msgstr "Siria"
msgctxt "CountryInfo"
msgid "Tajikistan"
-msgstr "Tayikistán"
+msgstr "Tazhdikistán"
msgctxt "CountryInfo"
msgid "Tanzania"
@@ -1096,7 +1075,7 @@ msgstr "Tailandia"
msgctxt "CountryInfo"
msgid "Timor-Leste (East Timor)"
-msgstr "Timor Oriental"
+msgstr "Timor Leste"
msgctxt "CountryInfo"
msgid "Togo"
@@ -1172,11 +1151,11 @@ msgstr "Vietnam"
msgctxt "CountryInfo"
msgid "Western Sahara"
-msgstr "Sáhara Occidental"
+msgstr "Sahara Occidental"
msgctxt "CountryInfo"
msgid "Yemen"
-msgstr "Yemen"
+msgstr "Yemén"
msgctxt "CountryInfo"
msgid "Zambia"
@@ -1184,7 +1163,7 @@ msgstr "Zambia"
msgctxt "CountryInfo"
msgid "Zimbabwe"
-msgstr "Zimbabue"
+msgstr "Zimbabwe"
msgctxt "CountryInfo"
msgid "Zaire"
@@ -1208,7 +1187,7 @@ msgstr "Bahrein"
msgctxt "CountryInfo"
msgid "Benin"
-msgstr "Benín"
+msgstr "Benin"
msgctxt "CountryInfo"
msgid "Ethiopia"
@@ -1276,7 +1255,7 @@ msgstr "Maldivas"
msgctxt "CountryInfo"
msgid "Mexico"
-msgstr "México"
+msgstr "Méjico"
msgctxt "CountryInfo"
msgid "Myanmar"
@@ -1288,11 +1267,29 @@ msgstr "Taiwán"
msgctxt "CrashReportDialog"
msgid "Submit a Crash Report"
-msgstr "Enviar un informe de fallo"
+msgstr "Presentar un informe de error"
msgctxt "CrashReportDialog"
msgid "Vidalia encountered an error and needed to close"
-msgstr "Vidalia encontró 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"
@@ -1304,36 +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 se pudo reiniciar Vidalia de forma automática. Reinicie Vidalia de forma manual."
+msgstr "No hemos podido reiniciar automáticamente Vidalia. Por favor, reinicia manualmente."
-msgctxt "CrashReportDialog"
-msgid "Please fill a ticket in:"
-msgstr "Por favor complete un tique en:"
-
-msgctxt "CrashReportDialog"
-msgid ""
-"<a "
-"href=\"https://trac.torproject.org/projects/tor/newticket\">https://trac.torproject.org/projects/tor/newticket</a>"
-msgstr "<a href=\"https://trac.torproject.org/projects/tor/newticket\">https://trac.torproject.org/projects/tor/newticket</a>"
+msgctxt "CrashReportUploader"
+msgid "Connecting..."
+msgstr "Conectando ..."
-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 "Se ha creado un informe de fallo que puede enviar a los desarrolladores de Vidalia para ayudar a identificar y solucionar el problema. El informe que se envía no contiene ninguna información que le pueda identificar."
+msgctxt "CrashReportUploader"
+msgid "Sending crash report..."
+msgstr "Enviando informe de errores ..."
-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 informe del cierre forzoso:"
+msgctxt "CrashReportUploader"
+msgid "Receiving response..."
+msgstr "Recibiendo respuesta ..."
msgctxt "GeneralPage"
msgid "Executables (*.exe)"
@@ -1345,7 +1331,7 @@ msgstr "Seleccione la ruta de Tor"
msgctxt "GeneralPage"
msgid "Select Proxy Executable"
-msgstr "Seleccionar el ejecutable del proxy"
+msgstr "Seleccionar el Ejecutable del Proxy"
msgctxt "GeneralPage"
msgid "You must specify the name of your Tor executable."
@@ -1360,16 +1346,12 @@ 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"
msgctxt "GeneralPage"
msgid "Proxy Application (optional)"
-msgstr "Aplicación proxy (opcional)"
+msgstr "Aplicación Proxy (opcional)"
msgctxt "GeneralPage"
msgid "Start a proxy application when Tor starts"
@@ -1377,7 +1359,7 @@ msgstr "Iniciar una aplicación proxy cuando Tor se inicie"
msgctxt "GeneralPage"
msgid "Proxy Application Arguments:"
-msgstr "Argumentos de la aplicación proxy:"
+msgstr "Argumentos de la aplicación Proxy:"
msgctxt "GeneralPage"
msgid "Software Updates"
@@ -1385,11 +1367,15 @@ msgstr "Actualizaciones de software"
msgctxt "GeneralPage"
msgid "Check for new software updates automatically"
-msgstr "Comprobar automáticamente si hay actualizaciones de software"
+msgstr "Revisar automáticamente si hay actualizaciones de software"
msgctxt "GeneralPage"
msgid "Check Now"
-msgstr "Comprobar ahora"
+msgstr "Revisar ahora"
+
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr "Conectarse a Tor automáticamente"
msgctxt "GraphFrame"
msgid "%1 KB/s"
@@ -1409,7 +1395,7 @@ msgstr "%1 GB"
msgctxt "GraphFrame"
msgid "Recv:"
-msgstr "Recib.:"
+msgstr "Recib."
msgctxt "GraphFrame"
msgid "Sent:"
@@ -1417,15 +1403,15 @@ msgstr "Enviados:"
msgctxt "HelpBrowser"
msgid "Supplied XML file is not a valid Contents document."
-msgstr "El archivo XML suministrado no es un documento de Contenidos válido."
+msgstr "Archivo XML suministrado no es un documento de Contenidos valido."
msgctxt "HelpBrowser"
msgid "Search reached end of document"
-msgstr "La búsqueda llegó al final del documento"
+msgstr "La búsqueda alcanzó el final del documento"
msgctxt "HelpBrowser"
msgid "Search reached start of document"
-msgstr "La búsqueda llegó al principio del documento"
+msgstr "La búsqueda alcanzó el principio del documento"
msgctxt "HelpBrowser"
msgid "Text not found in document"
@@ -1457,11 +1443,11 @@ msgstr "Adelante"
msgctxt "HelpBrowser"
msgid "Move to next page (Shift+Backspace)"
-msgstr "Ir a la página siguiente (Mayúsculas + Retroceso)"
+msgstr "Ir a la página siguiente (Mayúsculas+Retroceso)"
msgctxt "HelpBrowser"
msgid "Shift+Backspace"
-msgstr "Mayúsculas + Retroceso"
+msgstr "Shift+Retroceso"
msgctxt "HelpBrowser"
msgid "Home"
@@ -1469,11 +1455,11 @@ msgstr "Inicio"
msgctxt "HelpBrowser"
msgid "Move to the Home page (Ctrl+H)"
-msgstr "Ir a la Página de inicio (Ctrl + H)"
+msgstr "Ir a la Página de Inicio (Ctrl+H)"
msgctxt "HelpBrowser"
msgid "Ctrl+H"
-msgstr "Ctrl + H"
+msgstr "Ctrl+H"
msgctxt "HelpBrowser"
msgid "Find"
@@ -1481,11 +1467,11 @@ msgstr "Buscar"
msgctxt "HelpBrowser"
msgid "Search for a word or phrase on current page (Ctrl+F)"
-msgstr "Buscar una palabra o frase en la página actual (Ctrl + F)"
+msgstr "Buscar una palabra o frase en la página actual (Ctrl+F)"
msgctxt "HelpBrowser"
msgid "Ctrl+F"
-msgstr "Ctrl + F"
+msgstr "Ctrl+F"
msgctxt "HelpBrowser"
msgid "Close"
@@ -1493,7 +1479,7 @@ msgstr "Cerrar"
msgctxt "HelpBrowser"
msgid "Close Vidalia Help"
-msgstr "Cerrar ayuda de Vidalia"
+msgstr "Cerrar Ayuda de Vidalia"
msgctxt "HelpBrowser"
msgid "Esc"
@@ -1509,7 +1495,7 @@ msgstr "Buscar Anterior"
msgctxt "HelpBrowser"
msgid "Find Next"
-msgstr "Buscar Siguiente"
+msgstr "Encontrar Siguiente"
msgctxt "HelpBrowser"
msgid "Case sensitive"
@@ -1521,11 +1507,11 @@ msgstr "Palabras completas solamente"
msgctxt "HelpBrowser"
msgid "Help Topics"
-msgstr "Temas de ayuda"
+msgstr "Temas de Ayuda"
msgctxt "HelpBrowser"
msgid "Contents"
-msgstr "Índice"
+msgstr "Contenido"
msgctxt "HelpBrowser"
msgid "Search"
@@ -1541,7 +1527,7 @@ msgstr "Documentos encontrados"
msgctxt "HelpBrowser"
msgid "Error Loading Help Contents:"
-msgstr "No se pudo cargar el índice de la ayuda:"
+msgstr "No se pudo cargar el contenido de la Ayuda:"
msgctxt "HelpTextBrowser"
msgid "Opening External Link"
@@ -1552,11 +1538,11 @@ msgid ""
"Vidalia can open the link you selected in your default Web browser. If your "
"browser is not currently configured to use Tor then the request will not be "
"anonymous."
-msgstr "Vidalia puede abrir el enlace seleccionado en su navegador predeterminado. Si su navegador no está configurado para usar 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?"
-msgstr "¿Desea que Vidalia abra el enlace en su navegador predeterminado?"
+msgstr "¿Desea que Vidalia abra el enlace en su Navegador predeterminado?"
msgctxt "HelpTextBrowser"
msgid "Unable to Open Link"
@@ -1566,7 +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 en su navegador el enlace seleccionado Puede copiar la dirección y pegarla 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:"
@@ -1574,7 +1560,7 @@ msgstr "No se pudo abrir el archivo de ayuda:"
msgctxt "LicenseDialog"
msgid "License Information"
-msgstr "Información sobre la licencia"
+msgstr "Información de Licencia"
msgctxt "LicenseDialog"
msgid "License"
@@ -1614,7 +1600,7 @@ msgstr "Depurar"
msgctxt "LogTreeItem"
msgid "Info"
-msgstr "Información"
+msgstr "Informacion"
msgctxt "LogTreeItem"
msgid "Notice"
@@ -1642,19 +1628,19 @@ msgstr "Salir"
msgctxt "MainWindow"
msgid "Bandwidth Graph"
-msgstr "Gráfica de ancho de banda"
+msgstr "Gráfica de Ancho de Banda"
msgctxt "MainWindow"
msgid "Message Log"
-msgstr "Registro de mensajes"
+msgstr "Registro de Mensajes"
msgctxt "MainWindow"
msgid "Network Map"
-msgstr "Mapa de red"
+msgstr "Mapa de Red"
msgctxt "MainWindow"
msgid "Control Panel"
-msgstr "Panel de control"
+msgstr "Panel de Control"
msgctxt "MainWindow"
msgid "Settings"
@@ -1670,35 +1656,7 @@ msgstr "Ayuda"
msgctxt "MainWindow"
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"
+msgstr "Nueva Identidad"
msgctxt "MainWindow"
msgid "Tor"
@@ -1709,20 +1667,16 @@ msgid "View"
msgstr "Ver"
msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr "Ayuda de Vidalia"
-
-msgctxt "MainWindow"
msgid "Error starting web browser"
-msgstr "Error al iniciar el navegador"
+msgstr "Error al iniciar navegador web"
msgctxt "MainWindow"
msgid "Vidalia was unable to start the configured web browser"
-msgstr "Vidalia no pudo iniciar el navegador configurado"
+msgstr "Vidalia no pudo iniciar el navegador web configurado"
msgctxt "MainWindow"
msgid "Error starting IM client"
-msgstr "Error al iniciar el cliente IM"
+msgstr "Error al inicial el cliente IM"
msgctxt "MainWindow"
msgid "Vidalia was unable to start the configured IM client"
@@ -1742,7 +1696,7 @@ msgstr "Conectando a un directorio repetidor"
msgctxt "MainWindow"
msgid "Establishing an encrypted directory connection"
-msgstr "Estableciendo una conexión encriptada con el directorio"
+msgstr "Estableciendo una conexión con un directorio encriptado"
msgctxt "MainWindow"
msgid "Retrieving network status"
@@ -1754,15 +1708,15 @@ msgstr "Cargando el estado de la red"
msgctxt "MainWindow"
msgid "Loading authority certificates"
-msgstr "Cargando los certificados de autoridades"
+msgstr "Cargando los certificados de autoridad"
msgctxt "MainWindow"
msgid "Requesting relay information"
-msgstr "Solicitando información del repetidor"
+msgstr "Cargando los certificados de autoridad"
msgctxt "MainWindow"
msgid "Loading relay information"
-msgstr "Cargando información del repetidor"
+msgstr "Cargando la información del repetidor"
msgctxt "MainWindow"
msgid "Connecting to the Tor network"
@@ -1777,8 +1731,12 @@ msgid "Connected to the Tor network!"
msgstr "¡Conectado a la red Tor!"
msgctxt "MainWindow"
+msgid "Unrecognized startup status"
+msgstr "Estado de inicio desconocido"
+
+msgctxt "MainWindow"
msgid "miscellaneous"
-msgstr "miscelánea"
+msgstr "Miscelánea"
msgctxt "MainWindow"
msgid "identity mismatch"
@@ -1798,7 +1756,7 @@ msgstr "tiempo de espera de conexión agotado"
msgctxt "MainWindow"
msgid "read/write error"
-msgstr "error de escritura/lectura"
+msgstr "error en escritura/lectura"
msgctxt "MainWindow"
msgid "no route to host"
@@ -1818,11 +1776,7 @@ msgstr "Tor no está ejecutándose"
msgctxt "MainWindow"
msgid "Tor is shutting down"
-msgstr "Tor se está cerrando"
-
-msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr "Detener Tor ahora"
+msgstr "Tor se esta apagando"
msgctxt "MainWindow"
msgid "Stop Tor"
@@ -1838,13 +1792,13 @@ msgstr "Iniciando Tor"
msgctxt "MainWindow"
msgid "Error Starting Tor"
-msgstr "Error al iniciar Tor"
+msgstr "Error al Iniciar Tor"
msgctxt "MainWindow"
msgid ""
"Vidalia was unable to start Tor. Check your settings to ensure the correct "
"name and location of your Tor executable is specified."
-msgstr "Vidalia no pudo iniciar Tor. Compruebe su configuración para cerciorarse de que incluyen el nombre correcto y la ubicación de su 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"
@@ -1852,81 +1806,69 @@ msgstr "Conectando con Tor"
msgctxt "MainWindow"
msgid "Connection Error"
-msgstr "Error de conexión"
+msgstr "Error de Conexión"
msgctxt "MainWindow"
msgid "Relaying is Enabled"
-msgstr "Retransmisión activada"
+msgstr "Retransmisión Activada"
msgctxt "MainWindow"
msgid "Error Shutting Down"
-msgstr "Error al cerrar"
+msgstr "Error al Cerrarse"
msgctxt "MainWindow"
msgid "Vidalia was unable to stop the Tor software."
-msgstr "Vidalia no pudo detener el software Tor."
+msgstr "Vidalia no pudo detener el software de Tor."
msgctxt "MainWindow"
msgid "Unexpected Error"
-msgstr "Error inesperado"
+msgstr "Error Inesperado"
msgctxt "MainWindow"
msgid "Authenticating to Tor"
-msgstr "Autentificándose en Tor"
+msgstr "Autentificándose con Tor"
msgctxt "MainWindow"
msgid "Cookie Authentication Required"
-msgstr "Se requiere autentificación mediante cookie"
+msgstr "Se Requiere Autenticación a través de Cookie"
msgctxt "MainWindow"
msgid ""
"The Tor software requires Vidalia to send the contents of an authentication "
"cookie, but Vidalia was unable to find one."
-msgstr "Tor requiere que Vidalia envíe el contenido de una cookie de autentificació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 "¿Desea buscar usted mismo el archivo 'control_auth_cookie'?"
+msgstr "¿Le gustaría examinar usted mismo para encontrar el archivo 'control_auth_cookie'?"
msgctxt "MainWindow"
msgid "Data Directory"
-msgstr "Directorio de datos"
+msgstr "Directorio de Datos"
msgctxt "MainWindow"
msgid "Control Cookie (control_auth_cookie)"
-msgstr "Cookie de control (control_auth_cookie)"
+msgstr "Cookie de Control (control_auth_cookie)"
msgctxt "MainWindow"
msgid "Error Registering for Events"
-msgstr "Error en el registro de eventos"
+msgstr "Error en el registro de Eventos"
msgctxt "MainWindow"
msgid ""
"Vidalia was unable to register for some events. Many of Vidalia's features "
"may be unavailable."
-msgstr "Vidalia no pudo registrar algunos eventos. Puede que no estén disponibles muchas funciones de Vidalia."
-
-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 al software Tor. (%1)"
-
-msgctxt "MainWindow"
-msgid "Please check your control port authentication settings."
-msgstr "Por favor, verifique la configuración de autentificación de su puerto de control."
+msgstr "Vidalia no pudo registrar algunos eventos. Muchas de las características de Vidalia pueden no estar disponibles."
msgctxt "MainWindow"
msgid "Tor Update Available"
-msgstr "Actualización de Tor disponible"
+msgstr "Actualización de Tor Disponible"
msgctxt "MainWindow"
msgid ""
"The currently installed version of Tor is out of date or no longer "
"recommended. Please visit the Tor website to download the latest version."
-msgstr "La versión actualmente instalada de Tor está desactualizada o no se recomienda su uso. 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."
msgctxt "MainWindow"
msgid "Tor website: %1"
@@ -1959,85 +1901,14 @@ 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"
-
-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 recomienda su uso."
+msgstr "La versión actualmente instalada de Tor está desactualizada o no se recomiendo su uso."
msgctxt "MainWindow"
msgid ""
@@ -2082,53 +1953,44 @@ 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 "Bootstrapping torrc from %1 to %2"
-msgstr "Desencadenando torrc de %1 a %2"
+msgid "toolBar"
+msgstr "Barra de Herramientas"
msgctxt "MainWindow"
-msgid "(probably Telnet)"
-msgstr "(probablemente Telnet)"
+msgid "Start"
+msgstr "Iniciar"
msgctxt "MainWindow"
-msgid "(probably an email client)"
-msgstr "(probablemente un cliente de correo electrónico)"
+msgid "Stop"
+msgstr "Parar"
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."
+msgid "Restart"
+msgstr "Reiniciar"
msgctxt "MainWindow"
-msgid "failed (%1)"
-msgstr "falló (%1)"
+msgid "Reload Tor's config"
+msgstr "Recargar la configuración de Tor"
msgctxt "MainWindow"
-msgid ""
-"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."
+msgid "Actions"
+msgstr "Acciones"
msgctxt "MainWindow"
-msgid ""
-"Vidalia can't find out how to talk to Tor because it can't access this file: %1\n"
-"\n"
-"Here's the last error message:\n"
-"%2"
-msgstr "Vidalia no sabe cómo comunicarse con Tor porque no puede acceder a este archivo: %1\n\nEste es el último mensaje de error:\n%2"
-
-msgctxt "MainWindow"
-msgid ""
-"It seems Tor has stopped running since Vidalia started it.\n"
-"\n"
-"See the Advanced Message Log for more information."
-msgstr "Parece que Tor se ha detenido tras haber sido iniciado por Vidalia.\n\nConsulte el Registro avanzado de mensajes para más información."
+msgid "Bootstrapping torrc from %1 to %2"
+msgstr "inicio independiente de torrc desde %1 a %2"
msgctxt "MainWindow"
msgid ""
@@ -2144,6 +2006,38 @@ msgid ""
"Please check the message log for recent warning or error messages."
msgstr "Vidalia detectó que el software de Tor terminó de manera inesperada."
+msgctxt "MainWindow"
+msgid ""
+"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 "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 ""
+"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"
msgstr "Error configurando filtro"
@@ -2226,7 +2120,7 @@ msgstr "Borrar"
msgctxt "MessageLog"
msgid "Clear all messages from the Message Log (Ctrl+E)"
-msgstr "Borrar todos los mensajes del Registro de Mensajes"
+msgstr "Borrar todos los mensajes del Registro de Mensajes "
msgctxt "MessageLog"
msgid "Ctrl+E"
@@ -2397,22 +2291,14 @@ 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."
@@ -2452,10 +2338,6 @@ msgid ""
msgstr "No se puede escribir el archivo %1\n\n%2."
msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr "Mapa de Red de Tor"
-
-msgctxt "NetViewer"
msgid "Refresh"
msgstr "Actualizar"
@@ -2555,6 +2437,30 @@ 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"
+
+msgctxt "NetworkPage"
+msgid "The specified bridge identifier is not valid."
+msgstr "El identificador de puente especificado no es válido."
+
msgctxt "NetworkPage"
msgid "Copy (Ctrl+C)"
msgstr "Copiar (Ctrl+C)"
@@ -2669,7 +2575,7 @@ msgstr "Haga clic en Ayuda para ver otros métodos de búsqueda de nuevos puente
msgctxt "NetworkPage"
msgid "Address:"
-msgstr "Dirección"
+msgstr "Dirección:"
msgctxt "NetworkPage"
msgid "Type:"
@@ -2677,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"
@@ -2688,12 +2594,12 @@ msgid "SOCKS 5"
msgstr "SOCKS 5"
msgctxt "NetworkPage"
-msgid "HTTP / HTTPS"
-msgstr "HTTP/HTTPS"
+msgid "HTTP"
+msgstr "HTTP"
msgctxt "NetworkPage"
-msgid "You must specify one or more bridges."
-msgstr "Debe especificar uno o más puentes."
+msgid "HTTP / HTTPS"
+msgstr "HTTP / HTTPS"
msgctxt "Policy"
msgid "accept"
@@ -3109,19 +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 for the Tor network (exit relay)"
-msgstr "Tráfico de los repetidores de la red Tor (repetidores de salida)"
+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 inside the Tor network (non-exit relay)"
-msgstr "Tráfico de los repetidores dentro de la red Tor (excepto los repetidores de salida)"
+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"
@@ -3168,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"
@@ -3221,22 +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 ""
@@ -3244,7 +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 ""
@@ -3252,11 +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"
@@ -3266,17 +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 ""
@@ -3284,7 +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 ""
@@ -3292,11 +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 ""
@@ -3304,18 +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 ""
@@ -3323,81 +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 ""
@@ -3405,30 +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 ""
@@ -3436,21 +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 ""
@@ -3458,7 +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"
@@ -3496,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]"
@@ -3514,13 +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"
@@ -3548,19 +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\""
@@ -3572,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"
@@ -3634,7 +3582,7 @@ 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 ""
@@ -3702,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"
@@ -3795,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:"
diff --git a/src/vidalia/i18n/po/et/qt_et.po b/src/vidalia/i18n/po/et/qt_et.po
index 0d8354c..101a83f 100644
--- a/src/vidalia/i18n/po/et/qt_et.po
+++ b/src/vidalia/i18n/po/et/qt_et.po
@@ -1,11 +1,10 @@
#
-# Translators:
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-08-20 03:25+0000\n"
-"PO-Revision-Date: 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"
@@ -431,5 +430,3 @@ msgstr ""
msgctxt "QFileSystemModel"
msgid "%1 bytes"
msgstr ""
-
-
diff --git a/src/vidalia/i18n/po/et/vidalia_et.po b/src/vidalia/i18n/po/et/vidalia_et.po
index 8331b76..baa2cee 100644
--- a/src/vidalia/i18n/po/et/vidalia_et.po
+++ b/src/vidalia/i18n/po/et/vidalia_et.po
@@ -1,11 +1,10 @@
#
-# Translators:
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-09-07 14:40+0000\n"
-"PO-Revision-Date: 2010-12-05 20:03+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"
@@ -193,10 +192,6 @@ 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"
@@ -236,10 +231,6 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr ""
-
-msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -279,6 +270,10 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr ""
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -432,17 +427,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"
@@ -1266,44 +1270,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"
@@ -1331,10 +1342,6 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr ""
-
-msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1362,6 +1369,10 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr ""
+
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1644,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 ""
@@ -1680,10 +1663,6 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1796,10 +1775,6 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1882,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 ""
@@ -1934,82 +1897,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 ""
@@ -2057,19 +1949,39 @@ 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)"
+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"
@@ -2091,17 +2003,35 @@ msgid ""
msgstr ""
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"
@@ -2357,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"
@@ -2412,10 +2334,6 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2515,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 ""
@@ -2840,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 ""
@@ -3088,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 ""
@@ -3132,10 +3070,6 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
-msgid "Form"
-msgstr ""
-
-msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3424,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 ""
@@ -3460,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 ""
@@ -3538,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 ""
@@ -3666,6 +3646,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 ""
@@ -3759,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 ""
@@ -3812,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 6fc6beb..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:
-# 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: 2012-02-14 09:47+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,189 +17,189 @@ 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"
msgid ""
"%1 already exists.\n"
"Do you want to replace it?"
-msgstr "%1 existitzen da jada.\nOrdeztu nahi al duzu?"
+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\nFitxategia ez da aurkitu.\nMesedez zihurtatu fitxategi izen zuzena eman duzula."
+msgstr ""
#: 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"
@@ -267,168 +265,168 @@ msgid ""
"%1\n"
"Directory not found.\n"
"Please verify the correct directory name was given."
-msgstr "%1\nFitxategia ez da aurkitu.\nZihurtatu direktorio izen zuzena eman duzula."
+msgstr ""
#: qfiledialog.cpp:2281
msgctxt "QFileDialog"
msgid ""
"'%1' is write protected.\n"
"Do you want to delete it anyway?"
-msgstr "'%1' idatz babesturik dago.\nEzabatu nahi al duzu hala ere?"
+msgstr ""
#: 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"
msgid ""
"<b>The name \"%1\" can not be used.</b><p>Try using another name, with fewer"
" characters or no punctuations marks."
-msgstr "<b>\"%1\" izena ezin da erabili.</b><p>Saiatu beste izen bat erabiltzen, karaktere gutxiagorekin edo puntu markarik gabe."
+msgstr ""
#: 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 3f8bf01..ea01fd2 100755
--- a/src/vidalia/i18n/po/eu/vidalia_eu.po
+++ b/src/vidalia/i18n/po/eu/vidalia_eu.po
@@ -1,14 +1,11 @@
#
-# Translators:
-# Antxon Baldarra <baldarra at euskalerria.org>, 2012.
-# <baldarra at euskalerria.org>, 2011, 2012.
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2012-03-21 17:52+0000\n"
-"PO-Revision-Date: 2012-03-24 15:37+0000\n"
-"Last-Translator: Antxon Baldarra <baldarra at euskalerria.org>\n"
+"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"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,2407 +16,2295 @@ msgstr ""
msgctxt "AboutDialog"
msgid "About Vidalia"
-msgstr "Vidaliari buruz"
+msgstr ""
msgctxt "AboutDialog"
msgid "License"
-msgstr "Lizentzia"
+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' ez da IP helbide zuzen bat."
+msgstr ""
msgctxt "AdvancedPage"
msgid ""
"You selected 'Password' authentication, but did not specify a password."
-msgstr "'Pasahitza' autentifikazioa aukeratu duzu, baina ez duzu pasahitzik zehaztu."
+msgstr ""
msgctxt "AdvancedPage"
msgid "Select Tor Configuration File"
-msgstr "Aukeratu Tor Ezarpen Fitxategia"
+msgstr ""
msgctxt "AdvancedPage"
msgid "File Not Found"
-msgstr "Ez da Fitxategia aurkitu"
+msgstr ""
msgctxt "AdvancedPage"
msgid "%1 does not exist. Would you like to create it?"
-msgstr "%1 ez da existitzen. Sortu nahi al duzu?"
+msgstr ""
msgctxt "AdvancedPage"
msgid "Failed to Create File"
-msgstr "Akatsa Fitxategia sortzerakoan"
+msgstr ""
msgctxt "AdvancedPage"
msgid "Unable to create %1 [%2]"
-msgstr "Ezin izan da sortu %1 [%2]"
+msgstr ""
msgctxt "AdvancedPage"
msgid "Select a Directory to Use for Tor Data"
-msgstr "Aukeratu direktorio bat Tor Datuentzako"
+msgstr ""
msgctxt "AdvancedPage"
msgid "Unable to remove Tor Service"
-msgstr "Ezin izan da Tor Zerbitzua kendu"
+msgstr ""
msgctxt "AdvancedPage"
msgid "Unable to install Tor Service"
-msgstr "Ezin izan da Tor Zerbitzua instalatu"
+msgstr ""
msgctxt "AdvancedPage"
msgid "Vidalia was unable to install the Tor service."
-msgstr "Vidaliak ezin izan du Tor zerbitzua instalatu."
+msgstr ""
msgctxt "AdvancedPage"
msgid "Authentication:"
-msgstr "Autentifikazioa"
+msgstr ""
msgctxt "AdvancedPage"
msgid "Address:"
-msgstr "Helbidea:"
+msgstr ""
msgctxt "AdvancedPage"
msgid "None"
-msgstr "Bat ere ez"
+msgstr ""
msgctxt "AdvancedPage"
msgid "Cookie"
-msgstr "Cookie-a"
+msgstr ""
msgctxt "AdvancedPage"
msgid "Password"
-msgstr "Pasahitza"
+msgstr ""
msgctxt "AdvancedPage"
msgid "Randomly Generate"
-msgstr "Ausazki sortu"
+msgstr ""
msgctxt "AdvancedPage"
msgid ":"
-msgstr ":"
+msgstr ""
msgctxt "AdvancedPage"
msgid "Tor Configuration File"
-msgstr "Tor Ezarpen Fitxategia"
+msgstr ""
msgctxt "AdvancedPage"
msgid "Start the Tor software with the specified configuration file (torrc)"
-msgstr "Tor softwarea zehaztutako konfigurazio fitxategiarekin abiarazi (torrc)"
+msgstr ""
msgctxt "AdvancedPage"
msgid "Select path to your configuration file"
-msgstr "Aukeratu bidea zure ezarpen fitxategira"
+msgstr ""
msgctxt "AdvancedPage"
msgid "Browse"
-msgstr "Arakatu"
+msgstr ""
msgctxt "AdvancedPage"
msgid "Data Directory"
-msgstr "Datu Direktorioa"
+msgstr ""
msgctxt "AdvancedPage"
msgid "Store data for the Tor software in the following directory"
-msgstr "Tor softwarearen datuak hurrengo direktorioan gorde"
+msgstr ""
msgctxt "AdvancedPage"
msgid "Select the directory used to store data for the Tor software"
-msgstr "Aukeratu tor softwarearen datuak gordetzeko direktorioa"
+msgstr ""
msgctxt "AdvancedPage"
msgid "Tor Control"
-msgstr "Tor Kontrola"
+msgstr ""
msgctxt "AdvancedPage"
msgid "Use TCP connection (ControlPort)"
-msgstr "TCP konexioa erabili (ControlPort)"
+msgstr ""
msgctxt "AdvancedPage"
msgid "Path:"
-msgstr "Bidea:"
+msgstr ""
msgctxt "AdvancedPage"
msgid "Use Unix domain socket (ControlSocket)"
-msgstr "Unix domeinu socketa erabili (ControlSocket)"
+msgstr ""
msgctxt "AdvancedPage"
msgid "Edit current torrc"
-msgstr "Uneko torrc editatu"
+msgstr ""
msgctxt "AdvancedPage"
msgid "NOTE: this will edit the currently loaded torrc"
-msgstr "ADI: honek orain kargatutako torrc editatuko du"
+msgstr ""
msgctxt "AdvancedPage"
msgid "ControlSocket path doesn't exist."
-msgstr "ControlSocket bidea ez da existitzen."
+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 "Zehaztutako Tor konfigurazio fitxategiaren kokalekua zure sistemaren 8-biteko karaktere kodeatzaileak idudika ezin dituen karaktereak ditu."
+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 "Zehaztutako Tor datu direktorioaren kokalekua zure sistemaren 8-biteko karaktere kodeatzaileak idudika ezin dituen karaktereak ditu."
+msgstr ""
msgctxt "AdvancedPage"
msgid "Warning"
-msgstr "Oharra"
+msgstr ""
msgctxt "AdvancedPage"
msgid "You changed torrc path, would you like to restart Tor?"
-msgstr "torrc-ren bidea aldatu duzu, Tor berrabiarazi nahi al duzu?"
+msgstr ""
msgctxt "AdvancedPage"
msgid "Tor Configuration File (torrc);;All Files (*)"
-msgstr "Tor Konfigurazio Fitxategia (torrc);;Fitxategi Guztiak (*)"
+msgstr ""
msgctxt "AdvancedPage"
msgid "Select a file to use for Tor socket path"
-msgstr "Hautatu Tor socket bidea erabiltzeko fitxategi bat"
-
-msgctxt "AdvancedPage"
-msgid "Configure ControlPort automatically"
-msgstr "ControlPort automatikoki konfiguratu"
-
-msgctxt "AdvancedPage"
-msgid ""
-"You've checked the autoconfiguration option for the ControlPort, but "
-"provided no Data Directory. Please add one, or uncheck the \"Configure "
-"ControlPort automatically\" option."
-msgstr "ControlPorterako autokonfigurazio aukera gaitu duzu, baina ez duzu Datu Direktoriorik eman. Mesedez gehitu bat, edo ezgaitu \"ControlPort automatikoki konfiguratu\" aukera."
+msgstr ""
msgctxt "AdvancedPage"
msgid ""
"Vidalia was unable to remove the Tor service.\n"
"\n"
"You may need to remove it manually."
-msgstr "Vidaliak ezin izan du Tor zerbitzua kendu.\n\nEskuz kendu beharko duzu."
+msgstr ""
msgctxt "AppearancePage"
msgid "Language"
-msgstr "Hizkuntza"
+msgstr ""
msgctxt "AppearancePage"
msgid "Choose the language used in Vidalia"
-msgstr "Hautatu Vidalian erabiltzeko hizkuntza"
+msgstr ""
msgctxt "AppearancePage"
msgid "Style"
-msgstr "Estiloa"
+msgstr ""
msgctxt "AppearancePage"
msgid "Choose Vidalia's interface style"
-msgstr "Aukeratu Vidaliaren interfaze estiloa"
+msgstr ""
msgctxt "AppearancePage"
msgid "Vidalia was unable to load the selected language translation."
-msgstr "Vidaliak ezin izan du aukeratutako hizkuntza itzulpena kargatu."
-
-msgctxt "AppearancePage"
-msgid ""
-"System Icon Preferences (changes will take effect when you restart Vidalia)"
-msgstr "Sistemaren Ikono Hobespenak (aldaketak Vidalia berrabiarazten duzunean izango dute eragina)"
-
-msgctxt "AppearancePage"
-msgid "Show the Tray Icon and Dock Icon (default)"
-msgstr "Erakutsi Erretilu eta Kai Ikonoak (lehenetsia)"
-
-msgctxt "AppearancePage"
-msgid "Hide the Tray Icon"
-msgstr "Ezkutatu Erretilu Ikonoa"
-
-msgctxt "AppearancePage"
-msgid "Hide the Dock Icon"
-msgstr "Ezkutatu Kai Ikonoa"
+msgstr ""
msgctxt "BandwidthGraph"
msgid "Since:"
-msgstr "Noiztik:"
+msgstr ""
msgctxt "BandwidthGraph"
msgid "Hide Settings"
-msgstr "Ezarpenak ezkutatu"
+msgstr ""
msgctxt "BandwidthGraph"
msgid "Show Settings"
-msgstr "Ezarpenak erakutsi"
-
-msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr "Tor Banda-zabalera erabilpena"
+msgstr ""
msgctxt "BandwidthGraph"
msgid "Reset"
-msgstr "Berrabiarazi"
+msgstr ""
msgctxt "BandwidthGraph"
msgid "Receive Rate"
-msgstr "Jasotze abiadura"
+msgstr ""
msgctxt "BandwidthGraph"
msgid "Send Rate"
-msgstr "Bidaltze abiadura"
+msgstr ""
msgctxt "BandwidthGraph"
msgid "Always on Top"
-msgstr "Beti goian"
+msgstr ""
msgctxt "BandwidthGraph"
msgid "Style"
-msgstr "Estiloa"
+msgstr ""
msgctxt "BandwidthGraph"
msgid "Changes the transparency of the Bandwidth Graph"
-msgstr "Aldatu Banda-zabalera grafikoaren gardentasuna"
+msgstr ""
msgctxt "BandwidthGraph"
msgid "100"
-msgstr "100"
+msgstr ""
msgctxt "BandwidthGraph"
msgid "% Opaque"
-msgstr "Opako"
+msgstr ""
msgctxt "BandwidthGraph"
msgid "Save"
-msgstr "Gorde"
+msgstr ""
msgctxt "BandwidthGraph"
msgid "Cancel"
-msgstr "Utzi"
+msgstr ""
+
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr ""
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
-msgstr "HTTPS zubi eskaera hasten..."
+msgstr ""
msgctxt "BridgeDownloader"
msgid "Connecting to %1:%2..."
-msgstr "%1:%2 ra konetatzen..."
+msgstr ""
msgctxt "BridgeDownloader"
msgid "Sending an HTTPS request for bridges..."
-msgstr "Zubientzako HTTPS eskaera bidaltzen..."
+msgstr ""
msgctxt "BridgeDownloader"
msgid "Downloading a list of bridges..."
-msgstr "Zubi zerrenda deskargatzen..."
+msgstr ""
msgctxt "BridgeDownloaderProgressDialog"
msgid "Downloading Bridges"
-msgstr "Zubiak deskargatzen"
+msgstr ""
msgctxt "BridgeDownloaderProgressDialog"
msgid "Unable to download bridges: %1"
-msgstr "Ezin izan dira zubiak deskargatu: %1"
+msgstr ""
msgctxt "BridgeDownloaderProgressDialog"
msgid "Retrying bridge request..."
-msgstr "Zubien eskaera berriz saiatzen..."
+msgstr ""
msgctxt "BridgeUsageDialog"
msgid "Country"
-msgstr "Herrialdea"
+msgstr ""
msgctxt "BridgeUsageDialog"
msgid "# Clients"
-msgstr "# Bezeroak"
+msgstr ""
msgctxt "BridgeUsageDialog"
msgid "Clients from the following countries have used your relay since %1"
-msgstr "Hurrego herrialdeetako bezeroak zure errelea erabili dute %1 tik"
+msgstr ""
msgctxt "BridgeUsageDialog"
msgid "Bridge Usage Summary"
-msgstr "Zubi erabilpen Laburpena"
+msgstr ""
msgctxt "BridgeUsageDialog"
msgid "Client Summary"
-msgstr "Bezero Laburpena"
+msgstr ""
msgctxt "Circuit"
msgid "New"
-msgstr "Berria"
+msgstr ""
msgctxt "Circuit"
msgid "Open"
-msgstr "Irekita"
+msgstr ""
msgctxt "Circuit"
msgid "Building"
-msgstr "Eraikitzen"
+msgstr ""
msgctxt "Circuit"
msgid "Failed"
-msgstr "Huts egin du"
+msgstr ""
msgctxt "Circuit"
msgid "Closed"
-msgstr "Itxita"
+msgstr ""
msgctxt "Circuit"
msgid "Unknown"
-msgstr "Ezezaguna"
+msgstr ""
msgctxt "CircuitItem"
msgid "<Path Empty>"
-msgstr "<Bide hutsa>"
+msgstr ""
msgctxt "CircuitListWidget"
msgid "Connection"
-msgstr "Konexioa"
+msgstr ""
msgctxt "CircuitListWidget"
msgid "Status"
-msgstr "Egoera"
+msgstr ""
msgctxt "CircuitListWidget"
msgid "Zoom to Circuit"
-msgstr "Zirkuitura zooma"
+msgstr ""
msgctxt "CircuitListWidget"
msgid "Close Circuit (Del)"
-msgstr "Zirkuitua itxi (Supr)"
+msgstr ""
msgctxt "CircuitListWidget"
msgid "Close Stream (Del)"
-msgstr "Korrontea itxi (Supr)"
+msgstr ""
msgctxt "ConfigDialog"
msgid "General"
-msgstr "Orokorra"
+msgstr ""
msgctxt "ConfigDialog"
msgid "Network"
-msgstr "Sarea"
+msgstr ""
msgctxt "ConfigDialog"
msgid "Sharing"
-msgstr "Elkarbanaketa"
+msgstr ""
msgctxt "ConfigDialog"
msgid "Services"
-msgstr "Zerbitzuak"
+msgstr ""
msgctxt "ConfigDialog"
msgid "Appearance"
-msgstr "Itxura"
+msgstr ""
msgctxt "ConfigDialog"
msgid "Advanced"
-msgstr "Aurreratua"
+msgstr ""
msgctxt "ConfigDialog"
msgid "Help"
-msgstr "Laguntza"
+msgstr ""
msgctxt "ConfigDialog"
msgid "Error Saving Settings"
-msgstr "Huts ezarpenak gordetzerakoan"
+msgstr ""
msgctxt "ConfigDialog"
msgid "Vidalia was unable to save your %1 settings."
-msgstr "Vidaliak ezin izan ditu zure %1 ezarpenak gorde"
+msgstr ""
msgctxt "ConfigDialog"
msgid "Error Applying Settings"
-msgstr "Huts ezarpenak aplikatzerakoan"
+msgstr ""
msgctxt "ConfigDialog"
msgid "Vidalia was unable to apply your %1 settings to Tor."
-msgstr "Vidaliak ezin izan ditu zure %1 ezarpenak Toren aplikatu"
+msgstr ""
msgctxt "ConfigDialog"
msgid "Settings"
-msgstr "Ezarpenak"
+msgstr ""
msgctxt "ControlConnection"
msgid "Vidalia was unable to connect to Tor. (%1)"
-msgstr "Vidaliak ezin izan du Torera konektatu. (%1)"
+msgstr ""
msgctxt "ControlConnection"
msgid "Control socket is not connected."
-msgstr "Socket kontrola ez dago konektatuta."
+msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Password Required"
-msgstr "Pasahitza beharrezkoa"
+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 "Gogoratu nire pasahitza"
+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 exekutatzen ari den eta pasahitza behar duen Tor prozesu batera konektatu da. Mesedez sartu zure kontrolezko pasahitza:"
+"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 "Socket kontrola ez dago konektatuta."
+msgstr ""
msgctxt "ControlSocket"
msgid "Error sending control command. [%1]"
-msgstr "Huts kontrol komandoa bidaltzerakoan. [%1]"
+msgstr ""
msgctxt "ControlSocket"
msgid "Socket disconnected while attempting to read a line of data."
-msgstr "Socketa deskonektatu da datu lerro bat irakurtzen saiatzerakoan."
+msgstr ""
msgctxt "ControlSocket"
msgid "Invalid control reply. [%1]"
-msgstr "Baliogabeko kontrol erantzuna. [%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 eta 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 "Bahamak"
+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 "Belgika"
+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 "Brasil"
+msgstr ""
msgctxt "CountryInfo"
msgid "Brunei Darussalam"
-msgstr "Brunei"
+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 "Kanbodia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Cameroon"
-msgstr "Kamerun"
+msgstr ""
msgctxt "CountryInfo"
msgid "Canada"
-msgstr "Kanada"
+msgstr ""
msgctxt "CountryInfo"
msgid "Cape Verde"
-msgstr "Cabo Verde"
+msgstr ""
msgctxt "CountryInfo"
msgid "Central African Republic"
-msgstr "Afrika Erdiko Errepublika"
+msgstr ""
msgctxt "CountryInfo"
msgid "Chad"
-msgstr "Txad"
+msgstr ""
msgctxt "CountryInfo"
msgid "Chile"
-msgstr "Txile"
+msgstr ""
msgctxt "CountryInfo"
msgid "China"
-msgstr "Txina"
+msgstr ""
msgctxt "CountryInfo"
msgid "Colombia"
-msgstr "Kolonbia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Comoros"
-msgstr "Komoreak"
+msgstr ""
msgctxt "CountryInfo"
msgid "Congo, The Democratic Republic of the"
-msgstr "Kongoko Errepublika Demokratikoa"
+msgstr ""
msgctxt "CountryInfo"
msgid "Congo"
-msgstr "Kongo"
+msgstr ""
msgctxt "CountryInfo"
msgid "Costa Rica"
-msgstr "Costa Rica"
+msgstr ""
msgctxt "CountryInfo"
msgid "Cote d’Ivoire"
-msgstr "Boli Kosta"
+msgstr ""
msgctxt "CountryInfo"
msgid "Croatia"
-msgstr "Kroazia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Cuba"
-msgstr "Kuba"
+msgstr ""
msgctxt "CountryInfo"
msgid "Cyprus"
-msgstr "Txipre"
+msgstr ""
msgctxt "CountryInfo"
msgid "Czech Republic"
-msgstr "Txekiar Errepublika"
+msgstr ""
msgctxt "CountryInfo"
msgid "Denmark"
-msgstr "Dinamarka"
+msgstr ""
msgctxt "CountryInfo"
msgid "Djibouti"
-msgstr "Djibuti"
+msgstr ""
msgctxt "CountryInfo"
msgid "Dominica"
-msgstr "Dominika"
+msgstr ""
msgctxt "CountryInfo"
msgid "Dominican Republic"
-msgstr "Dominikar Errepublika"
+msgstr ""
msgctxt "CountryInfo"
msgid "Ecuador"
-msgstr "Ekuador"
+msgstr ""
msgctxt "CountryInfo"
msgid "Egypt"
-msgstr "Egipto"
+msgstr ""
msgctxt "CountryInfo"
msgid "El Salvador"
-msgstr "El Salvador"
+msgstr ""
msgctxt "CountryInfo"
msgid "Equatorial Guinea"
-msgstr "Ekuatore Ginea"
+msgstr ""
msgctxt "CountryInfo"
msgid "Eritrea"
-msgstr "Eritrea"
+msgstr ""
msgctxt "CountryInfo"
msgid "Estonia"
-msgstr "Estonia"
+msgstr ""
msgctxt "CountryInfo"
msgid "France"
-msgstr "Frantzia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Gabon"
-msgstr "Gabon"
+msgstr ""
msgctxt "CountryInfo"
msgid "Gambia"
-msgstr "Ganbia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Georgia"
-msgstr "Georgia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Germany"
-msgstr "Alemania"
+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 "Ginea"
+msgstr ""
msgctxt "CountryInfo"
msgid "Guinea-Bissau"
-msgstr "Ginea-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 "Japonia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Jordan"
-msgstr "Jordania"
+msgstr ""
msgctxt "CountryInfo"
msgid "Kazakhstan"
-msgstr "Kazakhstan"
+msgstr ""
msgctxt "CountryInfo"
msgid "Kenya"
-msgstr "Kenia"
+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 "Lao Herriaren Errepublika Demokratikoa"
+msgstr ""
msgctxt "CountryInfo"
msgid "Latvia"
-msgstr "Letonia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Lebanon"
-msgstr "Libano"
+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 "Lituania"
+msgstr ""
msgctxt "CountryInfo"
msgid "Luxembourg"
-msgstr "Luxenburgo"
+msgstr ""
msgctxt "CountryInfo"
msgid "Macedonia"
-msgstr "Mazedonia"
+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 Uharteak"
+msgstr ""
msgctxt "CountryInfo"
msgid "Mauritania"
-msgstr "Mauritania"
+msgstr ""
msgctxt "CountryInfo"
msgid "Mauritius"
-msgstr "Maurizio"
+msgstr ""
msgctxt "CountryInfo"
msgid "Micronesia"
-msgstr "Mikronesiako Estatu Federatuak"
+msgstr ""
msgctxt "CountryInfo"
msgid "Moldova"
-msgstr "Moldabia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Monaco"
-msgstr "Monako"
+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 "Mozanbike"
+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 "Herbehereak"
+msgstr ""
msgctxt "CountryInfo"
msgid "New Zealand"
-msgstr "Zeelanda Berria"
+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 "Norbegia"
+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 Ginea Berria"
+msgstr ""
msgctxt "CountryInfo"
msgid "Paraguay"
-msgstr "Paraguai"
+msgstr ""
msgctxt "CountryInfo"
msgid "Peru"
-msgstr "Peru"
+msgstr ""
msgctxt "CountryInfo"
msgid "Philippines"
-msgstr "Filipinak"
+msgstr ""
msgctxt "CountryInfo"
msgid "Poland"
-msgstr "Polonia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Portugal"
-msgstr "Portugal"
+msgstr ""
msgctxt "CountryInfo"
msgid "Qatar"
-msgstr "Qatar"
+msgstr ""
msgctxt "CountryInfo"
msgid "Romania"
-msgstr "Errumania"
+msgstr ""
msgctxt "CountryInfo"
msgid "Russia"
-msgstr "Errusia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Rwanda"
-msgstr "Ruanda"
+msgstr ""
msgctxt "CountryInfo"
msgid "Saint Kitts & Nevis"
-msgstr "Saint Kitts eta Nevis"
+msgstr ""
msgctxt "CountryInfo"
msgid "Saint Lucia"
-msgstr "Santa Luzia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Saint Vincent & the Grenadines"
-msgstr "Saint Vincent eta Grenadinak"
+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 eta 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 "Seychelleak"
+msgstr ""
msgctxt "CountryInfo"
msgid "Sierra Leone"
-msgstr "Sierra Leona"
+msgstr ""
msgctxt "CountryInfo"
msgid "Singapore"
-msgstr "Singapur"
+msgstr ""
msgctxt "CountryInfo"
msgid "Slovakia"
-msgstr "Eslovakia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Slovenia"
-msgstr "Eslovenia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Solomon Islands"
-msgstr "Solomon Uharteak"
+msgstr ""
msgctxt "CountryInfo"
msgid "Somalia"
-msgstr "Somalia"
+msgstr ""
msgctxt "CountryInfo"
msgid "South Africa"
-msgstr "Hegoafrika"
+msgstr ""
msgctxt "CountryInfo"
msgid "Spain"
-msgstr "Espainia"
+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 "Swazilandia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Sweden"
-msgstr "Suedia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Switzerland"
-msgstr "Suitza"
+msgstr ""
msgctxt "CountryInfo"
msgid "Syria"
-msgstr "Siria"
+msgstr ""
msgctxt "CountryInfo"
msgid "Tajikistan"
-msgstr "Tajikistan"
+msgstr ""
msgctxt "CountryInfo"
msgid "Tanzania"
-msgstr "Tanzania"
+msgstr ""
msgctxt "CountryInfo"
msgid "Thailand"
-msgstr "Tailandia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Timor-Leste (East Timor)"
-msgstr "Timor-Leste (Ekialdeko Timor)"
+msgstr ""
msgctxt "CountryInfo"
msgid "Togo"
-msgstr "Togo"
+msgstr ""
msgctxt "CountryInfo"
msgid "Tonga"
-msgstr "Tonga"
+msgstr ""
msgctxt "CountryInfo"
msgid "Trinidad & Tobago"
-msgstr "Trinidad eta Tobago"
+msgstr ""
msgctxt "CountryInfo"
msgid "Tunisia"
-msgstr "Tunisia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Turkey"
-msgstr "Turkia"
+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 "Ukrainia"
+msgstr ""
msgctxt "CountryInfo"
msgid "United Arab Emirates"
-msgstr "Arabiar Emirerri Batuak"
+msgstr ""
msgctxt "CountryInfo"
msgid "United Kingdom"
-msgstr "Erresuma Batua"
+msgstr ""
msgctxt "CountryInfo"
msgid "United States"
-msgstr "Estatu Batuak"
+msgstr ""
msgctxt "CountryInfo"
msgid "Uruguay"
-msgstr "Uruguai"
+msgstr ""
msgctxt "CountryInfo"
msgid "Uzbekistan"
-msgstr "Uzbekistan"
+msgstr ""
msgctxt "CountryInfo"
msgid "Vanuatu"
-msgstr "Vanuatu"
+msgstr ""
msgctxt "CountryInfo"
msgid "Vatican"
-msgstr "Vatikano Hiria"
+msgstr ""
msgctxt "CountryInfo"
msgid "Venezuela"
-msgstr "Venezuela"
+msgstr ""
msgctxt "CountryInfo"
msgid "Vietnam"
-msgstr "Vietnam"
+msgstr ""
msgctxt "CountryInfo"
msgid "Western Sahara"
-msgstr "Mendebaldeko 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 "Bahrein"
+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 "Grezia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Guam"
-msgstr "Guam"
+msgstr ""
msgctxt "CountryInfo"
msgid "Hungary"
-msgstr "Hungaria"
+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 "Irlanda"
+msgstr ""
msgctxt "CountryInfo"
msgid "Korea, North"
-msgstr "Ipar Korea"
+msgstr ""
msgctxt "CountryInfo"
msgid "Korea, South"
-msgstr "Hego Korea"
+msgstr ""
msgctxt "CountryInfo"
msgid "Libya"
-msgstr "Libia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Maldives"
-msgstr "Maldibak"
+msgstr ""
msgctxt "CountryInfo"
msgid "Mexico"
-msgstr "Mexiko"
+msgstr ""
msgctxt "CountryInfo"
msgid "Myanmar"
-msgstr "Myanmar"
+msgstr ""
msgctxt "CountryInfo"
msgid "Taiwan"
-msgstr "Taiwan"
+msgstr ""
msgctxt "CrashReportDialog"
msgid "Submit a Crash Report"
-msgstr "Talka Txosten bat aurkeztu"
+msgstr ""
msgctxt "CrashReportDialog"
msgid "Vidalia encountered an error and needed to close"
-msgstr "Vidaliak akats bat aurkitu du eta itxi behar izan du"
+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 berrabiarazi"
+msgstr ""
msgctxt "CrashReportDialog"
msgid "Don't Restart"
-msgstr "Ez berrabiarazi"
+msgstr ""
msgctxt "CrashReportDialog"
msgid "Unable to restart Vidalia"
-msgstr "Ezin izan da Vidalia berrabiarazi"
+msgstr ""
msgctxt "CrashReportDialog"
msgid ""
"We were unable to automatically restart Vidalia. Please restart Vidalia "
"manually."
-msgstr "Ezin izan dugu Vidalia automatikoki berrabiarazi. Mesedez Vidalia eskuz berrabiarazi."
-
-msgctxt "CrashReportDialog"
-msgid "Please fill a ticket in:"
-msgstr "Mesedez txartela bete hemen:"
+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 "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."
-msgstr "Vidalia garatzaileak arazoa identifikatzen eta konpontzen lagunduko dituen eta bidali dezakezun talka txosten bat sortu da. Aurkeztutako txostenak ez du inolako informazio pertsonalik."
+msgctxt "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:"
-msgstr "aplikazioak talka egin baino lehenago egiten ari zinenaren deskribapenarekin, talka txostenari dagokion hurrengo fitxategiekin:"
+msgctxt "CrashReportUploader"
+msgid "Receiving response..."
+msgstr ""
msgctxt "GeneralPage"
msgid "Executables (*.exe)"
-msgstr "Exekutagarriak (*.exe)"
+msgstr ""
msgctxt "GeneralPage"
msgid "Select Path to Tor"
-msgstr "Aukeratu Torerako bidea"
+msgstr ""
msgctxt "GeneralPage"
msgid "Select Proxy Executable"
-msgstr "Aukeratu Proxy exekutagarria"
+msgstr ""
msgctxt "GeneralPage"
msgid "You must specify the name of your Tor executable."
-msgstr "Zure Tor exekutagarriaren izena zehaztu behar duzu."
+msgstr ""
msgctxt "GeneralPage"
msgid "Start Vidalia when my system starts"
-msgstr "Abiarazi Vidalia nire sistema abiarazterakoan."
+msgstr ""
msgctxt "GeneralPage"
msgid "Browse"
-msgstr "Arakatu"
-
-msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr "Abiarazi Tor softwarea Vidalia abiarazterakoan"
+msgstr ""
msgctxt "GeneralPage"
msgid "Tor"
-msgstr "Tor"
+msgstr ""
msgctxt "GeneralPage"
msgid "Proxy Application (optional)"
-msgstr "Proxy Aplikazioa (hautazkoa)"
+msgstr ""
msgctxt "GeneralPage"
msgid "Start a proxy application when Tor starts"
-msgstr "Proxy aplikazio bat abiarazi Tor abiarazterakoan"
+msgstr ""
msgctxt "GeneralPage"
msgid "Proxy Application Arguments:"
-msgstr "Proxy aplikazioaren argumentuak:"
+msgstr ""
msgctxt "GeneralPage"
msgid "Software Updates"
-msgstr "Software Eguneraketak"
+msgstr ""
msgctxt "GeneralPage"
msgid "Check for new software updates automatically"
-msgstr "Software eguneraketa berriak dauden automatikoki egiaztatu"
+msgstr ""
msgctxt "GeneralPage"
msgid "Check Now"
-msgstr "Egiaztatu orain"
+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 "Jasoa:"
+msgstr ""
msgctxt "GraphFrame"
msgid "Sent:"
-msgstr "Bidalia:"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Supplied XML file is not a valid Contents document."
-msgstr "Emandako XML fitxategia ez da baliozko Contents dokumentua."
+msgstr ""
msgctxt "HelpBrowser"
msgid "Search reached end of document"
-msgstr "Bilaketa dokumentuaren amaierara heldu da"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Search reached start of document"
-msgstr "Bilaketa dokumentuaren hasierara heldu da"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Text not found in document"
-msgstr "Testua ez da dokumentuan aurkitu"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Found %1 results"
-msgstr "%1 emaitza aurkitu dira"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Vidalia Help"
-msgstr "Vidaliaren Laguntza"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Back"
-msgstr "Atzera"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Move to previous page (Backspace)"
-msgstr "Aurreko orrira joan (Atzera)"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Backspace"
-msgstr "Atzera"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Forward"
-msgstr "Aurrera"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Move to next page (Shift+Backspace)"
-msgstr "Hurrengo orrira joan (Shift+Atzera)"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Shift+Backspace"
-msgstr "Shift+Atzera"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Home"
-msgstr "Etxea"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Move to the Home page (Ctrl+H)"
-msgstr "Etxeko orrira joan (Ktrl+H)"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Ctrl+H"
-msgstr "Ktrl+H"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Find"
-msgstr "Bilatu"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Search for a word or phrase on current page (Ctrl+F)"
-msgstr "Hitz edo esaldi bat bilatu uneko orrian (Ktrl+F)"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Ctrl+F"
-msgstr "Ktrl+F"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Close"
-msgstr "Itxi"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Close Vidalia Help"
-msgstr "Vidaliaren Laguntza itxi"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Esc"
-msgstr "Esc"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Find:"
-msgstr "Bilatu:"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Find Previous"
-msgstr "Aurrekoa bilatu"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Find Next"
-msgstr "Hurrengoa bilatu"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Case sensitive"
-msgstr "Letra larriak eta xeheak bereiztu"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Whole words only"
-msgstr "Hitz osoak bakarrik"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Help Topics"
-msgstr "Laguntza Gaiak"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Contents"
-msgstr "Edukiak"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Search"
-msgstr "Bilaketa"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Searching for:"
-msgstr "Bilatu:"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Found Documents"
-msgstr "Aurkitutako dokumentuak"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Error Loading Help Contents:"
-msgstr "Huts laguntza edukiak kargatzerakoan:"
+msgstr ""
msgctxt "HelpTextBrowser"
msgid "Opening External Link"
-msgstr "Kanpo lotura irekitzen"
+msgstr ""
msgctxt "HelpTextBrowser"
msgid ""
"Vidalia can open the link you selected in your default Web browser. If your "
"browser is not currently configured to use Tor then the request will not be "
"anonymous."
-msgstr "Vidaliak aukeratu duzun lotura zure nabigatzaile lehenetsian ireki dezake. Zure nabigatzilea Tor erabiltzeko prest ez badago orduan eskaera ez da anonimoa izango."
+msgstr ""
msgctxt "HelpTextBrowser"
msgid "Do you want Vidalia to open the link in your Web browser?"
-msgstr "Nahi al duzu Vidaliak lotura zure Web nabigatzailean ireki dezala?"
+msgstr ""
msgctxt "HelpTextBrowser"
msgid "Unable to Open Link"
-msgstr "Ezin izan da lotura ireki"
+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 "Vidaliak ezin izan du aukeratu duzun lotura zure Web nabigatzailean ireki. Oraindik ere URLa kopiatu eta zure nabigatzailean itsatsi dezakezu."
+msgstr ""
msgctxt "HelpTextBrowser"
msgid "Error opening help file:"
-msgstr "Huts laguntza fitxategia irekitzerakoan:"
+msgstr ""
msgctxt "LicenseDialog"
msgid "License Information"
-msgstr "Lizentzia informazioa"
+msgstr ""
msgctxt "LicenseDialog"
msgid "License"
-msgstr "Lizentzia"
+msgstr ""
msgctxt "LicenseDialog"
msgid "Credits"
-msgstr "Kredituak"
+msgstr ""
msgctxt "LogEvent"
msgid "Debug"
-msgstr "Araztu"
+msgstr ""
msgctxt "LogEvent"
msgid "Info"
-msgstr "Info"
+msgstr ""
msgctxt "LogEvent"
msgid "Notice"
-msgstr "Abisua"
+msgstr ""
msgctxt "LogEvent"
msgid "Warning"
-msgstr "Oharra"
+msgstr ""
msgctxt "LogEvent"
msgid "Error"
-msgstr "Akatsa"
+msgstr ""
msgctxt "LogEvent"
msgid "Unknown"
-msgstr "Ezezaguna"
+msgstr ""
msgctxt "LogTreeItem"
msgid "Debug"
-msgstr "Arazi"
+msgstr ""
msgctxt "LogTreeItem"
msgid "Info"
-msgstr "Info"
+msgstr ""
msgctxt "LogTreeItem"
msgid "Notice"
-msgstr "Abisua"
+msgstr ""
msgctxt "LogTreeItem"
msgid "Warning"
-msgstr "Oharra"
+msgstr ""
msgctxt "LogTreeItem"
msgid "Error"
-msgstr "Akatsa"
+msgstr ""
msgctxt "LogTreeItem"
msgid "Unknown"
-msgstr "Ezezaguna"
+msgstr ""
msgctxt "MainWindow"
msgid "Start Tor"
-msgstr "Tor hasi"
+msgstr ""
msgctxt "MainWindow"
msgid "Exit"
-msgstr "Irten"
+msgstr ""
msgctxt "MainWindow"
msgid "Bandwidth Graph"
-msgstr "Banda-zabalera grafikoa"
+msgstr ""
msgctxt "MainWindow"
msgid "Message Log"
-msgstr "Mezu erregistroa"
+msgstr ""
msgctxt "MainWindow"
msgid "Network Map"
-msgstr "Sarearen mapa"
+msgstr ""
msgctxt "MainWindow"
msgid "Control Panel"
-msgstr "Kontrol-panela"
+msgstr ""
msgctxt "MainWindow"
msgid "Settings"
-msgstr "Ezarpenak"
+msgstr ""
msgctxt "MainWindow"
msgid "About"
-msgstr "Honi buruz"
+msgstr ""
msgctxt "MainWindow"
msgid "Help"
-msgstr "Laguntza"
+msgstr ""
msgctxt "MainWindow"
msgid "New Identity"
-msgstr "Nortasun berria"
-
-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"
+msgstr ""
msgctxt "MainWindow"
msgid "Tor"
-msgstr "Tor"
+msgstr ""
msgctxt "MainWindow"
msgid "View"
-msgstr "Ikusi"
-
-msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr "Vidaliaren Laguntza"
+msgstr ""
msgctxt "MainWindow"
msgid "Error starting web browser"
-msgstr "Huts web nabigatzailea abiarazterakoan"
+msgstr ""
msgctxt "MainWindow"
msgid "Vidalia was unable to start the configured web browser"
-msgstr "Vidaliak ezin izan du konfiguratutako web nabigatzailea abiarazi"
+msgstr ""
msgctxt "MainWindow"
msgid "Error starting IM client"
-msgstr "Huts IM bezeroa abiarazterakoan"
+msgstr ""
msgctxt "MainWindow"
msgid "Vidalia was unable to start the configured IM client"
-msgstr "Vidaliak ezin izan du konfiguratutako IM bezeroa abiarazi"
+msgstr ""
msgctxt "MainWindow"
msgid "Error starting proxy server"
-msgstr "Huts proxy zerbitzaria abiarazterakoan"
+msgstr ""
msgctxt "MainWindow"
msgid "Vidalia was unable to start the configured proxy server"
-msgstr "Vidaliak ezin izan du konfiguratutako proxy zerbitzaria abiarazi"
+msgstr ""
msgctxt "MainWindow"
msgid "Connecting to a relay directory"
-msgstr "Errele direktorio batera konektatzen"
+msgstr ""
msgctxt "MainWindow"
msgid "Establishing an encrypted directory connection"
-msgstr "Enkriptatutako direktorio batera konexioa ezartzen"
+msgstr ""
msgctxt "MainWindow"
msgid "Retrieving network status"
-msgstr "Sarearen egoera eskuratzen"
+msgstr ""
msgctxt "MainWindow"
msgid "Loading network status"
-msgstr "Sarearen egoera kargatzen"
+msgstr ""
msgctxt "MainWindow"
msgid "Loading authority certificates"
-msgstr "Aginpide ziurtagiriak kargatzen"
+msgstr ""
msgctxt "MainWindow"
msgid "Requesting relay information"
-msgstr "Errele informazioa eskatzen"
+msgstr ""
msgctxt "MainWindow"
msgid "Loading relay information"
-msgstr "Errele informazioa kargatzen"
+msgstr ""
msgctxt "MainWindow"
msgid "Connecting to the Tor network"
-msgstr "Tor sarera konektatzen"
+msgstr ""
msgctxt "MainWindow"
msgid "Establishing a Tor circuit"
-msgstr "Tor zirkuitu bat ezartzen"
+msgstr ""
msgctxt "MainWindow"
msgid "Connected to the Tor network!"
-msgstr "Tor sarera konektatuta!"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Unrecognized startup status"
+msgstr ""
msgctxt "MainWindow"
msgid "miscellaneous"
-msgstr "hainbat"
+msgstr ""
msgctxt "MainWindow"
msgid "identity mismatch"
-msgstr "nortasuna ez dator bat"
+msgstr ""
msgctxt "MainWindow"
msgid "done"
-msgstr "eginda"
+msgstr ""
msgctxt "MainWindow"
msgid "connection refused"
-msgstr "konexioa ukatua"
+msgstr ""
msgctxt "MainWindow"
msgid "connection timeout"
-msgstr "konexioa denboraz kanpo"
+msgstr ""
msgctxt "MainWindow"
msgid "read/write error"
-msgstr "irakurketa/idazketa akatsa"
+msgstr ""
msgctxt "MainWindow"
msgid "no route to host"
-msgstr "ez dago biderik ostalarira"
+msgstr ""
msgctxt "MainWindow"
msgid "insufficient resources"
-msgstr "baliabideak ez dira nahikoak"
+msgstr ""
msgctxt "MainWindow"
msgid "unknown"
-msgstr "ezezaguna"
+msgstr ""
msgctxt "MainWindow"
msgid "Tor is not running"
-msgstr "Tor ez da exekutatzen ari"
+msgstr ""
msgctxt "MainWindow"
msgid "Tor is shutting down"
-msgstr "Tor itzaltzen ari da"
-
-msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr "Tor orain gelditu"
+msgstr ""
msgctxt "MainWindow"
msgid "Stop Tor"
-msgstr "Tor gelditu"
+msgstr ""
msgctxt "MainWindow"
msgid "Starting the Tor software"
-msgstr "Tor softwarea abiarazten"
+msgstr ""
msgctxt "MainWindow"
msgid "Starting Tor"
-msgstr "Tor abiarazten"
+msgstr ""
msgctxt "MainWindow"
msgid "Error Starting Tor"
-msgstr "Huts Tor abiarazterakoan"
+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 "Vidaliak ezin izan du Tor abiarazi. Egiaztatu zure ezarpenetan zure Tor exekutagarriaren izen eta kokaleku zuzenak zehaztu direla."
+msgstr ""
msgctxt "MainWindow"
msgid "Connecting to Tor"
-msgstr "Torera konektatzen"
+msgstr ""
msgctxt "MainWindow"
msgid "Connection Error"
-msgstr "Konexio akatsa"
+msgstr ""
msgctxt "MainWindow"
msgid "Relaying is Enabled"
-msgstr "Erreleatzea Gaiturik dago"
+msgstr ""
msgctxt "MainWindow"
msgid "Error Shutting Down"
-msgstr "Huts itzaltzerakoan"
+msgstr ""
msgctxt "MainWindow"
msgid "Vidalia was unable to stop the Tor software."
-msgstr "Vidaliak ezin izan du Tor softwarea gelditu."
+msgstr ""
msgctxt "MainWindow"
msgid "Unexpected Error"
-msgstr "Ustekabeko akatsa"
+msgstr ""
msgctxt "MainWindow"
msgid "Authenticating to Tor"
-msgstr "Torera autentifikatzen"
+msgstr ""
msgctxt "MainWindow"
msgid "Cookie Authentication Required"
-msgstr "Cookie autentifikazioa beharrezkoa"
+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 softwareak Vidalia behar du autentifikazio cookie baten edukiak bidaltzeko, baina Vidaliak ezin izan du bat ere ez aurkitu."
+msgstr ""
msgctxt "MainWindow"
msgid "Would you like to browse for the file 'control_auth_cookie' yourself?"
-msgstr "'control_auth_cookie' zuk zeuk bilatu nahiko al zenuke?"
+msgstr ""
msgctxt "MainWindow"
msgid "Data Directory"
-msgstr "Datu direktorioa"
+msgstr ""
msgctxt "MainWindow"
msgid "Control Cookie (control_auth_cookie)"
-msgstr "Kontrol Cookie-a (control_auth_cookie)"
+msgstr ""
msgctxt "MainWindow"
msgid "Error Registering for Events"
-msgstr "Huts Gertaerak erregistratzerakoan"
+msgstr ""
msgctxt "MainWindow"
msgid ""
"Vidalia was unable to register for some events. Many of Vidalia's features "
"may be unavailable."
-msgstr "Vidaliak ezin izan ditu gertaera batzuk erregistratu. Baliteke Vidaliaren ezaugarri asko erabilgarri ez egotea."
-
-msgctxt "MainWindow"
-msgid "Authentication Error"
-msgstr "Autentifikazio akatsa"
-
-msgctxt "MainWindow"
-msgid "Vidalia was unable to authenticate to the Tor software. (%1)"
-msgstr "Vidaliak ezin izan du Tor softwarera autentifikatu. (%1)"
-
-msgctxt "MainWindow"
-msgid "Please check your control port authentication settings."
-msgstr "Mesedez egiaztatu zure kontrol portu autentifikazio ezarpenak."
+msgstr ""
msgctxt "MainWindow"
msgid "Tor Update Available"
-msgstr "Tor eguneraketa eskuragarri"
+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 "Orain instalatuta duzun Tor bertsioa zaharkituta dago eta bere erabilpena ez da gehiago gomendatzen. Mesedez bisitatu Tor webgunea azken bertsioa eskuratzeko."
+msgstr ""
msgctxt "MainWindow"
msgid "Tor website: %1"
-msgstr "Tor webgunea: %1"
+msgstr ""
msgctxt "MainWindow"
msgid ""
"All subsequent connections will appear to be different than your old "
"connections."
-msgstr "Ondorengo konexio guztiak aurrekoen itxura ezberdina hartuko dute."
+msgstr ""
msgctxt "MainWindow"
msgid "Failed to Create New Identity"
-msgstr "Huts nortasun berria sortzerakoan"
+msgstr ""
msgctxt "MainWindow"
msgid "Port Forwarding Failed"
-msgstr "Huts Portu Jarraipenean"
+msgstr ""
msgctxt "MainWindow"
msgid "Vidalia was unable to configure automatic port forwarding."
-msgstr "Vidaliak ezin izan du Portu Jarraipen automatikoa konfiguratu."
+msgstr ""
msgctxt "MainWindow"
msgid "Vidalia Control Panel"
-msgstr "Vidalia Kontrol-panela"
+msgstr ""
msgctxt "MainWindow"
msgid "Status"
-msgstr "Egoera"
-
-msgctxt "MainWindow"
-msgid "Vidalia Shortcuts"
-msgstr "Vidalia lasterbideak"
-
-msgctxt "MainWindow"
-msgid "Setup Relaying"
-msgstr "Erreleatzea konfiguratu"
-
-msgctxt "MainWindow"
-msgid "Set up a relay and help the network grow"
-msgstr "Errele bat konfiguratu eta lagundu sarea hazten"
-
-msgctxt "MainWindow"
-msgid "View the Network"
-msgstr "Sarea ikusi"
-
-msgctxt "MainWindow"
-msgid "View a map of the Tor network"
-msgstr "Tor sarearen mapa bat ikusi"
-
-msgctxt "MainWindow"
-msgid "Use a New Identity"
-msgstr "Nortasun berri bat erabili"
-
-msgctxt "MainWindow"
-msgid "Make subsequent connections appear new"
-msgstr "Ondorengo konexioei berriak direlaren itxura eman"
-
-msgctxt "MainWindow"
-msgid "View recent bandwidth usage"
-msgstr "Ikusi azken banda-zabaleraren erabilera"
-
-msgctxt "MainWindow"
-msgid "View log message history"
-msgstr "Ikusi mezu erregistroaren historia"
-
-msgctxt "MainWindow"
-msgid "View help documentation"
-msgstr "Ikusi laguntza dokumentazioa"
-
-msgctxt "MainWindow"
-msgid "Configure Vidalia"
-msgstr "Vidalia Konfiguratu"
-
-msgctxt "MainWindow"
-msgid "View version and license information"
-msgstr "Ikusi bertsio eta lizentzia informazioa"
-
-msgctxt "MainWindow"
-msgid "Exit Vidalia"
-msgstr "Vidaliatik irten"
-
-msgctxt "MainWindow"
-msgid "Show this window on startup"
-msgstr "Lehio hau abioan erakutsi"
-
-msgctxt "MainWindow"
-msgid "Hide"
-msgstr "Ezkutatu"
-
-msgctxt "MainWindow"
-msgid "Hide this window"
-msgstr "Lehio hau ezkutatu"
+msgstr ""
msgctxt "MainWindow"
msgid "Password Reset Failed"
-msgstr "Huts pasahitza berrezartzea"
-
-msgctxt "MainWindow"
-msgid ""
-"Vidalia tried to reset Tor's control password, but was not able to restart "
-"the Tor software. Please check your Task Manager to ensure there are no "
-"other Tor processes running."
-msgstr "Vidalia Toren kontrol pasahitza berrezartzen saiatu da, baina ezin izan du Tor softwarea berrabiarazi. Mesedez begiratu zure Ataza Kudeatzailea beste Tor prozesurik martxan ez dagoela egiaztatzeko."
+msgstr ""
msgctxt "MainWindow"
msgid ""
"The currently installed version of Tor is out of date or no longer "
"recommended."
-msgstr "Orain instalatuta duzun Tor bertsioa zaharkituta dago edo bere erabilpena ez da gehiago gomendatzen."
+msgstr ""
msgctxt "MainWindow"
msgid ""
"Would you like to check if a newer package is available for installation?"
-msgstr "Instalatzeko pakete berriren bat eskuragarri dagoen egiaztatu nahiko al zenuke?"
+msgstr ""
msgctxt "MainWindow"
msgid "Potentially Unsafe Connection"
-msgstr "Arrisku handiko konexioa"
+msgstr ""
msgctxt "MainWindow"
msgid ""
"Tor has automatically closed your connection in order to protect your "
"anonymity."
-msgstr "Torek zure konexioa automatikoki itxi du zure anonimotasuna babesteko."
+msgstr ""
msgctxt "MainWindow"
msgid "Update Failed"
-msgstr "Eguneraketak huts egin du"
+msgstr ""
msgctxt "MainWindow"
msgid "Your software is up to date"
-msgstr "Zure softwarea eguneratuta dago"
+msgstr ""
msgctxt "MainWindow"
msgid ""
"There are no new Tor software packages available for your computer at this "
"time."
-msgstr "Oraintxe bertan ez dago Tor software pakete berririk zure ordenagailuarentzako."
+msgstr ""
msgctxt "MainWindow"
msgid "Installation Failed"
-msgstr "Instalazioak huts egin du"
+msgstr ""
msgctxt "MainWindow"
msgid "Vidalia was unable to install your software updates."
-msgstr "Vidaliak ezin izan ditu zure software eguneraketak instalatu."
+msgstr ""
msgctxt "MainWindow"
msgid "The following error occurred:"
-msgstr "Hurrengo akatsa gertatu da:"
+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 "Konexio honen bitartez bidalitako edozer kontrola daiteke. Mesedez egiaztatu zure aplikazioaren konfigurazioa eta enkriptatutako protokoloak bakarrik erabili, SSL bezala, ahal izanez gero."
-
-msgctxt "MainWindow"
-msgid "Bootstrapping torrc from %1 to %2"
-msgstr "%1 etik %2 ra torrc abio-uhaltzen"
+msgstr ""
msgctxt "MainWindow"
-msgid "(probably Telnet)"
-msgstr "(ziurrenik Telnet)"
+msgid "toolBar"
+msgstr ""
msgctxt "MainWindow"
-msgid "(probably an email client)"
-msgstr "(ziurrenik email bezero bat)"
+msgid "Start"
+msgstr ""
msgctxt "MainWindow"
-msgid ""
-"One of your applications %1 appears to be making a potentially unencrypted "
-"and unsafe connection to port %2."
-msgstr "Antza denez zure aplikazioren bat %1 enkriptatu gabeko eta arrisku handiko konexio bat egiten ari da %2 portuan."
+msgid "Stop"
+msgstr ""
msgctxt "MainWindow"
-msgid "failed (%1)"
-msgstr "huts egin du (%1)"
+msgid "Restart"
+msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
-msgstr "Zure errelea itzaltzen ari da orain.\nSakatu 'Gelditu' berriz zure errelea orain gelditzeko."
+msgid "Reload Tor's config"
+msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Vidalia can't find out how to talk to Tor because it can't access this file: %1\n"
-"\n"
-"Here's the last error message:\n"
-"%2"
-msgstr "Vidaliak ez daki nola Tori hitzegin fitxategi honetara ezin daitekeelako sartu: %1\n\nHemen duzu azken akats mezua:\n%2"
+msgid "Actions"
+msgstr ""
msgctxt "MainWindow"
-msgid ""
-"It seems Tor has stopped running since Vidalia started it.\n"
-"\n"
-"See the Advanced Message Log for more information."
-msgstr "Badirudi Tor Vidaliak hasi duenetik gelditu dela.\n\nIkusi Mezu Erregistro Aurreratua informazioa gehiago lortzeko."
+msgid "Bootstrapping torrc from %1 to %2"
+msgstr ""
msgctxt "MainWindow"
msgid ""
"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
"\n"
"Would you like to shutdown gracefully and give clients time to find a new relay?"
-msgstr "Orain errele bat exekutatzen ari zara. Zure errelea gelditzeak bezeroen edozein konexio irekiak etetea ekarriko du.\n\nGraziaz itzali eta bezeroei errele berri bat bilatzeko denbora eman nahiko al zenieke? "
+msgstr ""
msgctxt "MainWindow"
msgid ""
"Vidalia detected that the Tor software exited unexpectedly.\n"
"\n"
"Please check the message log for recent warning or error messages."
-msgstr "Vidaliak Tor softwarea ustekabean irten dela detektatu du.\n\nMesedez begiratu mezu erregistroan azkeneko ohar edo akats mezuak."
+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 ""
+
+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 "Huts Filtroa ezartzerakoan"
+msgstr ""
msgctxt "MessageLog"
msgid "Vidalia was unable to register for Tor's log events."
-msgstr "Vidaliak ezin izan ditu Toren saio gertaerak erregistratu."
+msgstr ""
msgctxt "MessageLog"
msgid "Error Opening Log File"
-msgstr "Huts Erregistro Fitxategia irekitzerakoan"
+msgstr ""
msgctxt "MessageLog"
msgid "Vidalia was unable to open the specified log file."
-msgstr "Vidaliak ezin izan du zehaztutako erregistro fitxategia ireki."
+msgstr ""
msgctxt "MessageLog"
msgid "Log Filename Required"
-msgstr "Erregistro Fitxategiaren izena beharrezkoa"
+msgstr ""
msgctxt "MessageLog"
msgid "You must enter a filename to be able to save log messages to a file."
-msgstr "Fitxategi izen bat idatzi behar duzu erregistro mezuak fitxategi batean gordetzeko."
+msgstr ""
msgctxt "MessageLog"
msgid "Select Log File"
-msgstr "Aukeratu Erregistro Fitxategia"
+msgstr ""
msgctxt "MessageLog"
msgid "Save Log Messages"
-msgstr "Gorde Erregistro Mezuak"
+msgstr ""
msgctxt "MessageLog"
msgid "Text Files (*.txt)"
-msgstr "Testu Fitxategiak (*.txt)"
+msgstr ""
msgctxt "MessageLog"
msgid "Vidalia"
-msgstr "Vidalia"
+msgstr ""
msgctxt "MessageLog"
msgid "Find in Message Log"
-msgstr "Bilatu Mezu Erregistroan"
+msgstr ""
msgctxt "MessageLog"
msgid "Find:"
-msgstr "Bilatu:"
+msgstr ""
msgctxt "MessageLog"
msgid "Not Found"
-msgstr "Ez da aurkitu"
+msgstr ""
msgctxt "MessageLog"
msgid "Search found 0 matches."
-msgstr "Bilaketak 0 emaitza aurkitu ditu."
+msgstr ""
msgctxt "MessageLog"
msgid "Message Log"
-msgstr "Mezu Erregistroa"
+msgstr ""
msgctxt "MessageLog"
msgid "Message Filters..."
-msgstr "Mezu Filtroak..."
+msgstr ""
msgctxt "MessageLog"
msgid "Set message filters"
-msgstr "Mezu filtroak ezarri"
+msgstr ""
msgctxt "MessageLog"
msgid "History Size..."
-msgstr "Historiaren tamaina"
+msgstr ""
msgctxt "MessageLog"
msgid "Set maximum number of messages to display"
-msgstr "Erakutsi behar diren gehienezko mezu kopurua ezarri."
+msgstr ""
msgctxt "MessageLog"
msgid "Clear"
-msgstr "Garbitu"
+msgstr ""
msgctxt "MessageLog"
msgid "Clear all messages from the Message Log (Ctrl+E)"
-msgstr "Mezu Erregistrotik mezu guztiak garbitu (Ktrl+E)"
+msgstr ""
msgctxt "MessageLog"
msgid "Ctrl+E"
-msgstr "Ktrl+E"
+msgstr ""
msgctxt "MessageLog"
msgid "Copy"
-msgstr "Kopiatu"
+msgstr ""
msgctxt "MessageLog"
msgid "Copy the selected messages to the clipboard (Ctrl+C)"
-msgstr "Aukeratutako mezuak arbelean kopiatu (Ktrl+C)"
+msgstr ""
msgctxt "MessageLog"
msgid "Ctrl+C"
-msgstr "Ktrl+C"
+msgstr ""
msgctxt "MessageLog"
msgid "Select All"
-msgstr "Hautatu dena"
+msgstr ""
msgctxt "MessageLog"
msgid "Select all messages (Ctrl+A)"
-msgstr "Mezu guztiak hautatu (Ktrl+A)"
+msgstr ""
msgctxt "MessageLog"
msgid "Ctrl+A"
-msgstr "Ktrl+A"
+msgstr ""
msgctxt "MessageLog"
msgid "Save All"
-msgstr "Dena gorde"
+msgstr ""
msgctxt "MessageLog"
msgid "Save all messages to a file"
-msgstr "Mezu guztiak fitxategi batean gorde"
+msgstr ""
msgctxt "MessageLog"
msgid "Save Selected"
-msgstr "Aukeratutakoak grode"
+msgstr ""
msgctxt "MessageLog"
msgid "Save selected messages to a file"
-msgstr "Aukeratutako mezuak fitxategi batean gorde"
+msgstr ""
msgctxt "MessageLog"
msgid "Settings"
-msgstr "Ezarpenak"
+msgstr ""
msgctxt "MessageLog"
msgid "Adjust Message Log Settings"
-msgstr "Mezu Erregistro Ezarpenak egokitu"
+msgstr ""
msgctxt "MessageLog"
msgid "Ctrl+T"
-msgstr "Ktrl+T"
+msgstr ""
msgctxt "MessageLog"
msgid "Help"
-msgstr "Laguntza"
+msgstr ""
msgctxt "MessageLog"
msgid "Show the help browser"
-msgstr "Laguntza arakatzailea erakutsi"
+msgstr ""
msgctxt "MessageLog"
msgid "F1"
-msgstr "F1"
+msgstr ""
msgctxt "MessageLog"
msgid "Close"
-msgstr "Itxi"
+msgstr ""
msgctxt "MessageLog"
msgid "Close the Message Log"
-msgstr "Mezu Erregistroa itxi"
+msgstr ""
msgctxt "MessageLog"
msgid "Esc"
-msgstr "Esc"
+msgstr ""
msgctxt "MessageLog"
msgid "Find"
-msgstr "Bilatu"
+msgstr ""
msgctxt "MessageLog"
msgid "Find all messages containing the search text (Ctrl+F)"
-msgstr "Bilaketa testua duten mezu guztiak bilatu (Ktrl+F)"
+msgstr ""
msgctxt "MessageLog"
msgid "Ctrl+F"
-msgstr "Ktrl+F"
+msgstr ""
msgctxt "MessageLog"
msgid "Time"
-msgstr "Data"
+msgstr ""
msgctxt "MessageLog"
msgid "Type"
-msgstr "Mota"
+msgstr ""
msgctxt "MessageLog"
msgid "Message"
-msgstr "Mezua"
+msgstr ""
msgctxt "MessageLog"
msgid "Saves the current Message Log settings"
-msgstr "Uneko Mezu Erregistro ezarpenak gorde"
+msgstr ""
msgctxt "MessageLog"
msgid "Save Settings"
-msgstr "Ezarpenak gorde"
+msgstr ""
msgctxt "MessageLog"
msgid "Cancels changes made to settings"
-msgstr "Ezarpenei egindako aldaketak bertan behera uzten ditu"
+msgstr ""
msgctxt "MessageLog"
msgid "Cancel"
-msgstr "Utzi"
+msgstr ""
msgctxt "MessageLog"
msgid "Message Filter"
-msgstr "Mezu Filtroa"
+msgstr ""
msgctxt "MessageLog"
msgid "Error"
-msgstr "Akatsa"
+msgstr ""
msgctxt "MessageLog"
msgid "Warning"
-msgstr "Oharra"
+msgstr ""
msgctxt "MessageLog"
msgid "Notice"
-msgstr "Abisua"
+msgstr ""
msgctxt "MessageLog"
msgid "Info"
-msgstr "Info"
+msgstr ""
msgctxt "MessageLog"
msgid "Debug"
-msgstr "Arazi"
+msgstr ""
msgctxt "MessageLog"
msgid "Message Log History"
-msgstr "Mezu Erregistroaren historia"
+msgstr ""
msgctxt "MessageLog"
msgid "Number of messages to display in the message log window"
-msgstr "Mezu erregistroaren lehioan erakutsi behar diren mezu kopurua"
+msgstr ""
msgctxt "MessageLog"
msgid "messages"
-msgstr "mezu"
+msgstr ""
msgctxt "MessageLog"
msgid "Browse"
-msgstr "Arakatu"
+msgstr ""
msgctxt "MessageLog"
msgid "Enable automatically saving all new log messages to a file"
-msgstr "Erregistro mezu berriak fitxategi batean automatikoki gordetzea gaitu"
+msgstr ""
msgctxt "MessageLog"
msgid "Automatically save new log messages to a file"
-msgstr "Erregistro mezua berriak fitxategi batean automatikoki gorde"
-
-msgctxt "MessageLog"
-msgid "Basic"
-msgstr "Basikoa"
-
-msgctxt "MessageLog"
-msgid "Tor Status"
-msgstr "Tor Egoera"
+msgstr ""
msgctxt "MessageLog"
-msgid "Advanced"
-msgstr "Aurreratua"
+msgid "Always Save New Log Messages"
+msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
-msgstr "Beti gorde Erregistro Mezu berriak "
+msgid "toolbar"
+msgstr ""
msgctxt "MessageLog"
msgid ""
"Messages that appear when something has \n"
"gone very wrong and Tor cannot proceed."
-msgstr "Zerbait oso gaizki joan denean eta Torek \njarraitu ezin duenean agertzen diren mezuak."
+msgstr ""
msgctxt "MessageLog"
msgid ""
"Messages that only appear when \n"
"something has gone wrong with Tor."
-msgstr "Torekin zerbait gaizki joan denean \nbakarrik agertzen diren mezuak."
+msgstr ""
msgctxt "MessageLog"
msgid ""
@@ -2427,813 +2312,829 @@ msgid ""
"during normal Tor operation and are \n"
"not considered errors, but you may \n"
"care about."
-msgstr "Tor eragiketa normalaren bitartean\ngutxitan agertu eta akats bezala \nhartzen ez diren mezuak, baina\nagian arreta jartzekoak."
+msgstr ""
msgctxt "MessageLog"
msgid ""
"Messages that appear frequently \n"
"during normal Tor operation."
-msgstr "Tor eragiketa normalaren bitartean\naskotan agertzen diren mezuak."
+msgstr ""
msgctxt "MessageLog"
msgid ""
"Hyper-verbose messages primarily of \n"
"interest to Tor developers."
-msgstr "Tor garatzaileentzat gehienbat\nzuzendutako mezuak."
+msgstr ""
msgctxt "MessageLog"
msgid ""
"Cannot write file %1\n"
"\n"
"%2."
-msgstr "Ezin da fitxategia idatzi %1\n\n%2"
-
-msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr "Tor Sarearen Mapa"
+msgstr ""
msgctxt "NetViewer"
msgid "Refresh"
-msgstr "Birkargatu"
+msgstr ""
msgctxt "NetViewer"
msgid "Refresh the list of Tor relays and connections"
-msgstr "Tor errele eta konexio zerrenda birkargatu"
+msgstr ""
msgctxt "NetViewer"
msgid "Ctrl+R"
-msgstr "Ktrl+R"
+msgstr ""
msgctxt "NetViewer"
msgid "Help"
-msgstr "Laguntza"
+msgstr ""
msgctxt "NetViewer"
msgid "Show the network map help"
-msgstr "Erakutsi sarearen maparen laguntza"
+msgstr ""
msgctxt "NetViewer"
msgid "Show network map help"
-msgstr "Erakutsi sare maparen laguntza"
+msgstr ""
msgctxt "NetViewer"
msgid "F1"
-msgstr "F1"
+msgstr ""
msgctxt "NetViewer"
msgid "Close"
-msgstr "Itxi"
+msgstr ""
msgctxt "NetViewer"
msgid "Close the network map"
-msgstr "Sarearen mapa itxi"
+msgstr ""
msgctxt "NetViewer"
msgid "Esc"
-msgstr "Esc"
+msgstr ""
msgctxt "NetViewer"
msgid "Zoom In"
-msgstr "Zoom egin"
+msgstr ""
msgctxt "NetViewer"
msgid "Zoom in on the network map"
-msgstr "Zoom egin sarearen mapan"
+msgstr ""
msgctxt "NetViewer"
msgid "+"
-msgstr "+"
+msgstr ""
msgctxt "NetViewer"
msgid "Zoom Out"
-msgstr "Zooma kendu"
+msgstr ""
msgctxt "NetViewer"
msgid "Zoom out on the network map"
-msgstr "Zooma kendu sarearen mapatik"
+msgstr ""
msgctxt "NetViewer"
msgid "-"
-msgstr "-"
+msgstr ""
msgctxt "NetViewer"
msgid "Zoom To Fit"
-msgstr "Neurrira zoom egin"
+msgstr ""
msgctxt "NetViewer"
msgid "Zooms to fit all currently displayed circuits"
-msgstr "Unean erakutsitako zirkuitu guztien neurrira zoom egin"
+msgstr ""
msgctxt "NetViewer"
msgid "Ctrl+Z"
-msgstr "Ktrl+Z"
+msgstr ""
msgctxt "NetViewer"
msgid "Relay Not Found"
-msgstr "Ez da errelea aurkitu"
+msgstr ""
msgctxt "NetViewer"
msgid "No details on the selected relay are available."
-msgstr "Aukeratutako errelearen inguruan ez dago xehetasunik."
+msgstr ""
msgctxt "NetViewer"
msgid "Unknown"
-msgstr "Ezezaguna"
+msgstr ""
msgctxt "NetViewer"
msgid "Full Screen"
-msgstr "Pantaila osoa"
+msgstr ""
msgctxt "NetViewer"
msgid "View the network map as a full screen window"
-msgstr "Ikusi sarearen mapa pantaila osoko lehio bat bezala"
+msgstr ""
msgctxt "NetViewer"
msgid "Ctrl+F"
-msgstr "Ktrl+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 ""
+
+msgctxt "NetworkPage"
+msgid "The specified bridge identifier is not valid."
+msgstr ""
msgctxt "NetworkPage"
msgid "Copy (Ctrl+C)"
-msgstr "Kopiatu (Ktrl+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 "Torek proxy bat erabiliz Interneten sartzeko konfiguratu nahi baduzu edo IP helbidea edo ostalari-izena edo portu zenbakia zehaztu behar duzu."
+msgstr ""
msgctxt "NetworkPage"
msgid ""
"You must specify one or more ports to which your firewall allows you to "
"connect."
-msgstr "Zure Firewallak konektatzea baimentzen dizun portu bat edo gehiago zehaztu behar duzu."
+msgstr ""
msgctxt "NetworkPage"
msgid "'%1' is not a valid port number."
-msgstr "'%1' ez da portu zenbaki baliogarria."
+msgstr ""
msgctxt "NetworkPage"
msgid "Check if your local network requires a proxy to access the Internet"
-msgstr "Zure tokiko sareak Internetera konektatzeko proxy bat behar duen egiaztatu."
+msgstr ""
msgctxt "NetworkPage"
msgid "I use a proxy to access the Internet"
-msgstr "Proxy bat erabiltzen dut Internetera sartzeko."
+msgstr ""
msgctxt "NetworkPage"
msgid "Proxy Settings"
-msgstr "Proxy Ezarpenak"
+msgstr ""
msgctxt "NetworkPage"
msgid "Username:"
-msgstr "Erabiltzaile izena:"
+msgstr ""
msgctxt "NetworkPage"
msgid "Password:"
-msgstr "Pasahitza:"
+msgstr ""
msgctxt "NetworkPage"
msgid "Port:"
-msgstr "Portua:"
+msgstr ""
msgctxt "NetworkPage"
msgid "Check to only connect to relays using ports allowed by your firewall"
-msgstr "Bakarrik zure Firewallak onartutako portuak erabiliz erreleetara konektatzeko gaitu"
+msgstr ""
msgctxt "NetworkPage"
msgid "My firewall only lets me connect to certain ports"
-msgstr "Nire Firewallak bakarrik portu zehatz batzuetara konektatzea baimentzet dit"
+msgstr ""
msgctxt "NetworkPage"
msgid "Firewall Settings"
-msgstr "Firewall Ezarpenak"
+msgstr ""
msgctxt "NetworkPage"
msgid "Allowed Ports:"
-msgstr "Baimendutako Portuak:"
+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 "Direktorio eskaerak enkriptatzeko eta, aukeran, Tor sarera sartzeko zubi erreleak erabiltzeko gaitu"
+msgstr ""
msgctxt "NetworkPage"
msgid "My ISP blocks connections to the Tor network"
-msgstr "Nire Internet Zerbitzu Hornitzaileak (ISP ingeleraz) Tor sarera konektatzea blokeatzen dit"
+msgstr ""
msgctxt "NetworkPage"
msgid "Bridge Settings"
-msgstr "Zubi Ezarpenak"
+msgstr ""
msgctxt "NetworkPage"
msgid "Add a Bridge:"
-msgstr "Zubi bat gehitu:"
+msgstr ""
msgctxt "NetworkPage"
msgid "Remove the selected bridges from the list"
-msgstr "Aukeratutako zubiak zerrendatik kendu"
+msgstr ""
msgctxt "NetworkPage"
msgid "Copy the selected bridges to the clipboard"
-msgstr "Aukeratutako zubiak arbelera kopiatu"
+msgstr ""
msgctxt "NetworkPage"
msgid "Find Bridges Now"
-msgstr "Zubiak bilatu orain"
+msgstr ""
msgctxt "NetworkPage"
msgid "<a href=\"bridges.finding\">How else can I find bridges?</a>"
-msgstr "<a href=\"bridges.finding\">Zein beste modutan aurki ditzaket zubiak?</a>"
+msgstr ""
msgctxt "NetworkPage"
msgid "<a href=\"bridges.finding\">How can I find bridges?</a>"
-msgstr "<a href=\"bridges.finding\">Nola aurki ditzaket zubiak?</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 "Ez dago orain zubi eskuragarririk. Momentu bat itxaron dezakezu eta berriz saiatu, edo zubi berriak aurkitzeko beste era bat saiatu."
+msgstr ""
msgctxt "NetworkPage"
msgid "Click Help to see other methods of finding new bridges."
-msgstr "Sakatu Laguntza zubi berriak aurkitzeko metodo berriak ikusteko."
+msgstr ""
msgctxt "NetworkPage"
msgid "Address:"
-msgstr "Helbidea:"
+msgstr ""
msgctxt "NetworkPage"
msgid "Type:"
-msgstr "Mota:"
+msgstr ""
msgctxt "NetworkPage"
msgid "You must select the proxy type."
-msgstr "Proxy mota hautatu behar duzu."
+msgstr ""
msgctxt "NetworkPage"
msgid "SOCKS 4"
-msgstr "SOCKS 4"
+msgstr ""
msgctxt "NetworkPage"
msgid "SOCKS 5"
-msgstr "SOCKS 5"
+msgstr ""
msgctxt "NetworkPage"
-msgid "HTTP / HTTPS"
-msgstr "HTTP / HTTPS"
+msgid "HTTP"
+msgstr ""
msgctxt "NetworkPage"
-msgid "You must specify one or more bridges."
-msgstr "Zubi bat edo gehiago zehaztu behar duzu."
+msgid "HTTP / HTTPS"
+msgstr ""
msgctxt "Policy"
msgid "accept"
-msgstr "onartu"
+msgstr ""
msgctxt "Policy"
msgid "reject"
-msgstr "ezetsi"
+msgstr ""
msgctxt "RouterDescriptor"
msgid "Online"
-msgstr "Online"
+msgstr ""
msgctxt "RouterDescriptor"
msgid "Hibernating"
-msgstr "Hibernatzen"
+msgstr ""
msgctxt "RouterDescriptor"
msgid "Offline"
-msgstr "Lineaz kanpo"
+msgstr ""
msgctxt "RouterDescriptorView"
msgid "Location:"
-msgstr "Kokalekua:"
+msgstr ""
msgctxt "RouterDescriptorView"
msgid "IP Address:"
-msgstr "IP Helbidea:"
+msgstr ""
msgctxt "RouterDescriptorView"
msgid "Platform:"
-msgstr "Plataforma:"
+msgstr ""
msgctxt "RouterDescriptorView"
msgid "Bandwidth:"
-msgstr "Banda-zabalera:"
+msgstr ""
msgctxt "RouterDescriptorView"
msgid "Uptime:"
-msgstr "Jarduera denbora"
+msgstr ""
msgctxt "RouterDescriptorView"
msgid "Last Updated:"
-msgstr "Azken eguneratzea:"
+msgstr ""
msgctxt "RouterDescriptorView"
msgid "Copy"
-msgstr "Kopiatu"
+msgstr ""
msgctxt "RouterInfoDialog"
msgid "Hibernating"
-msgstr "Hibernatzen"
+msgstr ""
msgctxt "RouterInfoDialog"
msgid "Online"
-msgstr "Online"
+msgstr ""
msgctxt "RouterInfoDialog"
msgid "Offline"
-msgstr "Lineaz kanpo"
+msgstr ""
msgctxt "RouterInfoDialog"
msgid "Unknown"
-msgstr "Ezezaguna"
+msgstr ""
msgctxt "RouterInfoDialog"
msgid "Relay Details"
-msgstr "Errele xehetasunak"
+msgstr ""
msgctxt "RouterInfoDialog"
msgid "Summary"
-msgstr "Laburpena"
+msgstr ""
msgctxt "RouterInfoDialog"
msgid "Name:"
-msgstr "Izena:"
+msgstr ""
msgctxt "RouterInfoDialog"
msgid "Status:"
-msgstr "Egoera:"
+msgstr ""
msgctxt "RouterInfoDialog"
msgid "Location:"
-msgstr "Kokalekua:"
+msgstr ""
msgctxt "RouterInfoDialog"
msgid "IP Address:"
-msgstr "IP helbidea:"
+msgstr ""
msgctxt "RouterInfoDialog"
msgid "Platform:"
-msgstr "Plataforma:"
+msgstr ""
msgctxt "RouterInfoDialog"
msgid "Bandwidth:"
-msgstr "Banda-zabalera:"
+msgstr ""
msgctxt "RouterInfoDialog"
msgid "Uptime:"
-msgstr "Jarduera denbora"
+msgstr ""
msgctxt "RouterInfoDialog"
msgid "Contact:"
-msgstr "Harremanetarako:"
+msgstr ""
msgctxt "RouterInfoDialog"
msgid "Last Updated:"
-msgstr "Azken eguneratzea:"
+msgstr ""
msgctxt "RouterInfoDialog"
msgid "Descriptor"
-msgstr "Deskriptorea"
+msgstr ""
msgctxt "RouterListItem"
msgid "Offline"
-msgstr "Lineaz kanpo"
+msgstr ""
msgctxt "RouterListItem"
msgid "Hibernating"
-msgstr "Hibernatzen"
+msgstr ""
msgctxt "RouterListItem"
msgid "%1 KB/s"
-msgstr "%1 KB/s"
+msgstr ""
msgctxt "RouterListWidget"
msgid "Relay"
-msgstr "Errelea"
+msgstr ""
msgctxt "RouterListWidget"
msgid "Zoom to Relay"
-msgstr "Errelera zoom egin"
+msgstr ""
msgctxt "RouterListWidget"
msgid "%1 relays online"
-msgstr "%1 errele online"
+msgstr ""
msgctxt "RouterListWidget"
msgid "Copy"
-msgstr "Kopiatu"
+msgstr ""
msgctxt "RouterListWidget"
msgid "Nickname"
-msgstr "Ezizena"
+msgstr ""
msgctxt "RouterListWidget"
msgid "Fingerprint"
-msgstr "Hatz-marka"
+msgstr ""
msgctxt "ServerPage"
msgid "Bridge Support Unavailable"
-msgstr "Zubi euskarria ez dago erabilgarri"
+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 "Tor erabiltzaile zentsuratuentzako zubi errele gisa konfiguratu duzu, baina zure Tor bertsioak ez ditu zubiak onartzen."
+msgstr ""
msgctxt "ServerPage"
msgid ""
"Please upgrade your Tor software or configure Tor to act as a normal Tor "
"relay."
-msgstr "Mesedez eguneratu zure Tor softwarea edo Tor konfiguratu Tor errele arrunt bat bezala jardun dadin."
+msgstr ""
msgctxt "ServerPage"
msgid "Your bridge relay is not running."
-msgstr "Zure zubi errelea ez dabil exekutatzen ari."
+msgstr ""
msgctxt "ServerPage"
msgid "You must specify at least a relay nickname and port."
-msgstr "Gutxienez errele ezizen eta portua zehaztu behar dituzu."
+msgstr ""
msgctxt "ServerPage"
msgid "Run as a client only"
-msgstr "Bezero bezala exekutatu"
+msgstr ""
msgctxt "ServerPage"
msgid "Relay Port:"
-msgstr "Errele Portua:"
+msgstr ""
msgctxt "ServerPage"
msgid "Enable to mirror the relay directory"
-msgstr "Gaitu errele direktorioa ispilatzeko"
+msgstr ""
msgctxt "ServerPage"
msgid "Attempt to automatically configure port forwarding"
-msgstr "Saiatu portu jarraipena automatikoki konfiguratzen"
+msgstr ""
msgctxt "ServerPage"
msgid "Test"
-msgstr "Test"
+msgstr ""
msgctxt "ServerPage"
msgid "Show help topic on port forwarding"
-msgstr "Erakutsi laguntza gaiak portu jarraipenean"
+msgstr ""
msgctxt "ServerPage"
msgid "Directory Port:"
-msgstr "Portu Direktorioa:"
+msgstr ""
msgctxt "ServerPage"
msgid "Directory Port Number"
-msgstr "Portu Direktorio zenbakia"
+msgstr ""
msgctxt "ServerPage"
msgid "Contact Info:"
-msgstr "Harremanetarako:"
+msgstr ""
msgctxt "ServerPage"
msgid "Name of your relay"
-msgstr "Izena eman zure erreleari"
+msgstr ""
msgctxt "ServerPage"
msgid "Port on which users and other relays can communicate with your relay"
-msgstr "Erabiltzaile eta beste erreleak zure errelearekin komunikatzeko portua"
+msgstr ""
msgctxt "ServerPage"
msgid "Nickname:"
-msgstr "Ezizena:"
+msgstr ""
msgctxt "ServerPage"
msgid "Basic Settings"
-msgstr "Oinarrizko Ezarpenak"
+msgstr ""
msgctxt "ServerPage"
msgid ""
"For Internet connections with fast download speed but slow upload, please "
"list your upload speed here."
-msgstr "Deskarga abiadura bizkorra baina igoera motela duten Internet konexioentzako, mesedez zerrendatu zure igoera abiadura hemen."
+msgstr ""
msgctxt "ServerPage"
msgid "Cable/DSL 256 Kbps"
-msgstr "Kable/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 "Pertsonalizatua"
+msgstr ""
msgctxt "ServerPage"
msgid "Select the entry that most closely resembles your Internet connection"
-msgstr "Hautatu zure Internet konexioarekin antza handien duen aukera"
+msgstr ""
msgctxt "ServerPage"
msgid "Show help topic on bandwidth rate limits"
-msgstr "Erakutsi laguntza gaiak banda-zabalera tasa mugetan"
+msgstr ""
msgctxt "ServerPage"
msgid "Average Rate"
-msgstr "Batez besteko tasa"
+msgstr ""
msgctxt "ServerPage"
msgid "Long-term average bandwidth limit"
-msgstr "Epe luzeko batez besteko banda-zabaleraren muga"
+msgstr ""
msgctxt "ServerPage"
msgid "KB/s"
-msgstr "KB/s"
+msgstr ""
msgctxt "ServerPage"
msgid "Maximum Rate"
-msgstr "Gehienezko Tasa"
+msgstr ""
msgctxt "ServerPage"
msgid "Peak bandwidth rate limit"
-msgstr "Banda-zabalera tasa mugaren gailurra"
+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 "Zure gehienezko banda-zabalera muga zure batez besteko banda-zabalera mugaren berdina edo handiago izan behar du. Bi balioak gutxienez 20 KB/s-koak izan behar dira."
+msgstr ""
msgctxt "ServerPage"
msgid "Bandwidth Limits"
-msgstr "Banda-zabaleraren mugak"
+msgstr ""
msgctxt "ServerPage"
msgid "Ports 6660 - 6669 and 6697"
-msgstr "6660 - 6669 eta 6697 portuak"
+msgstr ""
msgctxt "ServerPage"
msgid "Internet Relay Chat (IRC)"
-msgstr "Internet Errele Txata (IRC ingeleraz)"
+msgstr ""
msgctxt "ServerPage"
msgid "Ports 110, 143, 993 and 995"
-msgstr "110, 143, 993 eta 995 portuak"
+msgstr ""
msgctxt "ServerPage"
msgid "Retrieve Mail (POP, IMAP)"
-msgstr "Posta eskuratu (POP, IMAP)"
+msgstr ""
msgctxt "ServerPage"
msgid "Ports unspecified by other checkboxes"
-msgstr "Beste egiaztatze-kutxak zehaztugabeko portuak"
+msgstr ""
msgctxt "ServerPage"
msgid "Misc Other Services"
-msgstr "Beste Zerbitzuak"
+msgstr ""
msgctxt "ServerPage"
msgid "Ports 706, 1863, 5050, 5190, 5222, 5223, 8300 and 8888"
-msgstr "706, 1863, 5050, 5190, 5222, 5223, 8300 eta 8888 portuak"
+msgstr ""
msgctxt "ServerPage"
msgid "Instant Messaging (IM)"
-msgstr "Berehalako Mezularitza (IM ingeleraz)"
+msgstr ""
msgctxt "ServerPage"
msgid "Port 443"
-msgstr "443 portua"
+msgstr ""
msgctxt "ServerPage"
msgid "Secure Websites (SSL)"
-msgstr "Webgune seguruak (SSL ingeleraz)"
+msgstr ""
msgctxt "ServerPage"
msgid "Port 80"
-msgstr "80 portua"
+msgstr ""
msgctxt "ServerPage"
msgid "Websites"
-msgstr "Webguneak"
+msgstr ""
msgctxt "ServerPage"
msgid "Show help topic on exit policies"
-msgstr "Erakutsi laguntza gaiak irteera politiken inguruan"
+msgstr ""
msgctxt "ServerPage"
msgid ""
"What Internet resources should users be able to access from your relay?"
-msgstr "Erabiltzaileek Interneteko zein baliabideetara sartu ahal izango dute zure erreletik?"
+msgstr ""
msgctxt "ServerPage"
msgid ""
"Tor will still block some outgoing mail and file sharing applications by "
"default to reduce spam and other abuse."
-msgstr "Torek oraindik mezu irteera eta fitxategi elkarbanatze aplikazio batzuk blokeatuko ditu spama eta beste gehiegikeri batzuk murrizteko."
+msgstr ""
msgctxt "ServerPage"
msgid "Exit Policies"
-msgstr "Irteera Politikak"
+msgstr ""
msgctxt "ServerPage"
msgid "Let others access your bridge by giving them this line:"
-msgstr "Baimendu besteei zure zubira sartzen lerro hau emanez:"
+msgstr ""
msgctxt "ServerPage"
msgid ""
"This is the identity of your bridge relay that you can give to other people"
-msgstr "Hau da jendeari eman diezaiokezun zure zubi errelearen identifikazioa"
+msgstr ""
msgctxt "ServerPage"
msgid "Copy your bridge relay's identity to the clipboard"
-msgstr "Kopiatu zure zubi errelearen identifikazioa arbelera"
+msgstr ""
msgctxt "ServerPage"
msgid "No Recent Usage"
-msgstr "Ez da azken aldian erabili"
+msgstr ""
msgctxt "ServerPage"
msgid "No clients have used your relay recently."
-msgstr "Zure errelea ez du bezerorik erabili azken aldian"
+msgstr ""
msgctxt "ServerPage"
msgid ""
"Leave your relay running so clients have a better chance of finding and "
"using it."
-msgstr "Utzi zure errelea exekutatzen bezeroek errazago aurkitu eta erabil dezaten."
+msgstr ""
msgctxt "ServerPage"
msgid "Bridge History"
-msgstr "Zubi historia"
+msgstr ""
msgctxt "ServerPage"
msgid "Vidalia was unable to retrieve your bridge's usage history."
-msgstr "Vidaliak ezin izan du zure zubien erabilera historia eskuratu."
+msgstr ""
msgctxt "ServerPage"
msgid ""
"Tor returned an improperly formatted response when Vidalia requested your "
"bridge's usage history."
-msgstr "Torek gaizki formateatutako erantzuna itzuli du Vidaliak zure zubien erabilera historia eskatu duenean."
+msgstr ""
msgctxt "ServerPage"
msgid "The returned response was: %1"
-msgstr "Itzulitako erantzuna hau da: %1"
+msgstr ""
msgctxt "ServerPage"
msgid "Help censored users reach the Tor network"
-msgstr "Lagundu zentsuratutako erabiltzaileak Tor sarera heltzen"
+msgstr ""
msgctxt "ServerPage"
msgid "<a href=\"#bridgeUsage\">Who has used my bridge?</a>"
-msgstr "<a href=\"#bridgeUsage\">Nork erabili du nire zubia?</a>"
+msgstr ""
msgctxt "ServerPage"
msgid "<a href=\"#bridgeHelp\">What's this?</a>"
-msgstr "<a href=\"#bridgeHelp\">Zer da hau?</a>"
+msgstr ""
msgctxt "ServerPage"
msgid "Automatically distribute my bridge address"
-msgstr "Nire zubi helbidea automatikoki banatu"
+msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network (exit relay)"
-msgstr "Tor sarearentzako trafikoa erreleatu (irteera errelea)"
+msgid "Relay traffic inside the Tor network (non-exit relay)"
+msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic inside the Tor network (non-exit relay)"
-msgstr "Tor sarearen barruan trafikoa erreleatu (ez-irteera errelea)"
+msgid "Relay traffic for the Tor network (exit relay)"
+msgstr ""
msgctxt "ServerPage"
msgid "Mirror the Relay Directory"
-msgstr "Errele Direktorioa ispilatu"
+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 "Zure errelearekin arazoren bat badago baliteke email bat helbide honetara iristea. Agian zure PGP edo GPG hatz-markak gehitu nahiko zenituzke ere."
+msgstr ""
msgctxt "ServicePage"
msgid "Error while trying to unpublish all services"
-msgstr "Huts zerbitzuak desargitaratzerakoan"
+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 "Mesedez konfigura ezazu gutxienez zerbitzu direktorio bat eta portu birtual bat gorde nahi duzun zerbitzu bakoitzerako. Kendu besteak."
+msgstr ""
msgctxt "ServicePage"
msgid "Error"
-msgstr "Akatsa"
+msgstr ""
msgctxt "ServicePage"
msgid "Please select a Service."
-msgstr "Mesedez Zerbitzu bat aukera ezazu."
+msgstr ""
msgctxt "ServicePage"
msgid "Select Service Directory"
-msgstr "Aukeratu Zerbitzu Direktorioa"
+msgstr ""
msgctxt "ServicePage"
msgid "Virtual Port may only contain valid port numbers [1..65535]."
-msgstr "Portu Birtualak bakarrik portu zenbaki baliogarriak izan ditzake [1..65535]."
+msgstr ""
msgctxt "ServicePage"
msgid "Target may only contain address:port, address, or port."
-msgstr "Helburuak bakarrik helbideak eduki ditzake:portua, helbidea, edo portua."
+msgstr ""
msgctxt "ServicePage"
msgid "Directory already in use by another service."
-msgstr "Beste zerbitzuren batek direktorioa erabiltzen ari da jadanik."
-
-msgctxt "ServicePage"
-msgid "Form"
-msgstr "Inprimaki"
+msgstr ""
msgctxt "ServicePage"
msgid "Provided Hidden Services"
-msgstr "Emandako Ezkutuko Zerbitzuak"
+msgstr ""
msgctxt "ServicePage"
msgid "Onion Address"
-msgstr "Tipula Helbidea"
+msgstr ""
msgctxt "ServicePage"
msgid "Virtual Port"
-msgstr "Portu Birtuala"
+msgstr ""
msgctxt "ServicePage"
msgid "Target"
-msgstr "Helburua"
+msgstr ""
msgctxt "ServicePage"
msgid "Directory Path"
-msgstr "Direktorioaren Bidea"
+msgstr ""
msgctxt "ServicePage"
msgid "Enabled"
-msgstr "Gaitua"
+msgstr ""
msgctxt "ServicePage"
msgid "Add new service to list"
-msgstr "Zerrendara zerbitzu berri bat gehitu"
+msgstr ""
msgctxt "ServicePage"
msgid "Remove selected service from list"
-msgstr "Aukeratutako zerbitzua zerrendatik kendu"
+msgstr ""
msgctxt "ServicePage"
msgid "Copy onion address of selected service to clipboard"
-msgstr "Kopiatu aukeratutako zerbitzuaren tipula helbidea arbelera"
+msgstr ""
msgctxt "ServicePage"
msgid "Browse in local file system and choose directory for selected service"
-msgstr "Arakatu fitxategi sistema lokalean eta hautatu direktorio bat aukeratutako zerbitzuarentzat"
+msgstr ""
msgctxt "ServicePage"
msgid "Created by Tor"
-msgstr "Torek sortua"
+msgstr ""
msgctxt "StatusEventWidget"
msgid "Copy to Clipboard"
-msgstr "Arbelera kopiatu"
+msgstr ""
msgctxt "StatusEventWidget"
msgid "The Tor Software is Running"
-msgstr "Tor Softwarea Exekutatzen ari da"
+msgstr ""
msgctxt "StatusEventWidget"
msgid "You are currently running version \"%1\" of the Tor software."
-msgstr "Orain Tor softwarearen \"%1\" bertsioa exekutatzen zabiltza."
+msgstr ""
msgctxt "StatusEventWidget"
msgid "The Tor Software is not Running"
-msgstr "Tor Softwarea es dabil Exekutatzen ari"
+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 "Sakatu \"Tor hasi\" Vidalia Kontrol-panelan Tor softwarea berrabiarazteko. Tor ustekabean irten bada, aukeratu \"Aurreratua\" fitxa goikaldean gertatu izan daitekeen arazoen inguruko infomazioa lortzeko."
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
@@ -3241,7 +3142,7 @@ msgid ""
"longer recommended. Please upgrade to the most recent version of the "
"software, which may contain important security, reliability and performance "
"fixes."
-msgstr "Orain Tor softwarearen \"%1\" bertsioa erabiltzen ari zara, gehiago gomendatzen ez dena. Mesedez eguneratu softwarearen bertsio gaurkotuenera, segurtasun, fidagarritasun eta errendimendu konponketa garrantzitsuak ekar ditzakeena."
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
@@ -3249,31 +3150,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 "Orain Tor softwarearen \"%1\" bertsioa erabiltzen ari zara, agian uneko Tor sarearekin gehiago funtzionatuko ez duena. Mesedez eguneratu softwarearen bertsio gaurkotuenera, segurtasun, fidagarritasun eta errendimendu konponketa garrantzitsuak ekar ditzakeena."
+msgstr ""
msgctxt "StatusEventWidget"
msgid "Your Tor Software is Out-of-date"
-msgstr "Zure Tor softwarea zaharkituta dago"
+msgstr ""
msgctxt "StatusEventWidget"
msgid "Connected to the Tor Network"
-msgstr "Tor sarera konektatuta"
+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 sarearekin konexio bat ezartzea arrakastaz lortu dugu. Orain zure aplikazioak konfigura ditzakezu Internet anonimoki erabiltzeko."
+msgstr ""
msgctxt "StatusEventWidget"
msgid "Tor Software Error"
-msgstr "Tor Softwarearen akatsa"
+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 softwareak barne akats bat aurkitu du. Mesedez bidali hurrengo akats mezua Tor garatzaileei bugs.torproject.org helbidera: \"%1\""
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
@@ -3281,7 +3182,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 "Torek zure ordenagailuaren erlojua\"%2\" jatorriarekiko %1 segundu atzeratuta egon daitekeela zehaztu du. Zure erlojua zuzen ez badago, Torek ezingo du funtzionatu. Mesedez egiaztatu zure ordenagailuak ordu zuzena erakusten duela."
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
@@ -3289,11 +3190,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 "Torek zure ordenagailuaren erlojua\"%2\" jatorriarekiko %1 segundu aurreratuta egon daitekeela zehaztu du. Zure erlojua zuzen ez badago, Torek ezingo du funtzionatu. Mesedez egiaztatu zure ordenagailuak ordu zuzena erakusten duela."
+msgstr ""
msgctxt "StatusEventWidget"
msgid "Your Computer's Clock is Potentially Incorrect"
-msgstr "Zure ordenagailuaren erlojua oker egon daiteke agian arrisku handia sortuz"
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
@@ -3301,18 +3202,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 "Baliteke zure ordenagailuko aplikazioren bat Tor bidez enkriptatu gabeko konexio bat egiten saiatu izana %1 portura. Tor sarean zehar enkriptatu gabeko informazioa bidaltzea arriskutsua da eta ez da gomendagarria. Zure babeserako, Torek automatikoki konexio hau itxi du."
+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 "Baliteke zure ordenagailuko aplikazioren bat Tor bidez enkriptatu gabeko konexio bat egiten saiatu izana %1 portura. Tor sarean zehar enkriptatu gabeko informazioa bidaltzea arriskutsua da eta ez da gomendagarria."
+msgstr ""
msgctxt "StatusEventWidget"
msgid "Potentially Dangerous Connection!"
-msgstr "Arrisku handia izan dezakeen konexioa!"
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
@@ -3320,81 +3221,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 "Zure aplikazioren bat konexio bat ezarri dut Tor sarearen bitartez \"%1\"ra zure kokapenari buruzko informazioa arriskuan jar dezakeen protokolo bat erabiliz. Mesedez ziurtatu zure aplikazioak bakarrik SOCKS4a edo SOCKS5 urruneko ostalari-izen bereizmenarekin erabiltzeko konfiguratuta daudela."
+msgstr ""
msgctxt "StatusEventWidget"
msgid "Unknown SOCKS Protocol"
-msgstr "SOCKS protokolo ezezaguna"
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
"One of your applications tried to establish a connection through Tor using a"
" protocol that Tor does not understand. Please ensure you configure your "
"applications to use only SOCKS4a or SOCKS5 with remote hostname resolution."
-msgstr "Zure aplikazioren bat Tor bidezko konexio bat ezartzen saiatu da Torek ulertzen ez duen protokolobaten bitartez. Mesedez ziurtatu zure aplikazioak bakarrik SOCKS4a edo SOCKS5 urruneko ostalari-izen bereizmenarekin erabiltzeko konfiguratuta daudela."
+msgstr ""
msgctxt "StatusEventWidget"
msgid "Invalid Destination Hostname"
-msgstr "Ostalari-izen helmuga baliogabea"
+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 "Zure aplikazioren bat Tor bidezko konexio bat ezartzen saiatu da \"%1\"ra, baina Torek ez du ostalari-izen baliogarri bezala igartzen. Mesedez egiaztatu zure aplikazioen konfigurazioa."
+msgstr ""
msgctxt "StatusEventWidget"
msgid "External IP Address Changed"
-msgstr "Kanpo IP Helbidea aldatua"
+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 "Torek zure errelearen IP helbide publikoa orain %1%2 dela zehaztu du. Horrela ez bada, mesedez kontuan hartu 'Helbidea' aukera ezartzen zure errele konfigurazioan."
+msgstr ""
msgctxt "StatusEventWidget"
msgid "DNS Hijacking Detected"
-msgstr "DNS bahiketa detektatua"
+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 "Torek zure DNS hornitzaileak existitzen ez diren domeinuetara erantzun faltsuak eskaintzen ari dela detektatu du. ISP eta beste DNS hornitzaile batzuk, OpenDNS bezala, hau egiteagatik ezagunak dira euren bilaketa eta publizitatea erakusteko."
+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 "Torek zure DNS hornitzaileak oso ezagunak diren domeinuetara erantzun faltsuak eskaintzen ari dela detektatu du. Bezeroak DNS erantzun zehatzak eskuratzeko Tor sarearen erreletaz fidatzen direnez, zure errelea ez da irteera errele bezala konfiguratuko."
+msgstr ""
msgctxt "StatusEventWidget"
msgid "Checking Server Port Reachability"
-msgstr "Zerbitzari Portu Iritsgarritasuna egiaztatzen"
+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 "Torek zure errelearen zerbitzari portua Tor saretik bere burura %1:%2 en konektatzen iritsgarria den hala ez egiaztatzen saiatzen ari da. Froga honek minutu asko iraun dezake."
+msgstr ""
msgctxt "StatusEventWidget"
msgid "Server Port Reachability Test Successful!"
-msgstr "Zerbitzari Portu Iritsgarritasun froga arrakastatsua!"
+msgstr ""
msgctxt "StatusEventWidget"
msgid "Your relay's server port is reachable from the Tor network!"
-msgstr "Zure errelearen zerbitzari portua Tor saretik iritsgarria da!"
+msgstr ""
msgctxt "StatusEventWidget"
msgid "Server Port Reachability Test Failed"
-msgstr "Zerbitzari Portu Iritsgarritasun frogak huts egin du"
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
@@ -3402,30 +3303,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 "Zure errele zerbitzaria ez dago beste Tor bezeroentzako iritsgarri. Hau portu jarraipena konfiguratzea behar duen router edo firewall baten atzean bazaude gerta daiteke. %1:%2 zure benetazko IP helbidea eta zerbitzari portua ez badira, mesedez egiaztatu zure errelearen konfigurazioa."
+msgstr ""
msgctxt "StatusEventWidget"
msgid "Checking Directory Port Reachability"
-msgstr "Direktorio Portu Iritsgarritasuna egiaztatzen"
+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 "Torek zure errelearen direktorio portua Tor saretik bere burura %1:%2 en konektatzen iritsgarria den hala ez egiaztatzen saiatzen ari da. Froga honek minutu asko iraun dezake."
+msgstr ""
msgctxt "StatusEventWidget"
msgid "Directory Port Reachability Test Successful!"
-msgstr "Direktorio Portu Iritsgarritasun froga arrakastatsua!"
+msgstr ""
msgctxt "StatusEventWidget"
msgid "Your relay's directory port is reachable from the Tor network!"
-msgstr "Zure errelearen direktorio portua Tor saretik iritsgarria da!"
+msgstr ""
msgctxt "StatusEventWidget"
msgid "Directory Port Reachability Test Failed"
-msgstr "Direktorio Portu Iritsgarritasun frogak huts egin du"
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
@@ -3433,21 +3334,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 "Zure errele direktorioa ez dago beste Tor bezeroentzako iritsgarri. Hau portu jarraipena konfiguratzea behar duen router edo firewall baten atzean bazaude gerta daiteke. %1:%2 zure benetazko IP helbidea eta direktorio portua ez badira, mesedez egiaztatu zure errelearen konfigurazioa."
+msgstr ""
msgctxt "StatusEventWidget"
msgid "Relay Descriptor Rejected"
-msgstr "Errele Deskriptorea baztertua"
+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 "Zure errele deskriptorea, bezeroak zure errelera konektatzea baimentzen duena, direktorio zerbitzariak baztertu du hemen %1:%2. Emandako arrazoia hau izan da: %3"
+msgstr ""
msgctxt "StatusEventWidget"
msgid "Your Relay is Online"
-msgstr "Zure Errelea Online dago"
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
@@ -3455,393 +3356,443 @@ 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 "Zure errelea orain online dago eta Tor bezeroek erabil dezaten prest. Orduak aurrera joan ahala sare trafikoak gora egiten duela ikusi beharko zenuke Banda-zabalera Grafikoan bezero gehiagok zure erreleari buruz ikasten duten einean. Eskerrik asko Tor sareari laguntza emateagatik!"
+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 "Berria"
+msgstr ""
msgctxt "Stream"
msgid "Resolving"
-msgstr "Konpontzen"
+msgstr ""
msgctxt "Stream"
msgid "Connecting"
-msgstr "Konektatzen"
+msgstr ""
msgctxt "Stream"
msgid "Open"
-msgstr "Ireki"
+msgstr ""
msgctxt "Stream"
msgid "Failed"
-msgstr "Huts egin du"
+msgstr ""
msgctxt "Stream"
msgid "Closed"
-msgstr "Itxita"
+msgstr ""
msgctxt "Stream"
msgid "Retrying"
-msgstr "Berriz saiatzen"
+msgstr ""
msgctxt "Stream"
msgid "Remapped"
-msgstr "Berriz mapeatuta"
+msgstr ""
msgctxt "Stream"
msgid "Unknown"
-msgstr "Ezezaguna"
+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 prozesuak huts egin du gelditzerakoan. [%2]"
+msgstr ""
msgctxt "TorService"
msgid "The Tor service is not installed."
-msgstr "Tor zerbitzua ez dago instalatuta."
+msgstr ""
msgctxt "TorService"
msgid "Unable to start the Tor service."
-msgstr "Ezin izan da Tor zerbitzua hasi"
+msgstr ""
msgctxt "TorSettings"
msgid "Failed to hash the control password."
-msgstr "Huts kontrol pasahitza egiaztatzerakoan"
+msgstr ""
msgctxt "TorrcDialog"
msgid "Editing torrc"
-msgstr "torrc editatzen"
+msgstr ""
msgctxt "TorrcDialog"
msgid ""
"Save settings. If unchecked it will only apply settings to the current Tor "
"instance."
-msgstr "Ezarpenak gorde. Ezgaituta badago oraingo Tor instantziari bakarrik aplikatuko zaizkio ezarpenak."
+msgstr ""
msgctxt "TorrcDialog"
msgid "Cut"
-msgstr "Ebaki"
+msgstr ""
msgctxt "TorrcDialog"
msgid "Copy"
-msgstr "Kopiatu"
+msgstr ""
msgctxt "TorrcDialog"
msgid "Paste"
-msgstr "Itsatsi"
+msgstr ""
msgctxt "TorrcDialog"
msgid "Undo"
-msgstr "Desegin"
+msgstr ""
msgctxt "TorrcDialog"
msgid "Redo"
-msgstr "Berregin"
+msgstr ""
msgctxt "TorrcDialog"
msgid "Select All"
-msgstr "Hautatu dena"
+msgstr ""
msgctxt "TorrcDialog"
msgid "Apply all"
-msgstr "Aplikatu dena"
+msgstr ""
msgctxt "TorrcDialog"
msgid "Apply selection only"
-msgstr "Aukeratutakoa bakarrik aplikatu"
+msgstr ""
msgctxt "TorrcDialog"
msgid "Error connecting to Tor"
-msgstr "Huts Torera konektatzen"
+msgstr ""
msgctxt "TorrcDialog"
msgid "Selection is empty. Please select some text, or check \"Apply all\""
-msgstr "Ez da ezer hautatu. Mesedez hautatu testu zati bat, edo gaitu \"Aplikatu dena\""
+msgstr ""
msgctxt "TorrcDialog"
msgid "Error at line %1: \"%2\""
-msgstr "Huts %1 lerroan: \"%2\""
+msgstr ""
msgctxt "TorrcDialog"
msgid "Error"
-msgstr "Akatsa"
+msgstr ""
msgctxt "TorrcDialog"
msgid "An error ocurred while opening torrc file"
-msgstr "Akats bat gertatu da torrc fitxategia irekitzerakoan"
+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 "Arrakasta"
+msgstr ""
msgctxt "UPNPControl"
msgid "No UPnP-enabled devices found"
-msgstr "Ez dira UPnP-gaituriko gailuak aurkitu"
+msgstr ""
msgctxt "UPNPControl"
msgid "No valid UPnP-enabled Internet gateway devices found"
-msgstr "Ez dira UPnP-gaituriko Internet atebide baliogarririk aurkitu"
+msgstr ""
msgctxt "UPNPControl"
msgid "WSAStartup failed"
-msgstr "WASAStartupek huts egin du"
+msgstr ""
msgctxt "UPNPControl"
msgid "Failed to add a port mapping"
-msgstr "Huts mapeatze portu bat gehitzerakoan"
+msgstr ""
msgctxt "UPNPControl"
msgid "Failed to retrieve a port mapping"
-msgstr "Huts mapeatze portu bat eskuratzerakoan"
+msgstr ""
msgctxt "UPNPControl"
msgid "Failed to remove a port mapping"
-msgstr "Huts mapeatze portu bat kentzerakoan"
+msgstr ""
msgctxt "UPNPControl"
msgid "Unknown error"
-msgstr "Akats ezezaguna"
+msgstr ""
msgctxt "UPNPTestDialog"
msgid "Discovering UPnP-enabled devices"
-msgstr "UPnP-gaituriko gailuak bilatzen"
+msgstr ""
msgctxt "UPNPTestDialog"
msgid "Updating directory port mapping"
-msgstr "Mapeatze portu direktorioa eguneratzen"
+msgstr ""
msgctxt "UPNPTestDialog"
msgid "Updating relay port mapping"
-msgstr "Mapeatze portu errelea eguneratzen"
+msgstr ""
msgctxt "UPNPTestDialog"
msgid "Test completed successfully!"
-msgstr "Froga arrakastaz burutu da!"
+msgstr ""
msgctxt "UPNPTestDialog"
msgid "Testing UPnP Support"
-msgstr "UPnP onarpena frogatzen"
+msgstr ""
msgctxt "UPNPTestDialog"
msgid "Testing Universal Plug & Play Support"
-msgstr "Universal Plug & Play onarpena frogatzen"
+msgstr ""
msgctxt "UpdateProcess"
msgid ""
"Vidalia was unable to check for available software updates because it could "
"not find '%1'."
-msgstr "Vidaliak ezin izan du eskuragarri egon daitezkeen software eguneraketak begiratu '%1' ezin izan duelako aurkitu."
+msgstr ""
msgctxt "UpdateProcess"
msgid ""
"Vidalia was unable to check for available software updates because Tor's "
"update process exited unexpectedly."
-msgstr "Vidaliak ezin izan du eskuragarri egon daitezkeen software eguneraketak begiratu Toren eguneraketa prozesua ustekabean irten delako."
+msgstr ""
msgctxt "UpdateProgressDialog"
msgid "Checking for available updates..."
-msgstr "Eskuragarri egon daitezkeen eguneraketen bila..."
+msgstr ""
msgctxt "UpdateProgressDialog"
msgid "Hide"
-msgstr "Ezkutatu"
+msgstr ""
msgctxt "UpdateProgressDialog"
msgid "Downloading updates..."
-msgstr "Eguneraketak deskargatzen..."
+msgstr ""
msgctxt "UpdateProgressDialog"
msgid "Installing updated software..."
-msgstr "Eguneratutako softwarea instalatzen..."
+msgstr ""
msgctxt "UpdateProgressDialog"
msgid "Done! Your software is now up to date."
-msgstr "Eginda! Zure softwarea eguneratuta dago."
+msgstr ""
msgctxt "UpdateProgressDialog"
msgid "OK"
-msgstr "Ados"
+msgstr ""
msgctxt "UpdateProgressDialog"
msgid "Software Updates"
-msgstr "Software Eguneraketak"
+msgstr ""
msgctxt "UpdateProgressDialog"
msgid "Checking for updates..."
-msgstr "Eguneraketak bilatzen..."
+msgstr ""
msgctxt "UpdateProgressDialog"
msgid "Cancel"
-msgstr "Utzi"
+msgstr ""
msgctxt "UpdatesAvailableDialog"
msgid "Software Updates Available"
-msgstr "Software Eguneraketak eskuragarri"
+msgstr ""
msgctxt "UpdatesAvailableDialog"
msgid "Remind Me Later"
-msgstr "Beranduago gogora nazazu"
+msgstr ""
msgctxt "UpdatesAvailableDialog"
msgid "Install"
-msgstr "Instalatu"
+msgstr ""
msgctxt "UpdatesAvailableDialog"
msgid "The following updated software packages are ready for installation:"
-msgstr "Hurrengo software eguneraketa paketeak instalatzeko prest daude:"
+msgstr ""
msgctxt "UpdatesAvailableDialog"
msgid "Package"
-msgstr "Paketea"
+msgstr ""
msgctxt "UpdatesAvailableDialog"
msgid "Version"
-msgstr "Bertsioa"
+msgstr ""
+
+msgctxt "UploadProgressDialog"
+msgid "Uploading Crash Report"
+msgstr ""
+
+msgctxt "UploadProgressDialog"
+msgid "Unable to send report: %1"
+msgstr ""
msgctxt "VMessageBox"
msgid "OK"
-msgstr "Ados"
+msgstr ""
msgctxt "VMessageBox"
msgid "Cancel"
-msgstr "Utzi"
+msgstr ""
msgctxt "VMessageBox"
msgid "Yes"
-msgstr "Bai"
+msgstr ""
msgctxt "VMessageBox"
msgid "No"
-msgstr "Ez"
+msgstr ""
msgctxt "VMessageBox"
msgid "Help"
-msgstr "Laguntza"
+msgstr ""
msgctxt "VMessageBox"
msgid "Retry"
-msgstr "Berriz saiatu"
+msgstr ""
msgctxt "VMessageBox"
msgid "Show Log"
-msgstr "Erakutsi erregistroa"
+msgstr ""
msgctxt "VMessageBox"
msgid "Show Settings"
-msgstr "Erakutsi Ezarpenak"
+msgstr ""
msgctxt "VMessageBox"
msgid "Continue"
-msgstr "Jarraitu"
+msgstr ""
msgctxt "VMessageBox"
msgid "Quit"
-msgstr "Irten"
+msgstr ""
msgctxt "VMessageBox"
msgid "Browse"
-msgstr "Arakatu"
+msgstr ""
msgctxt "Vidalia"
msgid "Invalid Argument"
-msgstr "Baliogabeko argumentua"
+msgstr ""
msgctxt "Vidalia"
msgid "Vidalia is already running"
-msgstr "Vidalia martxan da dagoeneko"
+msgstr ""
msgctxt "Vidalia"
msgid "Displays this usage message and exits."
-msgstr "Erabilera mezu hau erakusten du eta irtetzen da."
+msgstr ""
msgctxt "Vidalia"
msgid "Resets ALL stored Vidalia settings."
-msgstr "Grodetako Vidalia ezarpen GUZTIAK berrezartzen ditu."
+msgstr ""
msgctxt "Vidalia"
msgid "Sets the directory Vidalia uses for data files."
-msgstr "Vidaliak datu fitxategientzako erabiltzen duen direktorioa ezartzen du."
+msgstr ""
msgctxt "Vidalia"
msgid "Sets the name and location of Vidalia's pidfile."
-msgstr "Vidaliaren pidfitxategiaren izena eta kokalekua ezartzen ditu."
+msgstr ""
msgctxt "Vidalia"
msgid "Sets the name and location of Vidalia's logfile."
-msgstr "Vidaliaren erregistro-fitxategiaren izena eta kokalekua ezartzen ditu."
+msgstr ""
msgctxt "Vidalia"
msgid "Sets the verbosity of Vidalia's logging."
-msgstr "Vidaliaren erregistroaren aditztasun maila ezartzen du."
+msgstr ""
msgctxt "Vidalia"
msgid "Sets Vidalia's interface style."
-msgstr "Vidaliaren interfaze estiloa ezartzen du."
+msgstr ""
msgctxt "Vidalia"
msgid "Sets Vidalia's language."
-msgstr "Vidaliaren hizkuntza ezartzen du."
+msgstr ""
msgctxt "Vidalia"
msgid "Vidalia Usage Information"
-msgstr "Vidaliaren Erabilera Informazioa"
+msgstr ""
msgctxt "Vidalia"
msgid "Unable to open log file '%1': %2"
-msgstr "Ezin izan da '%1' erregistro fitxategia ireki: %2"
-
-msgctxt "Vidalia"
-msgid "Value required for parameter :"
-msgstr "Parametroarentzako beharrezko balioa:"
+msgstr ""
msgctxt "Vidalia"
msgid "Invalid language code specified:"
-msgstr "Zehaztutako hizkuntza kodea baliogabekoa da:"
+msgstr ""
msgctxt "Vidalia"
msgid "Invalid GUI style specified:"
-msgstr "Zehaztutako GUI estiloa baliogabekoa da:"
+msgstr ""
msgctxt "Vidalia"
msgid "Invalid log level specified:"
-msgstr "Zehaztutako erregistro maila baliogabekoa da:"
+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 "Litekeena da Vidaliaren beste prozesu bat dagoeneko martxan egotea. Benetan Vidaliaren beste prozesu bat martxan ez badago, jarraitzea aukera dezakezu.\n\nVidalia abiarazten jarratu nahiko al zenuke?"
+msgstr ""
msgctxt "stringutil.h"
msgid "%1 secs"
-msgstr "%1 segundu"
+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 egun"
+msgstr ""
msgctxt "stringutil.h"
msgid "%1 hours"
-msgstr "%1 ordu"
+msgstr ""
msgctxt "stringutil.h"
msgid "%1 mins"
-msgstr "%1 minutu"
+msgstr ""
diff --git a/src/vidalia/i18n/po/fa/qt_fa.po b/src/vidalia/i18n/po/fa/qt_fa.po
index b58e15a..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:
-# 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"
@@ -201,7 +199,9 @@ msgctxt "QFileDialog"
msgid ""
"%1 already exists.\n"
"Do you want to replace it?"
-msgstr "%1 هم اكنون موجود است\nآيا مي خواهيد آنرا جايگزين كنيد؟"
+msgstr ""
+"%1 هم اكنون موجود است\n"
+"آيا مي خواهيد آنرا جايگزين كنيد؟"
#: qfiledialog.cpp:1690
msgctxt "QFileDialog"
@@ -209,7 +209,10 @@ msgid ""
"%1\n"
"File not found.\n"
"Please verify the correct file name was given."
-msgstr "%1\nفايل پيدا نشد\nلطفا کنترل کنيد نام فايل درست داده شده است."
+msgstr ""
+"%1\n"
+"فايل پيدا نشد\n"
+"لطفا کنترل کنيد نام فايل درست داده شده است."
#: qdirmodel.cpp:833
msgctxt "QFileDialog"
@@ -267,14 +270,19 @@ msgid ""
"%1\n"
"Directory not found.\n"
"Please verify the correct directory name was given."
-msgstr "%1\nآدرس صحيح نيست.\nلطفا کنترل کنيد نام پوشه درست داده شده است."
+msgstr ""
+"%1\n"
+"آدرس صحيح نيست.\n"
+"لطفا کنترل کنيد نام پوشه درست داده شده است."
#: qfiledialog.cpp:2281
msgctxt "QFileDialog"
msgid ""
"'%1' is write protected.\n"
"Do you want to delete it anyway?"
-msgstr "'%1' محافظت شده است.\nآيا ميخواهيد بهر حال آنرا پاك كنيد"
+msgstr ""
+"'%1' محافظت شده است.\n"
+"آيا ميخواهيد بهر حال آنرا پاك كنيد"
#: qfiledialog.cpp:2286
msgctxt "QFileDialog"
@@ -371,7 +379,9 @@ msgctxt "QFileSystemModel"
msgid ""
"<b>The name \"%1\" can not be used.</b><p>Try using another name, with fewer"
" characters or no punctuations marks."
-msgstr "<b> نمي تواند استفاده شود\"%1\"نام .</b><p>لطفا! نام ديگري انتخاب كنيد با حروف كمتر ."
+msgstr ""
+"<b> نمي تواند استفاده شود\"%1\"نام .</b><p>لطفا! نام ديگري انتخاب كنيد با "
+"حروف كمتر ."
#: qfilesystemmodel.cpp:832
msgctxt "QFileSystemModel"
diff --git a/src/vidalia/i18n/po/fa/vidalia_fa.po b/src/vidalia/i18n/po/fa/vidalia_fa.po
index 4a8aec2..cb3ac7a 100644
--- a/src/vidalia/i18n/po/fa/vidalia_fa.po
+++ b/src/vidalia/i18n/po/fa/vidalia_fa.po
@@ -1,17 +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.
-# <slander_mo at hotmail.com>, 2012.
-# <s.sampad at gmail.com>, 2012.
+# 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: 2012-03-21 17:52+0000\n"
-"PO-Revision-Date: 2012-04-16 09:48+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"
@@ -23,7 +19,7 @@ msgstr ""
msgctxt "AboutDialog"
msgid "About Vidalia"
-msgstr "درباره ویدالیا"
+msgstr "درباره ویدالیا"
msgctxt "AboutDialog"
msgid "License"
@@ -96,7 +92,7 @@ msgstr "آدرس:"
msgctxt "AdvancedPage"
msgid "None"
-msgstr "هيچكدام"
+msgstr "هیچکدام"
msgctxt "AdvancedPage"
msgid "Cookie"
@@ -136,51 +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 "از ارتباط TCP استفاده کن (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 وجود ندارد"
+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."
+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 "تعیین محل دایرکتوری Tor را داده شامل کاراکتر است که می تواند در سیستم خود رمزگذاری کاراکتر در حال حاضر 8 - بیت نشان داده نمیشود."
+msgstr ""
msgctxt "AdvancedPage"
msgid "Warning"
@@ -188,26 +184,15 @@ 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 "یک فایل برای استفاده مسیرِ سوکتِ تور انتخاب کنید"
-
-msgctxt "AdvancedPage"
-msgid "Configure ControlPort automatically"
-msgstr "ControlPort را بصورت خودکار پیکربندی کن"
-
-msgctxt "AdvancedPage"
-msgid ""
-"You've checked the autoconfiguration option for the ControlPort, but "
-"provided no Data Directory. Please add one, or uncheck the \"Configure "
-"ControlPort automatically\" option."
-msgstr "شما گزینه تنظیمات خودکار را برای ControlPort انتخاب کرده اید، ولی هیچ دایرکتوری داده ای ارایه نکردید. لطفن یکی اضافه کنید و یا گزینه تنظیم خودکار ControlPort را غیرفعال کنید."
+msgstr ""
msgctxt "AdvancedPage"
msgid ""
@@ -234,42 +219,21 @@ msgstr "نوع واسط کاربر ویدالیا را انتخاب کن"
msgctxt "AppearancePage"
msgid "Vidalia was unable to load the selected language translation."
-msgstr "ویدالیا قادر به بارگذاری زبان انتخاب شده نبود"
-
-msgctxt "AppearancePage"
-msgid ""
-"System Icon Preferences (changes will take effect when you restart Vidalia)"
-msgstr "آیکن کارایی سیستم (تغییرات اثر کند زمانی که شما ویدالیا را دوباره شروع می کنید)"
-
-msgctxt "AppearancePage"
-msgid "Show the Tray Icon and Dock Icon (default)"
-msgstr "(پیش فرض)Dock Icon و Tray Icon نمایش"
-
-msgctxt "AppearancePage"
-msgid "Hide the Tray Icon"
-msgstr "مخفی کردن Tray Icon"
-
-msgctxt "AppearancePage"
-msgid "Hide the Dock Icon"
-msgstr "مخفی کردن Dock Icon"
+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 "تنظیم مجدد"
@@ -309,6 +273,10 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr "لغو"
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr "نمودار پهنای باند"
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr " شروع به درخواست پل های HTTPS"
@@ -323,7 +291,7 @@ msgstr "ارسال یک درخواست HTTPS برای پل ها"
msgctxt "BridgeDownloader"
msgid "Downloading a list of bridges..."
-msgstr "بارگذاری یک ليست از پل ها"
+msgstr "بارگذاری فهرستی از پل ها..."
msgctxt "BridgeDownloaderProgressDialog"
msgid "Downloading Bridges"
@@ -331,7 +299,7 @@ msgstr "بارگذاری پل ها"
msgctxt "BridgeDownloaderProgressDialog"
msgid "Unable to download bridges: %1"
-msgstr "ناتوان در بارگذاری پل ها:%1"
+msgstr "ناتوان در بارگذاری پل ها: %1"
msgctxt "BridgeDownloaderProgressDialog"
msgid "Retrying bridge request..."
@@ -339,11 +307,11 @@ 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"
@@ -351,11 +319,11 @@ msgstr "از تاریخ %1 کلاینت هایی از کشورهای زی
msgctxt "BridgeUsageDialog"
msgid "Bridge Usage Summary"
-msgstr "گزارش استفاده از پل ها"
+msgstr ""
msgctxt "BridgeUsageDialog"
msgid "Client Summary"
-msgstr "گزارش کلاینتها"
+msgstr ""
msgctxt "Circuit"
msgid "New"
@@ -363,7 +331,7 @@ msgstr "جدید"
msgctxt "Circuit"
msgid "Open"
-msgstr "باز کن"
+msgstr "بازکن"
msgctxt "Circuit"
msgid "Building"
@@ -371,11 +339,11 @@ msgstr "درحال ساختن"
msgctxt "Circuit"
msgid "Failed"
-msgstr "ناموفق"
+msgstr ""
msgctxt "Circuit"
msgid "Closed"
-msgstr "بسته شده"
+msgstr "بسته شد"
msgctxt "Circuit"
msgid "Unknown"
@@ -383,2047 +351,1963 @@ 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:"
-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."
-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 "لطفن در این آدرس یک تیکت پر کنید:"
+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 "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."
-msgstr "گزارش از کار افتادن نرم افزار آماده شده و شما میتوانید آن را برای کمک به شناسایی و حل مشکل به توسعه دهندگان ویدالیا ارسال کنید. گزارش ثبت شده حاوی هیچگونه اطلاعات هویتی شخصی نیست."
+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:"
-msgstr "با شرحی از آنچه قبل ازکار افتادن نرم افزار انجام میدادید، بهمراه فایلهای مربوط به گزارش از کار افتادن:"
+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 ""
"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?"
-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 "ویدالیا نتوانست پیوند انتخاب شده را در مرورگر وب بازکند. شما می توانید نشانی وب را کپی کرده و آن را در مرورگرتان بچسبانید."
+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 ""
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 "ویدالیا نتوانست تور را راهاندازی کند. تنظیمات خود را دوباره بررسی کنید تا مطمین شوید مسیر فایل اجرایی تر را درست مشخص کردهاید."
+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 "نرم افزار تور نیاز به ارسال محتویات یک کوکی احراز هویت بوسیله ویدالیا دارد اما ویدالیا نتوانست آن را پیدا کند."
+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 "خواهشمند است تنظیمات احرازهویت پورتِ کنترل خود را چک کنید."
+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 "نسخه نصب شده تور قدیمی است و دیگر توصیه نمیشود. خواهشمند است به سایت تور رفته و آخرین نسخه را بارگذاری کنید."
+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 "برپای بازپخش\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)راچك كنيد تا هيچ برنامه تُر در حال اجرا نباشد."
+msgstr ""
msgctxt "MainWindow"
msgid ""
"The currently installed version of Tor is out of date or no longer "
"recommended."
-msgstr "نسخه نصب شده تُر قدیمی است و دیگر توصیه نمیشود. خواهشمند است به سایت تُر رفته و نهایی ترین نسخه آن را بارگذاری کنید."
+msgstr ""
msgctxt "MainWindow"
msgid ""
"Would you like to check if a newer package is available for installation?"
-msgstr "آيا مي خواهيد بررسي كنم نسخه جديد نر افزار تر براي نصب موجود است؟"
+msgstr ""
msgctxt "MainWindow"
msgid "Potentially Unsafe Connection"
-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 ""
"Anything 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 ""
+
+msgctxt "MainWindow"
+msgid "toolBar"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Start"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Stop"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Restart"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Reload Tor's config"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Actions"
+msgstr ""
msgctxt "MainWindow"
msgid "Bootstrapping torrc from %1 to %2"
-msgstr "راه اندازی torrc از %1 به %2"
+msgstr ""
msgctxt "MainWindow"
-msgid "(probably Telnet)"
-msgstr "(شاید تِلنت)"
+msgid ""
+"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"\n"
+"Would you like to shutdown gracefully and give clients time to find a new relay?"
+msgstr ""
msgctxt "MainWindow"
-msgid "(probably an email client)"
-msgstr "(شاید یک برنامه ایمیل)"
+msgid ""
+"Vidalia detected that the Tor software exited unexpectedly.\n"
+"\n"
+"Please check the message log for recent warning or error messages."
+msgstr ""
msgctxt "MainWindow"
msgid ""
-"One of your applications %1 appears to be making a potentially unencrypted "
-"and unsafe connection to port %2."
-msgstr "به نظر میرسد یکی از برنامههای شما %1 در حال برقراری ارتباطی رمزگذاری نشده و ناامن به پورت %2 است"
+"Vidalia 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)"
+msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
-msgstr "باز ژخش شما متوقف شده است./n"
+msgid ", probably Telnet,"
+msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Vidalia can't find out how to talk to Tor because it can't access this file: %1\n"
-"\n"
-"Here's the last error message:\n"
-"%2"
-msgstr "\"ویدالیا\" نمی تواند راهی برای برقراری ارتباط با \"تُر\" پیدا کند زیرا به فایل: %1 دسترسی ندارد.\n\nآخرین پیغام خطا:\n%2"
+msgid ", probably an email client,"
+msgstr ""
msgctxt "MainWindow"
msgid ""
-"It seems Tor has stopped running since Vidalia started it.\n"
-"\n"
-"See the Advanced Message Log for more information."
-msgstr "به نظر می رسد که \"تُر\" پس از اجرا شدن توسط Vidalia متوقف شده است.\n\nبرای کسب اطلاعات بیشتر می توانید قسمت گزارش پیام پیشرفته را مشاهده نمایید."
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
+msgstr ""
msgctxt "MainWindow"
-msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
-"\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
-msgstr "شما در حال حاضر يك بازپخش داريد.پايان دادن به اين بازپخش ميتواند اتصالات كاربران را متوقف كند./n/nآيا مي خواهيد به تدريج بازپخش بسته شود و به كاربران فرصت دهيد تا يك بازپخش جديد بيابند؟"
+msgid "Error reloading configuration"
+msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Vidalia detected that the Tor software exited unexpectedly.\n"
-"\n"
-"Please check the message log for recent warning or error messages."
-msgstr "ويداليا يك نسخه از تُر را شناسايي كرده است./n/nلطفا پيغامها را براي خاطاها بررسي كنيد."
+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."
-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 \nsomething has gone wrong with Tor."
+msgstr ""
msgctxt "MessageLog"
msgid ""
@@ -2431,813 +2315,829 @@ msgid ""
"during normal Tor operation and are \n"
"not considered errors, but you may \n"
"care about."
-msgstr "Messages that appear infrequently \nduring normal Tor operation and are \nnot considered errors, but you may \ncare about."
+msgstr ""
msgctxt "MessageLog"
msgid ""
"Messages that appear frequently \n"
"during normal Tor operation."
-msgstr "Messages that appear frequently \nduring normal Tor operation."
+msgstr ""
msgctxt "MessageLog"
msgid ""
"Hyper-verbose messages primarily of \n"
"interest to Tor developers."
-msgstr "Hyper-verbose messages primarily of \ninterest to Tor developers."
+msgstr ""
msgctxt "MessageLog"
msgid ""
"Cannot write file %1\n"
"\n"
"%2."
-msgstr "Cannot write file %1\n\n%2."
-
-msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr "نقشه شبکه تُر"
+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 ""
+
+msgctxt "NetworkPage"
+msgid "The specified bridge identifier is not valid."
+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 "شما میبایست یک آدرس آی پی یا یک نام میزبان و یک شماره درگاه برای پیکربندی تُر مشخص کنید جهت استفاده ار یک پیشکار برای دسترسی به اینترنت."
+msgstr ""
msgctxt "NetworkPage"
msgid ""
"You must specify one or more ports to which your firewall allows you to "
"connect."
-msgstr "شما میبایست یک یا چند درگاه که بارو اجازه دسترسی به آنها را میدهد مشخص کنید."
+msgstr ""
msgctxt "NetworkPage"
msgid "'%1' is not a valid port number."
-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 "نشان بگذارید جهت متصل شدن به بازپخش هایی که تنها درگاه های مجاز بدست بارو را استفاده میکنند"
+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 "نشان بگذارید برای رمزبندی درخواست های فهرست و, اختیاری, از پلهای بازپخش برای دسترسی به شبکه تُر استفاده کنید"
+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 "پلِ جديدي در دسترس نيست.شما مي توانيد صبر كنيد و مجدداً سعي كنيد،يا روش ديگري امتحان كنيد براي پيدا كردن پل هاي جديد."
+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 / HTTPS"
-msgstr "HTTP / HTTPS"
+msgid "HTTP"
+msgstr ""
msgctxt "NetworkPage"
-msgid "You must specify one or more bridges."
-msgstr "شما باید یک یا پل های بیشتری را مشخص کنید."
+msgid "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 "شما تُر را به گونه ای پیکربندی کردید که مانند یک پل بازپخش برای کاربران سانسورشده کارکند, اما نسخه تُر شما پل ها را پشتیبانی نمی کند."
+msgstr ""
msgctxt "ServerPage"
msgid ""
"Please upgrade your Tor software or configure Tor to act as a normal Tor "
"relay."
-msgstr "خواهشمند است نرم افزار تُر را بروزرسانی کنید یا تُر را به گونه ای پیکربندی کنید که مانند یک بازپخش تُر نرمال کارکند."
+msgstr ""
msgctxt "ServerPage"
msgid "Your bridge relay is not running."
-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 "اجراکردن تنها مانند یک کاربر"
+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 "درگاهی که کاربران و بازپخش های دیگر می توانند بوسیله آن با بازپخش شما ارتباط برقرار کنند"
+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 "برای ارتباطات اینترنتی با نرخ بارگیری (دانلود) سریع ولی نرخ بارگذاری (آپلود) کند، لطفا سرعت بارگذاری خود را اینجا مشخص کنید."
+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 "گزینهای را که از همه بیشتر به نوع ارتباط اینترنت شما شبیه است انتخاب کنید"
+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 کیلوبایت در ثانیه باشد."
+msgstr ""
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?}"
+msgstr ""
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 "تُر همچنان بعضي از ايميل ها و فايلهاي اشتراك گذاري شده ارسالي را به صورت پيشفرض مسدود كرده براي جلوگيري از اسپمينگ و استفاده هاي نادرست."
+msgstr ""
msgctxt "ServerPage"
msgid "Exit Policies"
-msgstr "سیاستهای خروج"
+msgstr ""
msgctxt "ServerPage"
msgid "Let others access your bridge by giving them this line:"
-msgstr "بگذارید دیگران به پل شما دسترسی پیدا کنند با بیان کردن این خط به آنها:"
+msgstr ""
msgctxt "ServerPage"
msgid ""
"This is the identity of your bridge relay that you can give to other people"
-msgstr "این هویت پل بازپخش شما می باشد که میتوانید آن را به افراد دیگر بدهید"
+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 "اجازه دهيد بازپخش شما ادامه پيدا كند اينطور كاربران شانس بيشتري دارند تا آن را پيدا كنند."
+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."
+msgstr ""
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 یا جدیدتر)"
+msgstr ""
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 for the Tor network (exit relay)"
-msgstr "(ترافیک باز پخش برای شبکه تُر (بازپخش خروجی"
+msgid "Relay traffic inside the Tor network (non-exit relay)"
+msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic inside the Tor network (non-exit relay)"
-msgstr "باز پخش ترافیک درون شبکه \"تُر\" (بازپخش داخلی)"
+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\nproblem with your relay. You might also include your PGP or GPG fingerprint."
+msgstr ""
msgctxt "ServicePage"
msgid "Error while trying to unpublish all services"
-msgstr "خطا هنگام غیر منتشر کردن همه سرویس ها"
+msgstr ""
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"
-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 "هدف تنها می تواند شامل آدرس:درگاه, آدرس, یا درگاه باشد."
+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 ""
"Click \"Start Tor\" in the Vidalia Control Panel to restart the Tor "
"software. If Tor exited unexpectedly, select the \"Advanced\" tab above for "
"details about any errors encountered."
-msgstr "بر روی گزینهٔ \"Start Tor\" در داخل Vidalia کنترل پانل کلیک کنید، تا نرم افزار TOR اجرا شود. اگر که TOR به صورت غیر منتظره از کار ایستاد و خارج شد، تاب بالایی \"Advanced\" را انتخاب کنید تا از جزئیات مشکل پیش آماده مطلع شوید."
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
@@ -3245,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\" از نرم افزار تور هستید که دیگر توصیه نمی شود. لطفن به آخرین نسخه از نرم افزار به روز کنید. این بروزرسانی ممکن است شامل رفع ایرادات مهم امنیتی، عملکرد و کارایی باشد"
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
@@ -3253,31 +3153,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 "شما هم اکنون در حال اجرای نسخه \"%1\" از نرم افزار تور هستید که ممکن است دیگر با شبکه فعلی تور کار نکند. لطفن به آخرین نسخه از نرم افزار به روز کنید. این بروزرسانی ممکن است شامل رفع ایرادات مهم امنیتی، عملکرد و کارایی باشد"
+msgstr ""
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 موفقیت آمیز بود. حال میتوانید برنامههای خود را تنظیم کنید تا بتوانید به طور ناشناس از اینترنت استفاده کنید. "
+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 "نرم افزار تور با یک اشکال داخلی مواجه شد. لطفن پیام خطای زیر را برای سازندگان تور به آدرس زیر ارسال کنید:\nbugs.torproject.org: \"%1\""
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
@@ -3285,7 +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 "تور مشخص کرد که ساعت کامپیوتر شما ممکن است در مقایسه با منبع \"%2\"، %1 ثانیه در گذشته تنظیم شده باشد. اگر ساعت شما تنظیم نباشد تور کار نمی کند. لطفن مطمین شوید کامپیوتر شما ساعت درست را نشان میدهد"
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
@@ -3293,11 +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 "تور مشخص کرد که ساعت کامپیوتر شما ممکن است در مقایسه با منبع \"%2\"، %1 ثانیه در آینده تنظیم شده باشد. اگر ساعت شما تنظیم نباشد تور کار نمی کند. لطفن مطمین شوید کامپیوتر شما ساعت درست را نشان میدهد"
+msgstr ""
msgctxt "StatusEventWidget"
msgid "Your Computer's Clock is Potentially Incorrect"
-msgstr "ساعت کامپیوتر شما اشتباه است"
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
@@ -3305,18 +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 "ممکن است یکی از اپلیکیشن های کامپیوتر شما برای برقراری ارتباط رمزگذاری نشده از درگاه %1 بتوسط تور تلاش کرده باشد. فرستادن اطلاعات رمزگذاری نشده از طریق شبکه تور، خطرناک است و توصیه نمی شود. برای محافظت از شما، تور این ارتباط را بصورت خودکار بست."
+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 "ممکن است یکی از اپلیکیشن های کامپیوتر شما برای برقراری ارتباط رمزگذاری نشده از درگاه %1 بتوسط تور تلاش کرده باشد. فرستادن اطلاعات رمزگذاری نشده از طریق شبکه تور، خطرناک است و توصیه نمی شود."
+msgstr ""
msgctxt "StatusEventWidget"
msgid "Potentially Dangerous Connection!"
-msgstr "پتانسیل ارتباط خطرناک!"
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
@@ -3324,81 +3224,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 "یکی از اپلیکیشن های شما از طریق تور و پروتکلی که ممکن است اطلاعاتی از مقصد نهایی شما را فاش سازد به \"%1\" برقرار ساخته. لطفن مطمین شوید اپلیکیشن خود را بنحوی تنظیم میکنید که فقط از SOCKS4a یا SOCKS5 بهمراه remote hostname resolution استفاده کند."
+msgstr ""
msgctxt "StatusEventWidget"
msgid "Unknown SOCKS Protocol"
-msgstr "پروتوکل SOCKS ناشناخته"
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
"One of your applications tried to establish a connection through Tor using a"
" protocol that Tor does not understand. Please ensure you configure your "
"applications to use only SOCKS4a or SOCKS5 with remote hostname resolution."
-msgstr "یکی از اپلیکیشن های شما تلاش کرده است که به توسط تور و از پروتکلی که تور آن را نمیفهمد ارتباطی برقرار کند. لطفن مطمین شوید اپلیکیشن خود را بنحوی تنظیم میکنید که فقط از SOCKS4a یا SOCKS5 بهمراه remote hostname resolution استفاده کند."
+msgstr ""
msgctxt "StatusEventWidget"
msgid "Invalid Destination Hostname"
-msgstr "نام میزبان مقصد نامعتبر"
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
"One of your applications tried to establish a connection through Tor to "
"\"%1\", which Tor does not recognize as a valid hostname. Please check your "
"application's configuration."
-msgstr "یکی از برنامههای شما سعی داشت تا از طریق شبکهٔ TOR به \"%1\" دست رسی پیدا کند، در حالی که TOR این \"hostname\" یا نام میزبان را به رسمیت نمیشناسد. لطفا تنظیمات برنامه خود را مجدداً چک کنید."
+msgstr ""
msgctxt "StatusEventWidget"
msgid "External IP Address Changed"
-msgstr "آی پی آدرس خارجی تغییر کرد"
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
"Tor has determined your relay's public IP address is currently %1%2. If that"
" is not correct, please consider setting the 'Address' option in your "
"relay's configuration."
-msgstr "تور تشخیص داده که آدرس IP شما در حال حاضر %1%2 است. اگر درست نیست، لطفن تنظیم 'Address' را در پیکربندی بازپخش کننده خود در نظر داشته باشید."
+msgstr ""
msgctxt "StatusEventWidget"
msgid "DNS Hijacking Detected"
-msgstr "ربوده شدن DNS "
+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 "TOR تشخیص داده است که ارائه دهندهٔ DNS شما پاسخهای نادرستی به دامینهایی که موجود نیستند میدهد. بعضی ISPها و ارایه دهندگان DNS, مثل OpenDNS, به طور مشخص این کار را انجام داده تا نتایج جستجوی خود و یا تبلیغات را نمایش دهند."
+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 "TOR تشخیص داده است که ارائه دهندهٔ DNS شما پاسخهای نادرستی به دامینهایی شناخته شده میدهد. از آنجا که کامپیوتر کاربر برای دریافت پاسخ DNS به رلههای شبکهٔ TOR اتکا میکند، رله شما به عنوان رله خروجی استفاده نخواهد شد. "
+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\" میباشد. \nاین پروسه چند دقیقه طول میکشد."
+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 "پورتِ سرورِ شما از شبکه TOR قابل دسترسی نیست!"
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
@@ -3406,30 +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 "پورتِ سرورِ رله شما قابل دسترسی توسط کاربران دیگر نیست. این ممکن از به این دلیل باشد که کامپیوترِ شما پشت firewall قرار دارد یا اینکه به روتر وصل شده است که لازم است پورت فرواردینگ کند. اگر \"%1:%2\" آدرسِ آیپی و پورتِ شما نیست، لطفا تنظیمات رله خود را چک کنید."
+msgstr ""
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 ""
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 ""
@@ -3437,21 +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 "دایرکتوری پورت بازپخش کننده شما، توسط دیگر کاربران تور قابل دسترس نیست. این اتفاق زمانی ممکن است بیافتد، که شما پشت روتر یا فایروالی هستید که نیاز به تنظیم انتقال پورت دارد. اگر %1:%2 آدرس IP و دایرکتوری پورت درست شما نیست، لطفن پیکربندی بازپخش کننده خود را چک کنید."
+msgstr ""
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 ""
msgctxt "StatusEventWidget"
msgid "Your Relay is Online"
-msgstr "بازپخش کننده شما آنلاین است"
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
@@ -3459,393 +3359,443 @@ msgid ""
"see an increase in network traffic shown by the Bandwidth Graph within a few"
" hours as more clients learn about your relay. Thank you for contributing to"
" the Tor network!"
-msgstr "بازپخش کننده شما آنلاین و برای استفاده کاربران تور در دسترس است. همچنان که کاربران بیشتری از بازپخش کننده شما آگاه میشوند، در چند ساعت آینده، شما باید شاهد بالا رفتن ترافیک نمایش داده شده در نمودار پهنای باند باشید!"
+msgstr ""
+
+msgctxt "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 "تنظیمات را ذخیره کن. اگر علامت نخورده باشد فقط برای نمونه تور فعلی اعمال میشود."
+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 "محدوده انتخاب خالی است. لطفن مقداری از مت و یا \"همه را اعمال کن\" را انتخاب کنید"
+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' را پیدا کند."
+msgstr ""
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..."
-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 ""
"Another Vidalia process is possibly already running. If there really is not another Vidalia process running, you can choose to continue anyway.\n"
"\n"
"Would you like to continue starting Vidalia?"
-msgstr "Another Vidalia process is possibly already running. If there really is not another Vidalia process running, you can choose to continue anyway.\n\nWould you like to continue starting Vidalia?"
+msgstr ""
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 06a933e..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:
-# 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"
@@ -201,7 +199,9 @@ msgctxt "QFileDialog"
msgid ""
"%1 already exists.\n"
"Do you want to replace it?"
-msgstr "%1 on jo olemassa.\nHaluatko korvata sen?"
+msgstr ""
+"%1 on jo olemassa.\n"
+"Haluatko korvata sen?"
#: qfiledialog.cpp:1690
msgctxt "QFileDialog"
@@ -209,7 +209,10 @@ msgid ""
"%1\n"
"File not found.\n"
"Please verify the correct file name was given."
-msgstr "%1\nTiedostoa ei löytynyt.\nOle hyvä ja tarkista tiedoston nimi."
+msgstr ""
+"%1\n"
+"Tiedostoa ei löytynyt.\n"
+"Ole hyvä ja tarkista tiedoston nimi."
#: qdirmodel.cpp:833
msgctxt "QFileDialog"
@@ -267,14 +270,19 @@ msgid ""
"%1\n"
"Directory not found.\n"
"Please verify the correct directory name was given."
-msgstr "%1\nKansiota ei löytynyt.\nOle hyvä ja tarkista kansion nimi."
+msgstr ""
+"%1\n"
+"Kansiota ei löytynyt.\n"
+"Ole hyvä ja tarkista kansion nimi."
#: qfiledialog.cpp:2281
msgctxt "QFileDialog"
msgid ""
"'%1' is write protected.\n"
"Do you want to delete it anyway?"
-msgstr "'%1' on kirjoitussuojattu.\nOletko varma, että haluat poistaa sen?"
+msgstr ""
+"'%1' on kirjoitussuojattu.\n"
+"Oletko varma, että haluat poistaa sen?"
#: qfiledialog.cpp:2286
msgctxt "QFileDialog"
@@ -371,7 +379,9 @@ msgctxt "QFileSystemModel"
msgid ""
"<b>The name \"%1\" can not be used.</b><p>Try using another name, with fewer"
" characters or no punctuations marks."
-msgstr "<b>Nimeä \"%1\" ei voida käyttää.</b><p>Koita käyttää toista nimeä, vähemmän merkkejä tai ei erikoisia merkkejä."
+msgstr ""
+"<b>Nimeä \"%1\" ei voida käyttää.</b><p>Koita käyttää toista nimeä, vähemmän"
+" merkkejä tai ei erikoisia merkkejä."
#: qfilesystemmodel.cpp:832
msgctxt "QFileSystemModel"
diff --git a/src/vidalia/i18n/po/fi/vidalia_fi.po b/src/vidalia/i18n/po/fi/vidalia_fi.po
index 84b2072..12066a3 100644
--- a/src/vidalia/i18n/po/fi/vidalia_fi.po
+++ b/src/vidalia/i18n/po/fi/vidalia_fi.po
@@ -1,23 +1,16 @@
-#
-# Translators:
-# <c168298 at rppkn.com>, 2012.
-# <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: 2012-03-21 17:52+0000\n"
-"PO-Revision-Date: 2012-03-22 08:51+0000\n"
-"Last-Translator: torre <c168298 at rppkn.com>\n"
+"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"
@@ -39,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"
@@ -85,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:"
@@ -141,78 +153,12 @@ 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 ""
-"You've checked the autoconfiguration option for the ControlPort, but "
-"provided no Data Directory. Please add one, or uncheck the \"Configure "
-"ControlPort automatically\" option."
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid ""
-"Vidalia was unable to remove the Tor service.\n"
+msgid "Vidalia was unable to remove the Tor service.\n"
"\n"
"You may need to remove it manually."
-msgstr "Vidalia ei onnistunut poistamaan Tor-palvelua. Joudut ehkä poistamaan sen manuaalisesti."
+msgstr ""
+"Vidalia ei onnistunut poistamaan Tor-palvelua. Joudut ehkä poistamaan sen "
+"manuaalisesti."
msgctxt "AppearancePage"
msgid "Language"
@@ -234,23 +180,6 @@ msgctxt "AppearancePage"
msgid "Vidalia was unable to load the selected language translation."
msgstr "Vidalia ei onnistunut lataamaan valittua kielikäännöstä."
-msgctxt "AppearancePage"
-msgid ""
-"System Icon Preferences (changes will take effect when you restart Vidalia)"
-msgstr ""
-
-msgctxt "AppearancePage"
-msgid "Show the Tray Icon and Dock Icon (default)"
-msgstr ""
-
-msgctxt "AppearancePage"
-msgid "Hide the Tray Icon"
-msgstr ""
-
-msgctxt "AppearancePage"
-msgid "Hide the Dock Icon"
-msgstr ""
-
msgctxt "BandwidthGraph"
msgid "Since:"
msgstr "Alkaen:"
@@ -345,7 +274,8 @@ msgstr "# Asiakasta"
msgctxt "BridgeUsageDialog"
msgid "Clients from the following countries have used your relay since %1"
-msgstr "Asiakasta seuraavista maista ovat käyttäneet välityspalvelintasi %1 alkaen"
+msgstr ""
+"Asiakasta seuraavista maista ovat käyttäneet välityspalvelintasi %1 alkaen"
msgctxt "BridgeUsageDialog"
msgid "Bridge Usage Summary"
@@ -468,10 +398,10 @@ 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:"
-msgstr "Vidalia on yhdistynyt käynnissä olevaan Tor - ohjelmaan, joka vaatii salasanaa. Ole hyvä ja kirjoita ohjaussalasana:"
+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:"
msgctxt "ControlSocket"
msgid "Control socket is not connected."
@@ -1186,10 +1116,6 @@ msgid "Zimbabwe"
msgstr "Zimbabwe"
msgctxt "CountryInfo"
-msgid "Zaire"
-msgstr "Zaire"
-
-msgctxt "CountryInfo"
msgid "Albania"
msgstr "Albania"
@@ -1285,55 +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)"
@@ -1351,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"
@@ -1547,10 +1428,7 @@ 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."
+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"
@@ -1562,9 +1440,7 @@ 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."
+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"
@@ -1607,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"
@@ -1776,6 +1628,10 @@ msgid "Connected to the Tor network!"
msgstr "Yhdistetty Tor-verkkoon"
msgctxt "MainWindow"
+msgid "Unrecognized startup status"
+msgstr "Tunnistamaton käynnistystila"
+
+msgctxt "MainWindow"
msgid "miscellaneous"
msgstr "sekalaiset"
@@ -1840,10 +1696,10 @@ 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."
-msgstr "Vidalia ei onnistunut käynnistämään Tor-ohjelmaa. Tarkista asetukset ja varmista onko Tor-ohjelman nimi ja sijainti kirjoitettu oikein."
+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."
msgctxt "MainWindow"
msgid "Connecting to Tor"
@@ -1878,10 +1734,10 @@ 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."
-msgstr "Tor-ohjelma pyytää Vidaliaa lähettämään kirjautumisevästeen tiedot, mutta Vidalia ei löytänyt kirjautumisevästettä."
+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ä."
msgctxt "MainWindow"
msgid "Would you like to browse for the file 'control_auth_cookie' yourself?"
@@ -1900,10 +1756,10 @@ 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."
-msgstr "Vidalia ei pystynyt rekisteröimään joitakin tapahtumia. Jotkin Vidian ominaisuudet eivät ehkä toimi."
+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."
msgctxt "MainWindow"
msgid "Authentication Error"
@@ -1922,9 +1778,7 @@ 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."
+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"
@@ -1932,10 +1786,10 @@ msgid "Tor website: %1"
msgstr "Tor-ohjelman kotisivu: %1"
msgctxt "MainWindow"
-msgid ""
-"All subsequent connections will appear to be different than your old "
-"connections."
-msgstr "Vaikuttaisi että kaikki seuraavat yhteydet tulevat olemaan erilaiset kuin vanhat yhteydet."
+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."
msgctxt "MainWindow"
msgid "Failed to Create New Identity"
@@ -1963,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"
@@ -2026,21 +1880,20 @@ 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."
-msgstr "Vidalia yritti nollata Tor salasanaa, mutta ei pystynyt käynnistämään uudestaan Tor -ohjelmaa. Tarkista Tehtävienhallinnasta (Task Manager) että päällekkäisiä Tor prosesseja ei ole käynnissä. (Käynnistä Tehtävienhallinta:Ctrl+Shift+Esc)"
+msgid "Vidalia tried to reset Tor's control password, but was not able to restart the Tor software. Please check your Task Manager to ensure there are no other Tor processes running."
+msgstr ""
+"Vidalia yritti nollata Tor salasanaa, mutta ei pystynyt käynnistämään "
+"uudestaan Tor -ohjelmaa. Tarkista Tehtävienhallinnasta (Task Manager) että "
+"päällekkäisiä Tor prosesseja ei ole käynnissä. (Käynnistä "
+"Tehtävienhallinta:Ctrl+Shift+Esc)"
msgctxt "MainWindow"
-msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended."
-msgstr "Asennettu versio Tor-ohjelmasta on vanhentunut tai sitä ei suositella enään."
+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"
@@ -2048,9 +1901,15 @@ 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 ""
+"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"
@@ -2062,10 +1921,9 @@ 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."
-msgstr "Uusia Tor-ohjelmiston paketteja ei ole saatavana tietokoneellesi juuri nyt."
+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."
msgctxt "MainWindow"
msgid "Installation Failed"
@@ -2080,68 +1938,63 @@ 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."
+msgid "failed (%1)"
+msgstr "epäonnistui (%1)"
msgctxt "MainWindow"
-msgid "Bootstrapping torrc from %1 to %2"
+msgid "Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
msgstr ""
+"Välitypalvelimesi on sulkeutumassa. \n"
+"Napsauta 'Pysäytä'-nappia uudelleen sulkeaksesi välityspalvelun heti. "
msgctxt "MainWindow"
-msgid "(probably Telnet)"
-msgstr "(todennäköisesti Telnet)"
+msgid "You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"\n"
+"Would you like to shutdown gracefully and give clients time to find a new relay?"
+msgstr ""
+"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?"
msgctxt "MainWindow"
-msgid "(probably an email client)"
-msgstr "(todennäköisesti sähköpostiasiakasohjelma)"
+msgid "Vidalia detected that the Tor software exited unexpectedly.\n"
+"\n"
+"Please check the message log for recent warning or error messages."
+msgstr ""
+"Vidalia havaitsi että Tor ohjelma päättyi odottamatta.\n"
+"\n"
+"Tarkista lokitiedostosta onko siellä varoitus tai virhe viestejä."
msgctxt "MainWindow"
-msgid ""
-"One of your applications %1 appears to be making a potentially unencrypted "
-"and unsafe connection to port %2."
-msgstr ""
+msgid ", probably Telnet,"
+msgstr ", varmaankin Telnet-sovellus,"
msgctxt "MainWindow"
-msgid "failed (%1)"
-msgstr "epäonnistui (%1)"
+msgid ", probably an email client,"
+msgstr ", varmaankin sähköpostisovellus,"
msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
-msgstr "Välitypalvelimesi on sulkeutumassa. \nNapsauta 'Pysäytä'-nappia uudelleen sulkeaksesi välityspalvelun heti. "
+msgid "Vidalia"
+msgstr "Vidalia"
msgctxt "MainWindow"
-msgid ""
-"Vidalia can't find out how to talk to Tor because it can't access this file: %1\n"
-"\n"
-"Here's the last error message:\n"
-"%2"
-msgstr ""
+msgid "File"
+msgstr "Tiedosto"
msgctxt "MainWindow"
-msgid ""
-"It seems Tor has stopped running since Vidalia started it.\n"
-"\n"
-"See the Advanced Message Log for more information."
-msgstr ""
+msgid "About Vidalia"
+msgstr "Tietoja Vidaliasta"
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 "Operoit parhaillaan välityspalvelinta. Mikäli sammutat välityspalvelimesi, se katkaisee kaikkien palvelintasi käyttävien yhteydet!\n\nHaluaisitko sensijaan sammuttaa sulavasti ja antaa yhteyttäsi käyttäville aikaa löytää uusi yhteys?"
+msgid "Home"
+msgstr "Koti"
msgctxt "MainWindow"
-msgid ""
-"Vidalia detected that the Tor software exited unexpectedly.\n"
-"\n"
-"Please check the message log for recent warning or error messages."
-msgstr "Vidalia havaitsi että Tor ohjelma päättyi odottamatta.\n\nTarkista lokitiedostosta onko siellä varoitus tai virhe viestejä."
+msgid "Check For Updates"
+msgstr "Etsi Päivityksiä"
msgctxt "MessageLog"
msgid "Error Setting Filter"
@@ -2384,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"
@@ -2396,59 +2253,43 @@ 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 \njotka eivät ole varsinaisia virhetilanteita, mutta joista on ehkä hyvä tietää."
+msgstr ""
+"Normaalin Tor käytön aikana ilmestyvät ajoittaiset virheviestit \n"
+"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 ""
+"Tiedoston %1 kirjoitus epäonnistui \n"
"\n"
"%2."
-msgstr "Tiedoston %1 kirjoitus epäonnistui \n\n%2."
msgctxt "NetViewer"
msgid "Tor Network Map"
@@ -2555,19 +2396,25 @@ msgid "Ctrl+F"
msgstr "Ctrl+F"
msgctxt "NetworkPage"
+msgid "Invalid Bridge"
+msgstr "Virheellinen silta"
+
+msgctxt "NetworkPage"
+msgid "The specified bridge identifier is not valid."
+msgstr "Määritelty siltahenkilöllisyys on virheellinen."
+
+msgctxt "NetworkPage"
msgid "Copy (Ctrl+C)"
msgstr "Kopioi (Ctrl+C)"
msgctxt "NetworkPage"
-msgid ""
-"You must specify both an IP address or hostname and a port number to "
-"configure Tor to use a proxy to access the Internet."
-msgstr "Joko IP-osoite tai sitten isäntä ja portti numero pitää määrittää, jotta Tor-ohjelma osaa yhdistää välityspalvelimen kautta Internettiin."
+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."
+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"
@@ -2587,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:"
@@ -2619,10 +2474,10 @@ 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 "Rastita suojataksesi hakemistopyynnöt, ja valinnaisesti käytä siltareitittimiä yhdistääksesi Tor-verkkoon."
+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."
msgctxt "NetworkPage"
msgid "My ISP blocks connections to the Tor network"
@@ -2633,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"
@@ -2657,43 +2520,15 @@ 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."
-msgstr "Uusia siltoja ei ole juuri nyt saatavana. Voit joko odottaa hetken ja yrittää uudelleen, tai voit kokeilla toista tapaa löytää siltoja."
+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."
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 / HTTPS"
-msgstr "HTTP / HTTPS"
-
-msgctxt "NetworkPage"
-msgid "You must specify one or more bridges."
-msgstr ""
-
msgctxt "Policy"
msgid "accept"
msgstr "salli"
@@ -2847,15 +2682,13 @@ 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."
-msgstr "Olet määritelly Tor-ohjelmasi toimimaan siltareitittimenä sensuroiduille käyttäjille, mutta käyttämäsi Tor-ohjelman versio ei tue siltoja."
+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."
+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"
@@ -2871,6 +2704,10 @@ msgid "Run as a client only"
msgstr "Suorita vain asiakasohjelmana"
msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network"
+msgstr "Välitä tietoa Tor-verkossa"
+
+msgctxt "ServerPage"
msgid "Relay Port:"
msgstr "Reititinportti:"
@@ -2919,9 +2756,7 @@ msgid "Basic Settings"
msgstr "Perusasetukset"
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 "Yhteydet, joilla on nopea latausnopeus mutta hidas lähetys, valitkaa listasta alhaalta lähetysnopeutenne."
msgctxt "ServerPage"
@@ -2977,9 +2812,7 @@ 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."
+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"
@@ -3039,14 +2872,13 @@ 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?"
-msgstr "Mitä Internet-palveluita käyttäjien pitäisi voida käyttää reitittimesi kautta?"
+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."
+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"
@@ -3058,9 +2890,9 @@ 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"
-msgstr "Tämä on siltareitittimesi henkilöllisyys, jonka voi antaa muille käyttäjille"
+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"
msgctxt "ServerPage"
msgid "Copy your bridge relay's identity to the clipboard"
@@ -3075,10 +2907,10 @@ 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."
-msgstr "Jätä reitittimesi päälle niin että käyttäjillä on paremmat mahdollisuudet löytää ja käyttää sitä."
+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ä."
msgctxt "ServerPage"
msgid "Bridge History"
@@ -3089,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"
@@ -3107,39 +2937,23 @@ 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 "Jaa siltaosoitteeni automaattisesti"
-
-msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network (exit relay)"
-msgstr ""
-
-msgctxt "ServerPage"
-msgid "Relay traffic inside the Tor network (non-exit relay)"
-msgstr ""
-
-msgctxt "ServerPage"
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.\nVoit myös lisätä PGP tai GPG tunnuksesi."
+msgstr ""
+"Sähköpostiosoite josta sinut voidaan tavoittaa jos reitittimesi kanssa on "
+"ongelmia.\n"
+"Voit myös lisätä PGP tai GPG tunnuksesi."
msgctxt "ServicePage"
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."
+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"
@@ -3214,251 +3028,6 @@ 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 "Tor-sovellus päättyi sisäiseen virheeseen. Voit raportoida seuraavan virheviestin Tor-kehittäjille osoitteeseen 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 ""
-
-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 "Tietokoneesi kello on mahdollisesti väärässä"
-
-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 "Jokin tietokoneellasi oleva sovellus on saattanut yrittää muodostaa salaamattoman yhteyden Torin kautta porttiin %1. Salaamattoman tiedon lähettäminen Tor-verkon yli on vaarallista, eikä sitä suositella. Tor on automaattisesti sulkenut tämän yhteyden."
-
-msgctxt "StatusEventWidget"
-msgid ""
-"One of the applications on your computer may have attempted to make an "
-"unencrypted connection through Tor to port %1. Sending unencrypted "
-"information over the Tor network is dangerous and not recommended."
-msgstr "Jokin tietokoneellasi oleva sovellus on saattanut yrittää muodostaa salaamattoman yhteyden Torin kautta porttiin %1. Salaamattoman tiedon lähettäminen Tor-verkon yli on vaarallista, eikä sitä suositella."
-
-msgctxt "StatusEventWidget"
-msgid "Potentially Dangerous Connection!"
-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 "Jokin tietokoneellasi oleva sovellus muodosti yhteyden Torin kautta osoitteeseen \"%1\" käyttäen protokollaa, joka voi vuotaa tietoa yhteyden kohteesta. Varmista, että olet asettanut sovellukset käyttämään vain SOCKS4:sta tai SOCKS5:sta isäntäkoneen nimen selvittämiseen."
-
-msgctxt "StatusEventWidget"
-msgid "Unknown SOCKS Protocol"
-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 "Ulkoinen IP-osoite on muuttunut"
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Tor has determined your relay's public IP address is currently %1%2. If that"
-" is not correct, please consider setting the 'Address' option in your "
-"relay's configuration."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "DNS Hijacking Detected"
-msgstr "DNS-kaappaus havaittu"
-
-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 "Tarkistetaan palvelimen portin saavutettavuutta"
-
-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"
@@ -3511,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"
@@ -3630,16 +3137,16 @@ 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'."
-msgstr "Vidalia ei onnistunut tarkistamaan ohjelmistopäivityksien varalta koska kohdetta '%1' ei löytynyt."
+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."
-msgstr "Vidalia ei onnistunut tarkistamaan ohjelmistopäivityksien varalta koska Tor:in päivitysprosessi suljettiin yllättäen."
+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."
msgctxt "UpdateProgressDialog"
msgid "Checking for available updates..."
@@ -3794,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 "Parametri vaatii arvon :"
-
-msgctxt "Vidalia"
msgid "Invalid language code specified:"
msgstr "Virheellinen kielikoodi määritettynä:"
@@ -3810,11 +3313,14 @@ 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\nHaluatko jatkaa ja käynnistää Vidalian?"
+msgstr ""
+"Toinen Vidalia prosessi on mahdollisesti jo käynnissä. Jos näin on, voit "
+"jatkaa jokatapauksessa.\n"
+"\n"
+"Haluatko jatkaa ja käynnistää Vidalian?"
msgctxt "stringutil.h"
msgid "%1 secs"
diff --git a/src/vidalia/i18n/po/fil/qt_fil.po b/src/vidalia/i18n/po/fil/qt_fil.po
index d4811fc..f32a87f 100644
--- a/src/vidalia/i18n/po/fil/qt_fil.po
+++ b/src/vidalia/i18n/po/fil/qt_fil.po
@@ -1,11 +1,10 @@
#
-# Translators:
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-08-20 03:25+0000\n"
-"PO-Revision-Date: 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"
@@ -431,5 +430,3 @@ msgstr ""
msgctxt "QFileSystemModel"
msgid "%1 bytes"
msgstr ""
-
-
diff --git a/src/vidalia/i18n/po/fil/vidalia_fil.po b/src/vidalia/i18n/po/fil/vidalia_fil.po
index f8eb119..86a1aec 100644
--- a/src/vidalia/i18n/po/fil/vidalia_fil.po
+++ b/src/vidalia/i18n/po/fil/vidalia_fil.po
@@ -1,11 +1,10 @@
#
-# Translators:
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-09-07 14:40+0000\n"
-"PO-Revision-Date: 2010-12-05 20:03+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"
@@ -193,10 +192,6 @@ 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"
@@ -236,10 +231,6 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr ""
-
-msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -279,6 +270,10 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr ""
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -432,17 +427,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"
@@ -1266,44 +1270,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"
@@ -1331,10 +1342,6 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr ""
-
-msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1362,6 +1369,10 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr ""
+
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1644,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 ""
@@ -1680,10 +1663,6 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1796,10 +1775,6 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1882,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 ""
@@ -1934,82 +1897,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 ""
@@ -2057,19 +1949,39 @@ 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)"
+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"
@@ -2091,17 +2003,35 @@ msgid ""
msgstr ""
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"
@@ -2357,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"
@@ -2412,10 +2334,6 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2515,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 ""
@@ -2840,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 ""
@@ -3088,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 ""
@@ -3132,10 +3070,6 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
-msgid "Form"
-msgstr ""
-
-msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3424,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 ""
@@ -3460,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 ""
@@ -3538,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 ""
@@ -3666,6 +3646,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 ""
@@ -3759,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 ""
@@ -3812,5 +3796,3 @@ msgstr ""
msgctxt "stringutil.h"
msgid "%1 mins"
msgstr ""
-
-
diff --git a/src/vidalia/i18n/po/fo/qt_fo.po b/src/vidalia/i18n/po/fo/qt_fo.po
index b49f584..18ad62a 100644
--- a/src/vidalia/i18n/po/fo/qt_fo.po
+++ b/src/vidalia/i18n/po/fo/qt_fo.po
@@ -1,11 +1,10 @@
#
-# Translators:
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-08-20 03:25+0000\n"
-"PO-Revision-Date: 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"
@@ -431,5 +430,3 @@ msgstr ""
msgctxt "QFileSystemModel"
msgid "%1 bytes"
msgstr ""
-
-
diff --git a/src/vidalia/i18n/po/fo/vidalia_fo.po b/src/vidalia/i18n/po/fo/vidalia_fo.po
index 950382d..22b0f4e 100644
--- a/src/vidalia/i18n/po/fo/vidalia_fo.po
+++ b/src/vidalia/i18n/po/fo/vidalia_fo.po
@@ -1,18 +1,15 @@
-#
-# Translators:
+#, fuzzy
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: 2010-12-05 20:03+0000\n"
-"Last-Translator: \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: 2009-05-19 23:56+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
+"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: fo\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
"X-Generator: Vidalia ts2po 0.2\n"
msgctxt "AboutDialog"
@@ -35,13 +32,28 @@ msgctxt "AboutDialog"
msgid "Qt 4.4.2"
msgstr ""
+msgctxt "AboutDialog"
+msgid "Vidalia"
+msgstr ""
+
+msgctxt "AboutDialog"
+msgid "Tor"
+msgstr ""
+
+msgctxt "AboutDialog"
+msgid "Qt"
+msgstr ""
+
+msgctxt "AboutDialog"
+msgid "version"
+msgstr ""
+
msgctxt "AdvancedPage"
msgid "'%1' is not a valid IP address."
msgstr ""
msgctxt "AdvancedPage"
-msgid ""
-"You selected 'Password' authentication, but did not specify a password."
+msgid "You selected 'Password' authentication, but did not specify a password."
msgstr ""
msgctxt "AdvancedPage"
@@ -81,6 +93,10 @@ msgid "Vidalia was unable to install the Tor service."
msgstr ""
msgctxt "AdvancedPage"
+msgid "Control Port"
+msgstr ""
+
+msgctxt "AdvancedPage"
msgid "Authentication:"
msgstr ""
@@ -137,68 +153,7 @@ msgid "Select the directory used to store data for the Tor software"
msgstr ""
msgctxt "AdvancedPage"
-msgid "Tor Control"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "Use TCP connection (ControlPort)"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "Path:"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "Use Unix domain socket (ControlSocket)"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "Edit current torrc"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "NOTE: this will edit the currently loaded torrc"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "ControlSocket path doesn't exist."
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid ""
-"The specified Tor configuration file location contains characters that "
-"cannot be represented in your system's current 8-bit character encoding."
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid ""
-"The specified Tor data directory location contains characters that cannot be"
-" represented in your system's current 8-bit character encoding."
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "Warning"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "You changed torrc path, would you like to restart Tor?"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "Tor Configuration File (torrc);;All Files (*)"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "Select a file to use for Tor socket path"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "Configure ControlPort automatically"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid ""
-"Vidalia was unable to remove the Tor service.\n"
+msgid "Vidalia was unable to remove the Tor service.\n"
"\n"
"You may need to remove it manually."
msgstr ""
@@ -440,9 +395,7 @@ msgid "Remember my password"
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid ""
-"Vidalia has connected to a running Tor process that requires a password. "
-"Please enter your control password:"
+msgid "Vidalia has connected to a running Tor process that requires a password. Please enter your control password:"
msgstr ""
msgctxt "ControlSocket"
@@ -1158,10 +1111,6 @@ msgid "Zimbabwe"
msgstr ""
msgctxt "CountryInfo"
-msgid "Zaire"
-msgstr ""
-
-msgctxt "CountryInfo"
msgid "Albania"
msgstr ""
@@ -1257,55 +1206,6 @@ msgctxt "CountryInfo"
msgid "Taiwan"
msgstr ""
-msgctxt "CrashReportDialog"
-msgid "Submit a Crash Report"
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid "Vidalia encountered an error and needed to close"
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid "Restart Vidalia"
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid "Don't Restart"
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid "Unable to restart Vidalia"
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid ""
-"We were unable to automatically restart Vidalia. Please restart Vidalia "
-"manually."
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid "Please fill a ticket in:"
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid ""
-"<a "
-"href=\"https://trac.torproject.org/projects/tor/newticket\">https://trac.torproject.org/projects/tor/newticket</a>"
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid ""
-"A crash report has been created that you can send to the Vidalia developers "
-"to help identify and fix the problem. The submitted report does not contain "
-"any personally identifying information."
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid ""
-"with a description of what you were doing before the application crashed, "
-"along with the following files corresponding to the crash report:"
-msgstr ""
-
msgctxt "GeneralPage"
msgid "Executables (*.exe)"
msgstr ""
@@ -1323,6 +1223,10 @@ msgid "You must specify the name of your Tor executable."
msgstr ""
msgctxt "GeneralPage"
+msgid "The proxy arguments specified are not properly formatted."
+msgstr ""
+
+msgctxt "GeneralPage"
msgid "Start Vidalia when my system starts"
msgstr ""
@@ -1519,10 +1423,7 @@ msgid "Opening External Link"
msgstr ""
msgctxt "HelpTextBrowser"
-msgid ""
-"Vidalia can open the link you selected in your default Web browser. If your "
-"browser is not currently configured to use Tor then the request will not be "
-"anonymous."
+msgid "Vidalia can open the link you selected in your default Web browser. If your browser is not currently configured to use Tor then the request will not be anonymous."
msgstr ""
msgctxt "HelpTextBrowser"
@@ -1534,9 +1435,7 @@ msgid "Unable to Open Link"
msgstr ""
msgctxt "HelpTextBrowser"
-msgid ""
-"Vidalia was unable to open the selected link in your Web browser. You can "
-"still copy the URL and paste it into your browser."
+msgid "Vidalia was unable to open the selected link in your Web browser. You can still copy the URL and paste it into your browser."
msgstr ""
msgctxt "HelpTextBrowser"
@@ -1579,30 +1478,6 @@ msgctxt "LogEvent"
msgid "Unknown"
msgstr ""
-msgctxt "LogTreeItem"
-msgid "Debug"
-msgstr ""
-
-msgctxt "LogTreeItem"
-msgid "Info"
-msgstr ""
-
-msgctxt "LogTreeItem"
-msgid "Notice"
-msgstr ""
-
-msgctxt "LogTreeItem"
-msgid "Warning"
-msgstr ""
-
-msgctxt "LogTreeItem"
-msgid "Error"
-msgstr ""
-
-msgctxt "LogTreeItem"
-msgid "Unknown"
-msgstr ""
-
msgctxt "MainWindow"
msgid "Start Tor"
msgstr ""
@@ -1816,9 +1691,7 @@ msgid "Error Starting Tor"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Vidalia was unable to start Tor. Check your settings to ensure the correct "
-"name and location of your Tor executable is specified."
+msgid "Vidalia was unable to start Tor. Check your settings to ensure the correct name and location of your Tor executable is specified."
msgstr ""
msgctxt "MainWindow"
@@ -1854,9 +1727,7 @@ msgid "Cookie Authentication Required"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"The Tor software requires Vidalia to send the contents of an authentication "
-"cookie, but Vidalia was unable to find one."
+msgid "The Tor software requires Vidalia to send the contents of an authentication cookie, but Vidalia was unable to find one."
msgstr ""
msgctxt "MainWindow"
@@ -1876,9 +1747,7 @@ msgid "Error Registering for Events"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Vidalia was unable to register for some events. Many of Vidalia's features "
-"may be unavailable."
+msgid "Vidalia was unable to register for some events. Many of Vidalia's features may be unavailable."
msgstr ""
msgctxt "MainWindow"
@@ -1898,9 +1767,7 @@ msgid "Tor Update Available"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended. Please visit the Tor website to download the latest version."
+msgid "The currently installed version of Tor is out of date or no longer recommended. Please visit the Tor website to download the latest version."
msgstr ""
msgctxt "MainWindow"
@@ -1908,9 +1775,7 @@ msgid "Tor website: %1"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"All subsequent connections will appear to be different than your old "
-"connections."
+msgid "All subsequent connections will appear to be different than your old connections."
msgstr ""
msgctxt "MainWindow"
@@ -2002,21 +1867,15 @@ msgid "Password Reset Failed"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Vidalia tried to reset Tor's control password, but was not able to restart "
-"the Tor software. Please check your Task Manager to ensure there are no "
-"other Tor processes running."
+msgid "Vidalia tried to reset Tor's control password, but was not able to restart the Tor software. Please check your Task Manager to ensure there are no other Tor processes running."
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended."
+msgid "The currently installed version of Tor is out of date or no longer recommended."
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Would you like to check if a newer package is available for installation?"
+msgid "Would you like to check if a newer package is available for installation?"
msgstr ""
msgctxt "MainWindow"
@@ -2024,9 +1883,11 @@ msgid "Potentially Unsafe Connection"
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 ""
msgctxt "MainWindow"
@@ -2038,9 +1899,7 @@ msgid "Your software is up to date"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"There are no new Tor software packages available for your computer at this "
-"time."
+msgid "There are no new Tor software packages available for your computer at this time."
msgstr ""
msgctxt "MainWindow"
@@ -2056,52 +1915,52 @@ msgid "The following error occurred:"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Anything sent over this connection could be monitored. Please check your "
-"application's configuration and use only encrypted protocols, such as SSL, "
-"if possible."
-msgstr ""
-
-msgctxt "MainWindow"
msgid "failed (%1)"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
+msgid "Your relay is shutting down.\n"
"Click 'Stop' again to stop your relay now."
msgstr ""
msgctxt "MainWindow"
-msgid "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 ""
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 ""
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 ""
+
+msgctxt "MainWindow"
+msgid "File"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "About Vidalia"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Home"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Check For Updates"
msgstr ""
msgctxt "MessageLog"
@@ -2345,68 +2204,50 @@ 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"
+msgid "Always Save New Log Messages"
msgstr ""
msgctxt "MessageLog"
-msgid "Tor Status"
+msgid "Browse"
msgstr ""
msgctxt "MessageLog"
-msgid "Advanced"
+msgid "Enable automatically saving all new log messages to a file"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
+msgid "Automatically save new log messages to a file"
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 ""
msgctxt "MessageLog"
-msgid ""
-"Messages that only appear when \n"
+msgid "Messages that only appear when \n"
"something has gone wrong with Tor."
msgstr ""
msgctxt "MessageLog"
-msgid ""
-"Messages that appear infrequently \n"
+msgid "Messages that appear infrequently \n"
"during normal Tor operation and are \n"
"not considered errors, but you may \n"
"care about."
msgstr ""
msgctxt "MessageLog"
-msgid ""
-"Messages that appear frequently \n"
+msgid "Messages that appear frequently \n"
"during normal Tor operation."
msgstr ""
msgctxt "MessageLog"
-msgid ""
-"Hyper-verbose messages primarily of \n"
+msgid "Hyper-verbose messages primarily of \n"
"interest to Tor developers."
msgstr ""
msgctxt "MessageLog"
-msgid ""
-"Cannot write file %1\n"
+msgid "Cannot write file %1\n"
"\n"
"%2."
msgstr ""
@@ -2528,15 +2369,11 @@ msgid "Copy (Ctrl+C)"
msgstr ""
msgctxt "NetworkPage"
-msgid ""
-"You must specify both an IP address or hostname and a port number to "
-"configure Tor to use a proxy to access the Internet."
+msgid "You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet."
msgstr ""
msgctxt "NetworkPage"
-msgid ""
-"You must specify one or more ports to which your firewall allows you to "
-"connect."
+msgid "You must specify one or more ports to which your firewall allows you to connect."
msgstr ""
msgctxt "NetworkPage"
@@ -2556,10 +2393,18 @@ msgid "Proxy Settings"
msgstr ""
msgctxt "NetworkPage"
+msgid "HTTP Proxy:"
+msgstr ""
+
+msgctxt "NetworkPage"
msgid "Username:"
msgstr ""
msgctxt "NetworkPage"
+msgid "Use this proxy for HTTPS also"
+msgstr ""
+
+msgctxt "NetworkPage"
msgid "Password:"
msgstr ""
@@ -2588,9 +2433,7 @@ msgid "80, 443"
msgstr ""
msgctxt "NetworkPage"
-msgid ""
-"Check to encrypt directory requests and, optionally, use bridge relays to "
-"access the Tor network"
+msgid "Check to encrypt directory requests and, optionally, use bridge relays to access the Tor network"
msgstr ""
msgctxt "NetworkPage"
@@ -2602,10 +2445,18 @@ msgid "Bridge Settings"
msgstr ""
msgctxt "NetworkPage"
+msgid "The Tor software you are currently running does not support bridges. <br>Directory connections will still be encrypted."
+msgstr ""
+
+msgctxt "NetworkPage"
msgid "Add a Bridge:"
msgstr ""
msgctxt "NetworkPage"
+msgid "<a href=\"bridges.finding\">How do I find a bridge?</a>"
+msgstr ""
+
+msgctxt "NetworkPage"
msgid "Remove the selected bridges from the list"
msgstr ""
@@ -2626,43 +2477,13 @@ msgid "<a href=\"bridges.finding\">How can I find bridges?</a>"
msgstr ""
msgctxt "NetworkPage"
-msgid ""
-"No new bridges are currently available. You can either wait a while and try "
-"again, or try another method of finding new bridges."
+msgid "No new bridges are currently available. You can either wait a while and try again, or try another method of finding new bridges."
msgstr ""
msgctxt "NetworkPage"
msgid "Click Help to see other methods of finding new bridges."
msgstr ""
-msgctxt "NetworkPage"
-msgid "Address:"
-msgstr ""
-
-msgctxt "NetworkPage"
-msgid "Type:"
-msgstr ""
-
-msgctxt "NetworkPage"
-msgid "You must select the proxy type."
-msgstr ""
-
-msgctxt "NetworkPage"
-msgid "SOCKS 4"
-msgstr ""
-
-msgctxt "NetworkPage"
-msgid "SOCKS 5"
-msgstr ""
-
-msgctxt "NetworkPage"
-msgid "HTTP"
-msgstr ""
-
-msgctxt "NetworkPage"
-msgid "HTTP / HTTPS"
-msgstr ""
-
msgctxt "Policy"
msgid "accept"
msgstr ""
@@ -2816,15 +2637,11 @@ msgid "Bridge Support Unavailable"
msgstr ""
msgctxt "ServerPage"
-msgid ""
-"You have configured Tor to act as a bridge relay for censored users, but "
-"your version of Tor does not support bridges."
+msgid "You have configured Tor to act as a bridge relay for censored users, but your version of Tor does not support bridges."
msgstr ""
msgctxt "ServerPage"
-msgid ""
-"Please upgrade your Tor software or configure Tor to act as a normal Tor "
-"relay."
+msgid "Please upgrade your Tor software or configure Tor to act as a normal Tor relay."
msgstr ""
msgctxt "ServerPage"
@@ -2892,9 +2709,7 @@ msgid "Basic Settings"
msgstr ""
msgctxt "ServerPage"
-msgid ""
-"For Internet connections with fast download speed but slow upload, please "
-"list your upload speed here."
+msgid "For Internet connections with fast download speed but slow upload, please list your upload speed here."
msgstr ""
msgctxt "ServerPage"
@@ -2950,9 +2765,7 @@ msgid "Peak bandwidth rate limit"
msgstr ""
msgctxt "ServerPage"
-msgid ""
-"Your maximum bandwidth rate must be greater than or equal to your average "
-"bandwidth rate. Both values must be at least 20 KB/s."
+msgid "Your maximum bandwidth rate must be greater than or equal to your average bandwidth rate. Both values must be at least 20 KB/s."
msgstr ""
msgctxt "ServerPage"
@@ -3012,14 +2825,11 @@ msgid "Show help topic on exit policies"
msgstr ""
msgctxt "ServerPage"
-msgid ""
-"What Internet resources should users be able to access from your relay?"
+msgid "What Internet resources should users be able to access from your relay?"
msgstr ""
msgctxt "ServerPage"
-msgid ""
-"Tor will still block some outgoing mail and file sharing applications by "
-"default to reduce spam and other abuse."
+msgid "Tor will still block some outgoing mail and file sharing applications by default to reduce spam and other abuse."
msgstr ""
msgctxt "ServerPage"
@@ -3031,8 +2841,7 @@ msgid "Let others access your bridge by giving them this line:"
msgstr ""
msgctxt "ServerPage"
-msgid ""
-"This is the identity of your bridge relay that you can give to other people"
+msgid "This is the identity of your bridge relay that you can give to other people"
msgstr ""
msgctxt "ServerPage"
@@ -3048,9 +2857,7 @@ msgid "No clients have used your relay recently."
msgstr ""
msgctxt "ServerPage"
-msgid ""
-"Leave your relay running so clients have a better chance of finding and "
-"using it."
+msgid "Leave your relay running so clients have a better chance of finding and using it."
msgstr ""
msgctxt "ServerPage"
@@ -3062,9 +2869,7 @@ msgid "Vidalia was unable to retrieve your bridge's usage history."
msgstr ""
msgctxt "ServerPage"
-msgid ""
-"Tor returned an improperly formatted response when Vidalia requested your "
-"bridge's usage history."
+msgid "Tor returned an improperly formatted response when Vidalia requested your bridge's usage history."
msgstr ""
msgctxt "ServerPage"
@@ -3080,20 +2885,11 @@ msgid "<a href=\"#bridgeUsage\">Who has used my bridge?</a>"
msgstr ""
msgctxt "ServerPage"
-msgid "<a href=\"#bridgeHelp\">What's this?</a>"
-msgstr ""
-
-msgctxt "ServerPage"
-msgid "Automatically distribute my bridge address"
-msgstr ""
-
-msgctxt "ServerPage"
msgid "Mirror the Relay Directory"
msgstr ""
msgctxt "ServerPage"
-msgid ""
-"Email address at which you may be reached if there is a\n"
+msgid "Email address at which you may be reached if there is a\n"
"problem with your relay. You might also include your PGP or GPG fingerprint."
msgstr ""
@@ -3102,9 +2898,7 @@ msgid "Error while trying to unpublish all services"
msgstr ""
msgctxt "ServicePage"
-msgid ""
-"Please configure at least a service directory and a virtual port for each "
-"service you want to save. Remove the other ones."
+msgid "Please configure at least a service directory and a virtual port for each service you want to save. Remove the other ones."
msgstr ""
msgctxt "ServicePage"
@@ -3179,251 +2973,6 @@ msgctxt "ServicePage"
msgid "Created by Tor"
msgstr ""
-msgctxt "StatusEventWidget"
-msgid "Copy to Clipboard"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "The Tor Software is Running"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "You are currently running version \"%1\" of the Tor software."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "The Tor Software is not Running"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Click \"Start Tor\" in the Vidalia Control Panel to restart the Tor "
-"software. If Tor exited unexpectedly, select the \"Advanced\" tab above for "
-"details about any errors encountered."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"You are currently running version \"%1\" of the Tor software, which is no "
-"longer recommended. Please upgrade to the most recent version of the "
-"software, which may contain important security, reliability and performance "
-"fixes."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"You are currently running version \"%1\" of the Tor software, which may no "
-"longer work with the current Tor network. Please upgrade to the most recent "
-"version of the software, which may contain important security, reliability "
-"and performance fixes."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Your Tor Software is Out-of-date"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Connected to the Tor Network"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"We were able to successfully establish a connection to the Tor network. You "
-"can now configure your applications to use the Internet anonymously."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Tor Software Error"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"The Tor software encountered an internal bug. Please report the following "
-"error message to the Tor developers at bugs.torproject.org: \"%1\""
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Tor has determined that your computer's clock may be set to %1 seconds in "
-"the past compared to the source \"%2\". If your clock is not correct, Tor "
-"will not be able to function. Please verify your computer displays the "
-"correct time."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Tor has determined that your computer's clock may be set to %1 seconds in "
-"the future compared to the source \"%2\". If your clock is not correct, Tor "
-"will not be able to function. Please verify your computer displays the "
-"correct time."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Your Computer's Clock is Potentially Incorrect"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"One of the applications on your computer may have attempted to make an "
-"unencrypted connection through Tor to port %1. Sending unencrypted "
-"information over the Tor network is dangerous and not recommended. For your "
-"protection, Tor has automatically closed this connection."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"One of the applications on your computer may have attempted to make an "
-"unencrypted connection through Tor to port %1. Sending unencrypted "
-"information over the Tor network is dangerous and not recommended."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Potentially Dangerous Connection!"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"One of your applications established a connection through Tor to \"%1\" "
-"using a protocol that may leak information about your destination. Please "
-"ensure you configure your applications to use only SOCKS4a or SOCKS5 with "
-"remote hostname resolution."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Unknown SOCKS Protocol"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"One of your applications tried to establish a connection through Tor using a"
-" protocol that Tor does not understand. Please ensure you configure your "
-"applications to use only SOCKS4a or SOCKS5 with remote hostname resolution."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Invalid Destination Hostname"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"One of your applications tried to establish a connection through Tor to "
-"\"%1\", which Tor does not recognize as a valid hostname. Please check your "
-"application's configuration."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "External IP Address Changed"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Tor has determined your relay's public IP address is currently %1%2. If that"
-" is not correct, please consider setting the 'Address' option in your "
-"relay's configuration."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "DNS Hijacking Detected"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Tor detected that your DNS provider is providing false responses for domains"
-" that do not exist. Some ISPs and other DNS providers, such as OpenDNS, are "
-"known to do this in order to display their own search or advertising pages."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Tor detected that your DNS provider is providing false responses for well "
-"known domains. Since clients rely on Tor network relays to provide accurate "
-"DNS repsonses, your relay will not be configured as an exit relay."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Checking Server Port Reachability"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Tor is trying to determine if your relay's server port is reachable from the"
-" Tor network by connecting to itself at %1:%2. This test could take several "
-"minutes."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Server Port Reachability Test Successful!"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Your relay's server port is reachable from the Tor network!"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Server Port Reachability Test Failed"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Your relay's server port is not reachable by other Tor clients. This can "
-"happen if you are behind a router or firewall that requires you to set up "
-"port forwarding. If %1:%2 is not your correct IP address and server port, "
-"please check your relay's configuration."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Checking Directory Port Reachability"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Tor is trying to determine if your relay's directory port is reachable from "
-"the Tor network by connecting to itself at %1:%2. This test could take "
-"several minutes."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Directory Port Reachability Test Successful!"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Your relay's directory port is reachable from the Tor network!"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Directory Port Reachability Test Failed"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Your relay's directory port is not reachable by other Tor clients. This can "
-"happen if you are behind a router or firewall that requires you to set up "
-"port forwarding. If %1:%2 is not your correct IP address and directory port,"
-" please check your relay's configuration."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Relay Descriptor Rejected"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Your relay's descriptor, which enables clients to connect to your relay, was"
-" rejected by the directory server at %1:%2. The reason given was: %3"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Your Relay is Online"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Your relay is now online and available for Tor clients to use. You should "
-"see an increase in network traffic shown by the Bandwidth Graph within a few"
-" hours as more clients learn about your relay. Thank you for contributing to"
-" the Tor network!"
-msgstr ""
-
msgctxt "Stream"
msgid "New"
msgstr ""
@@ -3476,68 +3025,6 @@ msgctxt "TorSettings"
msgid "Failed to hash the control password."
msgstr ""
-msgctxt "TorrcDialog"
-msgid "Editing torrc"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid ""
-"Save settings. If unchecked it will only apply settings to the current Tor "
-"instance."
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Cut"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Copy"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Paste"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Undo"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Redo"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Select All"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Apply all"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Apply selection only"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Error connecting to Tor"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Selection is empty. Please select some text, or check \"Apply all\""
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Error at line %1: \"%2\""
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Error"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "An error ocurred while opening torrc file"
-msgstr ""
-
msgctxt "UPNPControl"
msgid "Success"
msgstr ""
@@ -3595,15 +3082,11 @@ msgid "Testing Universal Plug & Play Support"
msgstr ""
msgctxt "UpdateProcess"
-msgid ""
-"Vidalia was unable to check for available software updates because it could "
-"not find '%1'."
+msgid "Vidalia was unable to check for available software updates because it could not find '%1'."
msgstr ""
msgctxt "UpdateProcess"
-msgid ""
-"Vidalia was unable to check for available software updates because Tor's "
-"update process exited unexpectedly."
+msgid "Vidalia was unable to check for available software updates because Tor's update process exited unexpectedly."
msgstr ""
msgctxt "UpdateProgressDialog"
@@ -3759,10 +3242,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 ""
@@ -3775,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 ""
@@ -3812,5 +3290,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 f4a5eb2..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:
-# 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-02-14 09:47+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"
@@ -202,7 +199,9 @@ msgctxt "QFileDialog"
msgid ""
"%1 already exists.\n"
"Do you want to replace it?"
-msgstr "%1 existe déjà.\nVoulez-vous le remplacer ?"
+msgstr ""
+"%1 existe déjà.\n"
+"Voulez-vous le remplacer ?"
#: qfiledialog.cpp:1690
msgctxt "QFileDialog"
@@ -210,7 +209,10 @@ msgid ""
"%1\n"
"File not found.\n"
"Please verify the correct file name was given."
-msgstr "%1\nFichier introuvable.\nVeuillez vérifier que le nom du fichier est correct."
+msgstr ""
+"%1\n"
+"Fichier introuvable.\n"
+"Veuillez vérifier que le nom du fichier est correct."
#: qdirmodel.cpp:833
msgctxt "QFileDialog"
@@ -268,14 +270,19 @@ msgid ""
"%1\n"
"Directory not found.\n"
"Please verify the correct directory name was given."
-msgstr "%1\nDossier introuvable.\nVeuillez vérifier que le nom du dossier est correct."
+msgstr ""
+"%1\n"
+"Dossier introuvable.\n"
+"Veuillez vérifier que le nom du dossier est correct."
#: qfiledialog.cpp:2281
msgctxt "QFileDialog"
msgid ""
"'%1' is write protected.\n"
"Do you want to delete it anyway?"
-msgstr "'%1' est protégé en écriture.\nVoulez-vous quand même le supprimer ?"
+msgstr ""
+"'%1' est protégé en écriture.\n"
+"Voulez-vous quand même le supprimer ?"
#: qfiledialog.cpp:2286
msgctxt "QFileDialog"
@@ -372,7 +379,9 @@ msgctxt "QFileSystemModel"
msgid ""
"<b>The name \"%1\" can not be used.</b><p>Try using another name, with fewer"
" characters or no punctuations marks."
-msgstr "<b>Le nom \"%1\" ne peut pas être utilisé.</b><p>Essayez un autre nom avec moins de caractères ou sans ponctuation."
+msgstr ""
+"<b>Le nom \"%1\" ne peut pas être utilisé.</b><p>Essayez un autre nom avec "
+"moins de caractères ou sans ponctuation."
#: qfilesystemmodel.cpp:832
msgctxt "QFileSystemModel"
diff --git a/src/vidalia/i18n/po/fr/vidalia_fr.po b/src/vidalia/i18n/po/fr/vidalia_fr.po
index ebb7d39..8b9da37 100644
--- a/src/vidalia/i18n/po/fr/vidalia_fr.po
+++ b/src/vidalia/i18n/po/fr/vidalia_fr.po
@@ -1,15 +1,15 @@
#
# Translators:
# arpalord <arpalord at gmail.com>, 2012.
-# mehditaileb <mehditaileb at liberte-info.net>, 2011.
# Pierre Antoine <pierre.antoine at ieee.org>, 2011.
-# runasand <runa.sandvik at gmail.com>, 2011.
+# <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: 2012-03-21 17:52+0000\n"
-"PO-Revision-Date: 2012-03-30 12:25+0000\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"
@@ -46,11 +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"
@@ -62,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]"
@@ -70,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."
@@ -86,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"
@@ -98,7 +98,7 @@ msgstr "Aucun"
msgctxt "AdvancedPage"
msgid "Cookie"
-msgstr "Témoin (cookie)"
+msgstr "Cookie"
msgctxt "AdvancedPage"
msgid "Password"
@@ -106,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 ":"
@@ -118,11 +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"
@@ -130,23 +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:"
@@ -154,65 +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"
-
-msgctxt "AdvancedPage"
-msgid ""
-"You've checked the autoconfiguration option for the ControlPort, but "
-"provided no Data Directory. Please add one, or uncheck the \"Configure "
-"ControlPort automatically\" option."
-msgstr ""
+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\nVous 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"
@@ -220,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"
@@ -228,48 +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."
-
-msgctxt "AppearancePage"
-msgid ""
-"System Icon Preferences (changes will take effect when you restart Vidalia)"
-msgstr ""
-
-msgctxt "AppearancePage"
-msgid "Show the Tray Icon and Dock Icon (default)"
-msgstr ""
-
-msgctxt "AppearancePage"
-msgid "Hide the Tray Icon"
-msgstr ""
-
-msgctxt "AppearancePage"
-msgid "Hide the Dock Icon"
-msgstr ""
+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"
@@ -289,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"
@@ -297,7 +265,7 @@ msgstr "100"
msgctxt "BandwidthGraph"
msgid "% Opaque"
-msgstr "% d'opacité"
+msgstr "Opacité %"
msgctxt "BandwidthGraph"
msgid "Save"
@@ -307,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"
@@ -329,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"
@@ -345,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"
@@ -361,7 +333,7 @@ msgstr "Nouveau"
msgctxt "Circuit"
msgid "Open"
-msgstr "Ouvert"
+msgstr "Ouvrir"
msgctxt "Circuit"
msgid "Building"
@@ -389,7 +361,7 @@ msgstr "Connexion"
msgctxt "CircuitListWidget"
msgid "Status"
-msgstr "État"
+msgstr "Etat"
msgctxt "CircuitListWidget"
msgid "Zoom to Circuit"
@@ -397,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"
@@ -421,7 +393,7 @@ msgstr "Services"
msgctxt "ConfigDialog"
msgid "Appearance"
-msgstr "Interface"
+msgstr "Apparence"
msgctxt "ConfigDialog"
msgid "Advanced"
@@ -433,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"
@@ -449,29 +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 ""
+"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 "Remember my password"
-msgstr "Se souvenir du mot de passe"
+msgid ""
+"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 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."
+"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."
@@ -479,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."
@@ -487,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"
@@ -503,7 +484,7 @@ msgstr "Angola"
msgctxt "CountryInfo"
msgid "Antigua & Barbuda"
-msgstr "Antigua et Barbuda"
+msgstr "Antigua & Barbuda"
msgctxt "CountryInfo"
msgid "Argentina"
@@ -531,7 +512,7 @@ msgstr "Bangladesh"
msgctxt "CountryInfo"
msgid "Barbados"
-msgstr "Barbades"
+msgstr "Barbade"
msgctxt "CountryInfo"
msgid "Belarus"
@@ -547,7 +528,7 @@ msgstr "Bélize"
msgctxt "CountryInfo"
msgid "Bhutan"
-msgstr "Boutan"
+msgstr "Bhoutan"
msgctxt "CountryInfo"
msgid "Bolivia"
@@ -567,7 +548,7 @@ msgstr "Brésil"
msgctxt "CountryInfo"
msgid "Brunei Darussalam"
-msgstr "Brunei"
+msgstr "Brunei Darussalam"
msgctxt "CountryInfo"
msgid "Bulgaria"
@@ -587,7 +568,7 @@ msgstr "Cambodge"
msgctxt "CountryInfo"
msgid "Cameroon"
-msgstr "Cameroon"
+msgstr "Cameroun"
msgctxt "CountryInfo"
msgid "Canada"
@@ -599,7 +580,7 @@ msgstr "Cap Vert"
msgctxt "CountryInfo"
msgid "Central African Republic"
-msgstr "Centre Afrique"
+msgstr "République Centrafricaine"
msgctxt "CountryInfo"
msgid "Chad"
@@ -619,7 +600,7 @@ msgstr "Colombie"
msgctxt "CountryInfo"
msgid "Comoros"
-msgstr "Comores"
+msgstr "Union des Comores"
msgctxt "CountryInfo"
msgid "Congo, The Democratic Republic of the"
@@ -635,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"
@@ -651,7 +632,7 @@ msgstr "Chypre"
msgctxt "CountryInfo"
msgid "Czech Republic"
-msgstr "République tchèque"
+msgstr "République Tchèque"
msgctxt "CountryInfo"
msgid "Denmark"
@@ -667,7 +648,7 @@ msgstr "Dominique"
msgctxt "CountryInfo"
msgid "Dominican Republic"
-msgstr "République dominicaine"
+msgstr "République Dominicaine"
msgctxt "CountryInfo"
msgid "Ecuador"
@@ -675,7 +656,7 @@ msgstr "Equateur"
msgctxt "CountryInfo"
msgid "Egypt"
-msgstr "Egypte"
+msgstr "Égypte"
msgctxt "CountryInfo"
msgid "El Salvador"
@@ -683,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"
@@ -707,7 +688,7 @@ msgstr "Gambie"
msgctxt "CountryInfo"
msgid "Georgia"
-msgstr "Georgie"
+msgstr "Géorgie"
msgctxt "CountryInfo"
msgid "Germany"
@@ -759,7 +740,7 @@ msgstr "Italie"
msgctxt "CountryInfo"
msgid "Jamaica"
-msgstr "Jamaïque"
+msgstr "Jamaique"
msgctxt "CountryInfo"
msgid "Japan"
@@ -855,7 +836,7 @@ msgstr "Mauritanie"
msgctxt "CountryInfo"
msgid "Mauritius"
-msgstr "Ile Maurice"
+msgstr "Maurice"
msgctxt "CountryInfo"
msgid "Micronesia"
@@ -915,7 +896,7 @@ msgstr "Niger"
msgctxt "CountryInfo"
msgid "Nigeria"
-msgstr "Nigéria"
+msgstr "Nigeria"
msgctxt "CountryInfo"
msgid "Norway"
@@ -931,7 +912,7 @@ msgstr "Pakistan"
msgctxt "CountryInfo"
msgid "Palau"
-msgstr "Palaos"
+msgstr "Les Palaos"
msgctxt "CountryInfo"
msgid "Palestine"
@@ -951,7 +932,7 @@ msgstr "Paraguay"
msgctxt "CountryInfo"
msgid "Peru"
-msgstr "Péru"
+msgstr "Pérou"
msgctxt "CountryInfo"
msgid "Philippines"
@@ -983,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"
@@ -999,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"
@@ -1055,7 +1036,7 @@ msgstr "Espagne"
msgctxt "CountryInfo"
msgid "Sri Lanka"
-msgstr "Sri Lanka"
+msgstr "Sri lanka"
msgctxt "CountryInfo"
msgid "Sudan"
@@ -1063,7 +1044,7 @@ msgstr "Soudan"
msgctxt "CountryInfo"
msgid "Suriname"
-msgstr "Surinam"
+msgstr "Suriname"
msgctxt "CountryInfo"
msgid "Swaziland"
@@ -1083,7 +1064,7 @@ msgstr "Syrie"
msgctxt "CountryInfo"
msgid "Tajikistan"
-msgstr "Tadjikistan"
+msgstr "Tajikistan"
msgctxt "CountryInfo"
msgid "Tanzania"
@@ -1091,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"
@@ -1107,7 +1088,7 @@ msgstr "Tonga"
msgctxt "CountryInfo"
msgid "Trinidad & Tobago"
-msgstr "Trinité & Tobago"
+msgstr "Trinité-et-Tobago"
msgctxt "CountryInfo"
msgid "Tunisia"
@@ -1143,7 +1124,7 @@ msgstr "Royaume Uni"
msgctxt "CountryInfo"
msgid "United States"
-msgstr "Etats Unis"
+msgstr "Etats Unies"
msgctxt "CountryInfo"
msgid "Uruguay"
@@ -1151,7 +1132,7 @@ msgstr "Uruguay"
msgctxt "CountryInfo"
msgid "Uzbekistan"
-msgstr "Ouzbékistan"
+msgstr "Uzbekistan"
msgctxt "CountryInfo"
msgid "Vanuatu"
@@ -1159,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"
@@ -1171,7 +1152,7 @@ msgstr "Vietnam"
msgctxt "CountryInfo"
msgid "Western Sahara"
-msgstr "Sahara Occidental"
+msgstr "Sahara occidental"
msgctxt "CountryInfo"
msgid "Yemen"
@@ -1187,7 +1168,7 @@ msgstr "Zimbabwe"
msgctxt "CountryInfo"
msgid "Zaire"
-msgstr "Zaire"
+msgstr "Zaïre"
msgctxt "CountryInfo"
msgid "Albania"
@@ -1203,7 +1184,7 @@ msgstr "Autriche"
msgctxt "CountryInfo"
msgid "Bahrain"
-msgstr "Bahreïn"
+msgstr "Bahrain"
msgctxt "CountryInfo"
msgid "Benin"
@@ -1215,7 +1196,7 @@ msgstr "Ethiopie"
msgctxt "CountryInfo"
msgid "Fiji"
-msgstr "Fidji"
+msgstr "Fiji"
msgctxt "CountryInfo"
msgid "Finland"
@@ -1255,7 +1236,7 @@ msgstr "Irak"
msgctxt "CountryInfo"
msgid "Ireland"
-msgstr "Irelande"
+msgstr "Irlande"
msgctxt "CountryInfo"
msgid "Korea, North"
@@ -1287,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"
@@ -1309,30 +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 "CrashReportUploader"
+msgid "Connecting..."
+msgstr "Connexion..."
-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 "Envoi du rapport d'erreur..."
-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 "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:"
@@ -1555,7 +1543,7 @@ msgstr "Vidalia peut ouvrir le lien que vous avez sélectionné dans votre navig
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"
@@ -1565,11 +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"
@@ -1577,7 +1565,7 @@ msgstr "Information sur la licence"
msgctxt "LicenseDialog"
msgid "License"
-msgstr "Licence"
+msgstr "License"
msgctxt "LicenseDialog"
msgid "Credits"
@@ -1585,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"
@@ -1617,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"
@@ -1661,7 +1649,7 @@ msgstr "Paramètres"
msgctxt "MainWindow"
msgid "About"
-msgstr "À propos"
+msgstr "A propos"
msgctxt "MainWindow"
msgid "Help"
@@ -1669,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"
@@ -1705,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"
@@ -1721,15 +1677,15 @@ 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"
@@ -1741,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"
@@ -1753,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"
@@ -1769,11 +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 du démarrage inconnu"
msgctxt "MainWindow"
msgid "miscellaneous"
@@ -1820,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"
@@ -1837,13 +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"
@@ -1851,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"
@@ -1859,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."
@@ -1875,7 +1831,7 @@ msgstr "Authentification à Tor"
msgctxt "MainWindow"
msgid "Cookie Authentication Required"
-msgstr "Cookie d'authentification requis"
+msgstr "Authentification par cookie requis"
msgctxt "MainWindow"
msgid ""
@@ -1889,7 +1845,7 @@ msgstr "Voulez-vous effectuer manuellement la recherche du fichier 'control_auth
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)"
@@ -1897,7 +1853,7 @@ 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 ""
@@ -1906,18 +1862,6 @@ msgid ""
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."
-
-msgctxt "MainWindow"
msgid "Tor Update Available"
msgstr "Une mise à jour de Tor est disponible"
@@ -1929,25 +1873,25 @@ msgstr "La version actuellement installée de Tor est obsolète et n'est plus re
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"
@@ -1955,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"
@@ -2027,13 +1907,6 @@ 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."
@@ -2041,7 +1914,7 @@ msgstr "La version actuellement installée de Tor est obsolète et n'est plus re
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"
@@ -2051,11 +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"
@@ -2065,15 +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:"
@@ -2081,67 +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."
-
-msgctxt "MainWindow"
-msgid "Bootstrapping torrc from %1 to %2"
-msgstr "Exécution de torrc de %1 à %2"
+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 "(probably Telnet)"
-msgstr "(probablement Telnet)"
+msgid "toolBar"
+msgstr "Barre d'outils"
msgctxt "MainWindow"
-msgid "(probably an email client)"
-msgstr "(probably un client de messagerie)"
+msgid "Start"
+msgstr "Démarrer"
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."
+msgid "Stop"
+msgstr "Arrêter"
msgctxt "MainWindow"
-msgid "failed (%1)"
-msgstr "échec (%1)"
+msgid "Restart"
+msgstr "Redémarrer"
msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
-msgstr "Votre relais s'arrête.\nCliquer 'Arrêter' à nouveau pour arrêter votre relais immédiatement."
+msgid "Reload Tor's config"
+msgstr "Relancer le fichier de configuration Tor"
msgctxt "MainWindow"
-msgid ""
-"Vidalia can't find out how to talk to Tor because it can't access this file: %1\n"
-"\n"
-"Here's the last error message:\n"
-"%2"
-msgstr ""
+msgid "Actions"
+msgstr "Actions"
msgctxt "MainWindow"
-msgid ""
-"It seems Tor has stopped running since Vidalia started it.\n"
-"\n"
-"See the Advanced Message Log for more information."
-msgstr ""
+msgid "Bootstrapping torrc from %1 to %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\nVoulez 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\nVeuillez 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 ""
+"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 "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 ""
+"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"
@@ -2153,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"
@@ -2169,7 +2065,7 @@ msgstr "Vous devez entrer un nom de fichier pour pouvoir enregistrer les message
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"
@@ -2177,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"
@@ -2189,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."
@@ -2245,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)"
@@ -2273,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"
@@ -2301,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)"
@@ -2337,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"
@@ -2353,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"
@@ -2393,35 +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\nun problème s'est produit avec Tor."
+msgstr ""
msgctxt "MessageLog"
msgid ""
@@ -2429,19 +2317,19 @@ msgid ""
"during normal Tor operation and are \n"
"not considered errors, but you may \n"
"care about."
-msgstr "Messages qui apparaissent de manière peu fréquente\ndurant le fonctionnement normal\nde Tor et ne sont pas considérés comme\ndes erreurs, mais dont vous devez tenir\ncompte."
+msgstr ""
msgctxt "MessageLog"
msgid ""
"Messages that appear frequently \n"
"during normal Tor operation."
-msgstr "Messages qui apparaissent fréquemment \ndurant le fonctionnement de Tor"
+msgstr ""
msgctxt "MessageLog"
msgid ""
"Hyper-verbose messages primarily of \n"
"interest to Tor developers."
-msgstr "Nombreux Messages destiné à \nl'usage principal des développeurs \nde Tor."
+msgstr ""
msgctxt "MessageLog"
msgid ""
@@ -2451,16 +2339,12 @@ msgid ""
msgstr "Impossible d'écrire le fichier %1\n\n%2."
msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr "Carte du réseau Tor"
-
-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"
@@ -2472,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"
@@ -2492,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 "+"
@@ -2508,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 "-"
@@ -2532,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"
@@ -2548,12 +2432,36 @@ 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 la passerelle défini est invalide."
+
msgctxt "NetworkPage"
msgid "Copy (Ctrl+C)"
msgstr "Copier (Ctrl+C)"
@@ -2562,13 +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."
@@ -2584,19 +2492,19 @@ 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"
@@ -2608,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"
@@ -2622,7 +2530,7 @@ 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"
@@ -2630,7 +2538,7 @@ msgstr "Mon fournisseur d'accès à Internet bloque les connexions au réseau To
msgctxt "NetworkPage"
msgid "Bridge Settings"
-msgstr "Paramètres de Passerelle"
+msgstr "Paramètres de la passerelle"
msgctxt "NetworkPage"
msgid "Add a Bridge:"
@@ -2638,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"
@@ -2660,7 +2568,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 "Pas de nouvelle passerelle disponible. Vous pouvez soit attendre un peu et réessayer, ou encore essayer une autre méthode pour trouver de nouvelles passerelles."
+msgstr ""
msgctxt "NetworkPage"
msgid "Click Help to see other methods of finding new bridges."
@@ -2676,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"
@@ -2687,12 +2595,12 @@ msgid "SOCKS 5"
msgstr "SOCKS 5"
msgctxt "NetworkPage"
-msgid "HTTP / HTTPS"
-msgstr "HTTP / HTTPS"
+msgid "HTTP"
+msgstr "HTTP"
msgctxt "NetworkPage"
-msgid "You must specify one or more bridges."
-msgstr "Vous devez définir un ou plusieurs pont."
+msgid "HTTP / HTTPS"
+msgstr "HTTP / HTTPS"
msgctxt "Policy"
msgid "accept"
@@ -2760,7 +2668,7 @@ msgstr "Inconnu"
msgctxt "RouterInfoDialog"
msgid "Relay Details"
-msgstr "Détails du Relais"
+msgstr "Détails du relai"
msgctxt "RouterInfoDialog"
msgid "Summary"
@@ -2772,7 +2680,7 @@ msgstr "Nom :"
msgctxt "RouterInfoDialog"
msgid "Status:"
-msgstr "État :"
+msgstr "Etat :"
msgctxt "RouterInfoDialog"
msgid "Location:"
@@ -2820,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"
@@ -2868,11 +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"
+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"
@@ -2880,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"
@@ -2888,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:"
@@ -2904,7 +2812,7 @@ 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"
@@ -2922,31 +2830,31 @@ msgctxt "ServerPage"
msgid ""
"For Internet connections with fast download speed but slow upload, please "
"list your upload speed here."
-msgstr "Merci d'indiquer votre vitesse en remontée si votre connexion a une vitesse élevée en téléchargement mais lente en remontée."
+msgstr ""
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"
@@ -2954,15 +2862,15 @@ msgstr "Sélectionner dans la liste déroulante l'entrée qui se rapproche le pl
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"
@@ -2980,7 +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 "Votre bande passante maximale doit être supérieure ou égal à votre bande passante moyene. Les deux valeurs doivent être supérieures ou égales à 20 KB/s."
+msgstr ""
msgctxt "ServerPage"
msgid "Bandwidth Limits"
@@ -2992,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"
@@ -3000,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"
@@ -3036,18 +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"
@@ -3055,12 +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"
@@ -3072,7 +2980,7 @@ 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 ""
@@ -3092,7 +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"
@@ -3100,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>"
@@ -3112,25 +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 for the Tor network (exit relay)"
-msgstr "Trafic du relai pour le réseau Tor (point de sortie)"
+msgid "Relay traffic inside the Tor network (non-exit relay)"
+msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic inside the Tor network (non-exit relay)"
+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 \nproblème avec votre relais. Vous pouvez aussi inclure votre empreinte PGP ou GPG."
+msgstr ""
msgctxt "ServicePage"
msgid "Error while trying to unpublish all services"
@@ -3140,43 +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."
+msgstr ""
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"
@@ -3184,7 +3088,7 @@ msgstr "Port Virtuel"
msgctxt "ServicePage"
msgid "Target"
-msgstr "Destination"
+msgstr "Cible"
msgctxt "ServicePage"
msgid "Directory Path"
@@ -3204,7 +3108,7 @@ 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"
@@ -3216,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."
@@ -3228,14 +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 ""
@@ -3243,7 +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 "Vous utilisez actuellement le programme Tor en version \"%1\", qui n'est plus recommandée. Merci de mettre à jour Tor à la version la plus récente, qui pourrait contenir d'importantes corrections de sécurité, de fiabilité et de performances."
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
@@ -3251,11 +3155,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 "Vous utilisez actuellement le programme Tor en version \"%1\", qui pourrait ne pas fonctionner avec le réseau Tor actuel. Merci de mettre à jour Tor à la version la plus récente, qui pourrait contenir d'importantes corrections de sécurité, de fiabilité et de performances."
+msgstr ""
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"
@@ -3275,7 +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 ""
@@ -3283,7 +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 a déterminé que l'horloge de votre ordinateur pourrait être réglée à %1 secondes en retard de la source \"%2\". Si votre horloge n'est pas correcte, Tor ne sera pas capable de fonctionner. Merci de vérifier que votre ordinateur affiche la bonne heure."
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
@@ -3291,11 +3195,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 a déterminé que l'horloge de votre ordinateur pourrait être réglée à %1 secondes en avance de la source \"%2\". Si votre horloge n'est pas correcte, Tor ne sera pas capable de fonctionner. Merci de vérifier que votre ordinateur affiche la bonne heure."
+msgstr ""
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 ""
@@ -3303,14 +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 "Une des applications de votre ordinateur a tenté d'établir une connexion non-cryptée à travers Tor sur le port %1. Envoyer des informations non-cryptées sur Tor peut être dangereux et n'est pas recommandé. Pour votre protection, Tor a automatiquement fermé la connexion."
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
"One of the applications on your computer may have attempted to make an "
"unencrypted connection through Tor to port %1. Sending unencrypted "
"information over the Tor network is dangerous and not recommended."
-msgstr "Une des applications de votre ordinateur a tenté d'établir une connexion non-cryptée à travers Tor sur le port %1. Envoyer des informations non-cryptées sur Tor peut être dangereux et n'est pas recommandé. "
+msgstr ""
msgctxt "StatusEventWidget"
msgid "Potentially Dangerous Connection!"
@@ -3322,29 +3226,29 @@ msgid ""
"using a protocol that may leak information about your destination. Please "
"ensure you configure your applications to use only SOCKS4a or SOCKS5 with "
"remote hostname resolution."
-msgstr "Une des applications de votre ordinateur a établi une connexion à travers Tor vers \" %1\", en utilisant un protocole qui pourrait révéler des informations sur votre destination. Merci de vous assurer que vous avez configuré vos applications pour qu'elles utilisent seulement SOCKS4a ou SOCKS5 avec résolution à distance du nom d'hôte."
+msgstr ""
msgctxt "StatusEventWidget"
msgid "Unknown SOCKS Protocol"
-msgstr "Protocole SOCKS inconnu"
+msgstr "Protocole SOCKS invalide"
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 "Une des applications de votre ordinateur a tenté d'établir une connexion à travers Tor en utilisant un protocole que Tor ne reconnait pas. Merci de vous assurer que vous avez configuré vos applications pour qu'elles utilisent seulement SOCKS4a ou SOCKS5 avec résolution à distance du nom d'hôte."
+msgstr ""
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 ""
"One of your applications tried to establish a connection through Tor to "
"\"%1\", which Tor does not recognize as a valid hostname. Please check your "
"application's configuration."
-msgstr "Une de vos applications a tenté d'établir une connexion à travers Tor vers \"%1\", que Tor ne reconnait comme étant un nom d'hôte valide. Merci de vérifier la configuration de votre application."
+msgstr ""
msgctxt "StatusEventWidget"
msgid "External IP Address Changed"
@@ -3355,7 +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 a déterminé que l'adresse IP publique de votre relais est actuellement %1%2. Si ceci n'est pas correct, merci de mettre l'option \"Adresse\" de la configuration de votre relais à la bonne valeur."
+msgstr ""
msgctxt "StatusEventWidget"
msgid "DNS Hijacking Detected"
@@ -3366,14 +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 a détecté que votre fournisseur DNS fournit des réponses fausses pour des domaines qui n'existent pas. Quelques FAI et autres fournisseurs DNS, téls que OpenDNS, sont connus pour cette pratique qui a pour but d'afficher leurs propres pages de recherche et de publicité."
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
"Tor detected that your DNS provider is providing false responses for well "
"known domains. Since clients rely on Tor network relays to provide accurate "
"DNS repsonses, your relay will not be configured as an exit relay."
-msgstr "Tor a détecté que votre fournisseur DNS fournit des réponses fausses pour des domaines bien connus. Puisque les clients comptent sur les relais Tor pour obtenir des réponses DNS précises, votre relais ne sera pas configuré en tant que relais de sortie."
+msgstr ""
msgctxt "StatusEventWidget"
msgid "Checking Server Port Reachability"
@@ -3384,7 +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 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 ""
msgctxt "StatusEventWidget"
msgid "Server Port Reachability Test Successful!"
@@ -3392,11 +3296,11 @@ msgstr "Test de vérification de l'accessibilité du port du serveur effectué a
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 ""
@@ -3404,30 +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 ""
@@ -3435,7 +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 "Le port du répertoire de votre relais n'est pas accessible par les autres clients Tor. Ceci peut se produire si vous êtes derrière un routeur ou un firewall qui nécesite une redirection de port. Si %1:%2 n'est pas votre adresse IP / port de répertoire, merci de vérifier la configuration de votre relais."
+msgstr ""
msgctxt "StatusEventWidget"
msgid "Relay Descriptor Rejected"
@@ -3445,11 +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 ""
@@ -3457,7 +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 "Votre relais est maintenant en ligne et disponible pour être utilisé par les clients Tor. Dans quelques heures, au fur et à mesure que des clients apprendront l'existance de votre relais, vous devriez remarquer une augmentation du traffic de votre réseau sur le Graphique de Bande Passante Merci de contribuer au déploiement du réseau Tor!"
+msgstr ""
+
+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"
@@ -3485,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]"
@@ -3505,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."
@@ -3519,7 +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"
@@ -3543,7 +3469,7 @@ msgstr "Refaire"
msgctxt "TorrcDialog"
msgid "Select All"
-msgstr "Sélectionner tout"
+msgstr "Sélectionner Tout."
msgctxt "TorrcDialog"
msgid "Apply all"
@@ -3567,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"
@@ -3611,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!"
@@ -3633,13 +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..."
@@ -3659,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"
@@ -3679,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"
@@ -3695,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"
@@ -3731,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"
@@ -3751,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."
@@ -3763,7 +3721,7 @@ 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."
@@ -3794,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:"
@@ -3807,22 +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\nVoulez 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"
@@ -3834,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"
@@ -3846,4 +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/qt_fur.po b/src/vidalia/i18n/po/fur/qt_fur.po
index 46b1277..0eb6c13 100644
--- a/src/vidalia/i18n/po/fur/qt_fur.po
+++ b/src/vidalia/i18n/po/fur/qt_fur.po
@@ -1,11 +1,10 @@
#
-# Translators:
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-08-20 03:25+0000\n"
-"PO-Revision-Date: 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"
@@ -431,5 +430,3 @@ msgstr ""
msgctxt "QFileSystemModel"
msgid "%1 bytes"
msgstr ""
-
-
diff --git a/src/vidalia/i18n/po/fur/vidalia_fur.po b/src/vidalia/i18n/po/fur/vidalia_fur.po
index a69ece6..d98c195 100755
--- a/src/vidalia/i18n/po/fur/vidalia_fur.po
+++ b/src/vidalia/i18n/po/fur/vidalia_fur.po
@@ -1,11 +1,10 @@
#
-# Translators:
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-09-07 14:40+0000\n"
-"PO-Revision-Date: 2010-12-05 20:03+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"
@@ -193,10 +192,6 @@ 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"
@@ -236,10 +231,6 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr ""
-
-msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -279,6 +270,10 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr ""
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -432,17 +427,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"
@@ -1266,44 +1270,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"
@@ -1331,10 +1342,6 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr ""
-
-msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1362,6 +1369,10 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr ""
+
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1644,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 ""
@@ -1680,10 +1663,6 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1796,10 +1775,6 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1882,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 ""
@@ -1934,82 +1897,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 ""
@@ -2057,19 +1949,39 @@ 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)"
+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"
@@ -2091,17 +2003,35 @@ msgid ""
msgstr ""
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"
@@ -2357,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"
@@ -2412,10 +2334,6 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2515,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 ""
@@ -2840,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 ""
@@ -3088,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 ""
@@ -3132,10 +3070,6 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
-msgid "Form"
-msgstr ""
-
-msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3424,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 ""
@@ -3460,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 ""
@@ -3538,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 ""
@@ -3666,6 +3646,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 ""
@@ -3759,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 ""
@@ -3812,5 +3796,3 @@ msgstr ""
msgctxt "stringutil.h"
msgid "%1 mins"
msgstr ""
-
-
diff --git a/src/vidalia/i18n/po/fy/qt_fy.po b/src/vidalia/i18n/po/fy/qt_fy.po
index ee5a60c..f31a58b 100644
--- a/src/vidalia/i18n/po/fy/qt_fy.po
+++ b/src/vidalia/i18n/po/fy/qt_fy.po
@@ -1,11 +1,10 @@
#
-# Translators:
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-08-20 03:25+0000\n"
-"PO-Revision-Date: 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"
@@ -431,5 +430,3 @@ msgstr ""
msgctxt "QFileSystemModel"
msgid "%1 bytes"
msgstr ""
-
-
diff --git a/src/vidalia/i18n/po/fy/vidalia_fy.po b/src/vidalia/i18n/po/fy/vidalia_fy.po
index 2a2cf5d..22b0f4e 100644
--- a/src/vidalia/i18n/po/fy/vidalia_fy.po
+++ b/src/vidalia/i18n/po/fy/vidalia_fy.po
@@ -1,18 +1,15 @@
-#
-# Translators:
+#, fuzzy
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: 2010-12-05 20:03+0000\n"
-"Last-Translator: \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: 2009-05-19 23:56+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
+"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: fy\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
"X-Generator: Vidalia ts2po 0.2\n"
msgctxt "AboutDialog"
@@ -35,13 +32,28 @@ msgctxt "AboutDialog"
msgid "Qt 4.4.2"
msgstr ""
+msgctxt "AboutDialog"
+msgid "Vidalia"
+msgstr ""
+
+msgctxt "AboutDialog"
+msgid "Tor"
+msgstr ""
+
+msgctxt "AboutDialog"
+msgid "Qt"
+msgstr ""
+
+msgctxt "AboutDialog"
+msgid "version"
+msgstr ""
+
msgctxt "AdvancedPage"
msgid "'%1' is not a valid IP address."
msgstr ""
msgctxt "AdvancedPage"
-msgid ""
-"You selected 'Password' authentication, but did not specify a password."
+msgid "You selected 'Password' authentication, but did not specify a password."
msgstr ""
msgctxt "AdvancedPage"
@@ -81,6 +93,10 @@ msgid "Vidalia was unable to install the Tor service."
msgstr ""
msgctxt "AdvancedPage"
+msgid "Control Port"
+msgstr ""
+
+msgctxt "AdvancedPage"
msgid "Authentication:"
msgstr ""
@@ -137,68 +153,7 @@ msgid "Select the directory used to store data for the Tor software"
msgstr ""
msgctxt "AdvancedPage"
-msgid "Tor Control"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "Use TCP connection (ControlPort)"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "Path:"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "Use Unix domain socket (ControlSocket)"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "Edit current torrc"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "NOTE: this will edit the currently loaded torrc"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "ControlSocket path doesn't exist."
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid ""
-"The specified Tor configuration file location contains characters that "
-"cannot be represented in your system's current 8-bit character encoding."
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid ""
-"The specified Tor data directory location contains characters that cannot be"
-" represented in your system's current 8-bit character encoding."
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "Warning"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "You changed torrc path, would you like to restart Tor?"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "Tor Configuration File (torrc);;All Files (*)"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "Select a file to use for Tor socket path"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "Configure ControlPort automatically"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid ""
-"Vidalia was unable to remove the Tor service.\n"
+msgid "Vidalia was unable to remove the Tor service.\n"
"\n"
"You may need to remove it manually."
msgstr ""
@@ -440,9 +395,7 @@ msgid "Remember my password"
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid ""
-"Vidalia has connected to a running Tor process that requires a password. "
-"Please enter your control password:"
+msgid "Vidalia has connected to a running Tor process that requires a password. Please enter your control password:"
msgstr ""
msgctxt "ControlSocket"
@@ -1158,10 +1111,6 @@ msgid "Zimbabwe"
msgstr ""
msgctxt "CountryInfo"
-msgid "Zaire"
-msgstr ""
-
-msgctxt "CountryInfo"
msgid "Albania"
msgstr ""
@@ -1257,55 +1206,6 @@ msgctxt "CountryInfo"
msgid "Taiwan"
msgstr ""
-msgctxt "CrashReportDialog"
-msgid "Submit a Crash Report"
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid "Vidalia encountered an error and needed to close"
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid "Restart Vidalia"
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid "Don't Restart"
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid "Unable to restart Vidalia"
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid ""
-"We were unable to automatically restart Vidalia. Please restart Vidalia "
-"manually."
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid "Please fill a ticket in:"
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid ""
-"<a "
-"href=\"https://trac.torproject.org/projects/tor/newticket\">https://trac.torproject.org/projects/tor/newticket</a>"
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid ""
-"A crash report has been created that you can send to the Vidalia developers "
-"to help identify and fix the problem. The submitted report does not contain "
-"any personally identifying information."
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid ""
-"with a description of what you were doing before the application crashed, "
-"along with the following files corresponding to the crash report:"
-msgstr ""
-
msgctxt "GeneralPage"
msgid "Executables (*.exe)"
msgstr ""
@@ -1323,6 +1223,10 @@ msgid "You must specify the name of your Tor executable."
msgstr ""
msgctxt "GeneralPage"
+msgid "The proxy arguments specified are not properly formatted."
+msgstr ""
+
+msgctxt "GeneralPage"
msgid "Start Vidalia when my system starts"
msgstr ""
@@ -1519,10 +1423,7 @@ msgid "Opening External Link"
msgstr ""
msgctxt "HelpTextBrowser"
-msgid ""
-"Vidalia can open the link you selected in your default Web browser. If your "
-"browser is not currently configured to use Tor then the request will not be "
-"anonymous."
+msgid "Vidalia can open the link you selected in your default Web browser. If your browser is not currently configured to use Tor then the request will not be anonymous."
msgstr ""
msgctxt "HelpTextBrowser"
@@ -1534,9 +1435,7 @@ msgid "Unable to Open Link"
msgstr ""
msgctxt "HelpTextBrowser"
-msgid ""
-"Vidalia was unable to open the selected link in your Web browser. You can "
-"still copy the URL and paste it into your browser."
+msgid "Vidalia was unable to open the selected link in your Web browser. You can still copy the URL and paste it into your browser."
msgstr ""
msgctxt "HelpTextBrowser"
@@ -1579,30 +1478,6 @@ msgctxt "LogEvent"
msgid "Unknown"
msgstr ""
-msgctxt "LogTreeItem"
-msgid "Debug"
-msgstr ""
-
-msgctxt "LogTreeItem"
-msgid "Info"
-msgstr ""
-
-msgctxt "LogTreeItem"
-msgid "Notice"
-msgstr ""
-
-msgctxt "LogTreeItem"
-msgid "Warning"
-msgstr ""
-
-msgctxt "LogTreeItem"
-msgid "Error"
-msgstr ""
-
-msgctxt "LogTreeItem"
-msgid "Unknown"
-msgstr ""
-
msgctxt "MainWindow"
msgid "Start Tor"
msgstr ""
@@ -1816,9 +1691,7 @@ msgid "Error Starting Tor"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Vidalia was unable to start Tor. Check your settings to ensure the correct "
-"name and location of your Tor executable is specified."
+msgid "Vidalia was unable to start Tor. Check your settings to ensure the correct name and location of your Tor executable is specified."
msgstr ""
msgctxt "MainWindow"
@@ -1854,9 +1727,7 @@ msgid "Cookie Authentication Required"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"The Tor software requires Vidalia to send the contents of an authentication "
-"cookie, but Vidalia was unable to find one."
+msgid "The Tor software requires Vidalia to send the contents of an authentication cookie, but Vidalia was unable to find one."
msgstr ""
msgctxt "MainWindow"
@@ -1876,9 +1747,7 @@ msgid "Error Registering for Events"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Vidalia was unable to register for some events. Many of Vidalia's features "
-"may be unavailable."
+msgid "Vidalia was unable to register for some events. Many of Vidalia's features may be unavailable."
msgstr ""
msgctxt "MainWindow"
@@ -1898,9 +1767,7 @@ msgid "Tor Update Available"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended. Please visit the Tor website to download the latest version."
+msgid "The currently installed version of Tor is out of date or no longer recommended. Please visit the Tor website to download the latest version."
msgstr ""
msgctxt "MainWindow"
@@ -1908,9 +1775,7 @@ msgid "Tor website: %1"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"All subsequent connections will appear to be different than your old "
-"connections."
+msgid "All subsequent connections will appear to be different than your old connections."
msgstr ""
msgctxt "MainWindow"
@@ -2002,21 +1867,15 @@ msgid "Password Reset Failed"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Vidalia tried to reset Tor's control password, but was not able to restart "
-"the Tor software. Please check your Task Manager to ensure there are no "
-"other Tor processes running."
+msgid "Vidalia tried to reset Tor's control password, but was not able to restart the Tor software. Please check your Task Manager to ensure there are no other Tor processes running."
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended."
+msgid "The currently installed version of Tor is out of date or no longer recommended."
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Would you like to check if a newer package is available for installation?"
+msgid "Would you like to check if a newer package is available for installation?"
msgstr ""
msgctxt "MainWindow"
@@ -2024,9 +1883,11 @@ msgid "Potentially Unsafe Connection"
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 ""
msgctxt "MainWindow"
@@ -2038,9 +1899,7 @@ msgid "Your software is up to date"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"There are no new Tor software packages available for your computer at this "
-"time."
+msgid "There are no new Tor software packages available for your computer at this time."
msgstr ""
msgctxt "MainWindow"
@@ -2056,52 +1915,52 @@ msgid "The following error occurred:"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Anything sent over this connection could be monitored. Please check your "
-"application's configuration and use only encrypted protocols, such as SSL, "
-"if possible."
-msgstr ""
-
-msgctxt "MainWindow"
msgid "failed (%1)"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
+msgid "Your relay is shutting down.\n"
"Click 'Stop' again to stop your relay now."
msgstr ""
msgctxt "MainWindow"
-msgid "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 ""
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 ""
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 ""
+
+msgctxt "MainWindow"
+msgid "File"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "About Vidalia"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Home"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Check For Updates"
msgstr ""
msgctxt "MessageLog"
@@ -2345,68 +2204,50 @@ 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"
+msgid "Always Save New Log Messages"
msgstr ""
msgctxt "MessageLog"
-msgid "Tor Status"
+msgid "Browse"
msgstr ""
msgctxt "MessageLog"
-msgid "Advanced"
+msgid "Enable automatically saving all new log messages to a file"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
+msgid "Automatically save new log messages to a file"
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 ""
msgctxt "MessageLog"
-msgid ""
-"Messages that only appear when \n"
+msgid "Messages that only appear when \n"
"something has gone wrong with Tor."
msgstr ""
msgctxt "MessageLog"
-msgid ""
-"Messages that appear infrequently \n"
+msgid "Messages that appear infrequently \n"
"during normal Tor operation and are \n"
"not considered errors, but you may \n"
"care about."
msgstr ""
msgctxt "MessageLog"
-msgid ""
-"Messages that appear frequently \n"
+msgid "Messages that appear frequently \n"
"during normal Tor operation."
msgstr ""
msgctxt "MessageLog"
-msgid ""
-"Hyper-verbose messages primarily of \n"
+msgid "Hyper-verbose messages primarily of \n"
"interest to Tor developers."
msgstr ""
msgctxt "MessageLog"
-msgid ""
-"Cannot write file %1\n"
+msgid "Cannot write file %1\n"
"\n"
"%2."
msgstr ""
@@ -2528,15 +2369,11 @@ msgid "Copy (Ctrl+C)"
msgstr ""
msgctxt "NetworkPage"
-msgid ""
-"You must specify both an IP address or hostname and a port number to "
-"configure Tor to use a proxy to access the Internet."
+msgid "You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet."
msgstr ""
msgctxt "NetworkPage"
-msgid ""
-"You must specify one or more ports to which your firewall allows you to "
-"connect."
+msgid "You must specify one or more ports to which your firewall allows you to connect."
msgstr ""
msgctxt "NetworkPage"
@@ -2556,10 +2393,18 @@ msgid "Proxy Settings"
msgstr ""
msgctxt "NetworkPage"
+msgid "HTTP Proxy:"
+msgstr ""
+
+msgctxt "NetworkPage"
msgid "Username:"
msgstr ""
msgctxt "NetworkPage"
+msgid "Use this proxy for HTTPS also"
+msgstr ""
+
+msgctxt "NetworkPage"
msgid "Password:"
msgstr ""
@@ -2588,9 +2433,7 @@ msgid "80, 443"
msgstr ""
msgctxt "NetworkPage"
-msgid ""
-"Check to encrypt directory requests and, optionally, use bridge relays to "
-"access the Tor network"
+msgid "Check to encrypt directory requests and, optionally, use bridge relays to access the Tor network"
msgstr ""
msgctxt "NetworkPage"
@@ -2602,10 +2445,18 @@ msgid "Bridge Settings"
msgstr ""
msgctxt "NetworkPage"
+msgid "The Tor software you are currently running does not support bridges. <br>Directory connections will still be encrypted."
+msgstr ""
+
+msgctxt "NetworkPage"
msgid "Add a Bridge:"
msgstr ""
msgctxt "NetworkPage"
+msgid "<a href=\"bridges.finding\">How do I find a bridge?</a>"
+msgstr ""
+
+msgctxt "NetworkPage"
msgid "Remove the selected bridges from the list"
msgstr ""
@@ -2626,43 +2477,13 @@ msgid "<a href=\"bridges.finding\">How can I find bridges?</a>"
msgstr ""
msgctxt "NetworkPage"
-msgid ""
-"No new bridges are currently available. You can either wait a while and try "
-"again, or try another method of finding new bridges."
+msgid "No new bridges are currently available. You can either wait a while and try again, or try another method of finding new bridges."
msgstr ""
msgctxt "NetworkPage"
msgid "Click Help to see other methods of finding new bridges."
msgstr ""
-msgctxt "NetworkPage"
-msgid "Address:"
-msgstr ""
-
-msgctxt "NetworkPage"
-msgid "Type:"
-msgstr ""
-
-msgctxt "NetworkPage"
-msgid "You must select the proxy type."
-msgstr ""
-
-msgctxt "NetworkPage"
-msgid "SOCKS 4"
-msgstr ""
-
-msgctxt "NetworkPage"
-msgid "SOCKS 5"
-msgstr ""
-
-msgctxt "NetworkPage"
-msgid "HTTP"
-msgstr ""
-
-msgctxt "NetworkPage"
-msgid "HTTP / HTTPS"
-msgstr ""
-
msgctxt "Policy"
msgid "accept"
msgstr ""
@@ -2816,15 +2637,11 @@ msgid "Bridge Support Unavailable"
msgstr ""
msgctxt "ServerPage"
-msgid ""
-"You have configured Tor to act as a bridge relay for censored users, but "
-"your version of Tor does not support bridges."
+msgid "You have configured Tor to act as a bridge relay for censored users, but your version of Tor does not support bridges."
msgstr ""
msgctxt "ServerPage"
-msgid ""
-"Please upgrade your Tor software or configure Tor to act as a normal Tor "
-"relay."
+msgid "Please upgrade your Tor software or configure Tor to act as a normal Tor relay."
msgstr ""
msgctxt "ServerPage"
@@ -2892,9 +2709,7 @@ msgid "Basic Settings"
msgstr ""
msgctxt "ServerPage"
-msgid ""
-"For Internet connections with fast download speed but slow upload, please "
-"list your upload speed here."
+msgid "For Internet connections with fast download speed but slow upload, please list your upload speed here."
msgstr ""
msgctxt "ServerPage"
@@ -2950,9 +2765,7 @@ msgid "Peak bandwidth rate limit"
msgstr ""
msgctxt "ServerPage"
-msgid ""
-"Your maximum bandwidth rate must be greater than or equal to your average "
-"bandwidth rate. Both values must be at least 20 KB/s."
+msgid "Your maximum bandwidth rate must be greater than or equal to your average bandwidth rate. Both values must be at least 20 KB/s."
msgstr ""
msgctxt "ServerPage"
@@ -3012,14 +2825,11 @@ msgid "Show help topic on exit policies"
msgstr ""
msgctxt "ServerPage"
-msgid ""
-"What Internet resources should users be able to access from your relay?"
+msgid "What Internet resources should users be able to access from your relay?"
msgstr ""
msgctxt "ServerPage"
-msgid ""
-"Tor will still block some outgoing mail and file sharing applications by "
-"default to reduce spam and other abuse."
+msgid "Tor will still block some outgoing mail and file sharing applications by default to reduce spam and other abuse."
msgstr ""
msgctxt "ServerPage"
@@ -3031,8 +2841,7 @@ msgid "Let others access your bridge by giving them this line:"
msgstr ""
msgctxt "ServerPage"
-msgid ""
-"This is the identity of your bridge relay that you can give to other people"
+msgid "This is the identity of your bridge relay that you can give to other people"
msgstr ""
msgctxt "ServerPage"
@@ -3048,9 +2857,7 @@ msgid "No clients have used your relay recently."
msgstr ""
msgctxt "ServerPage"
-msgid ""
-"Leave your relay running so clients have a better chance of finding and "
-"using it."
+msgid "Leave your relay running so clients have a better chance of finding and using it."
msgstr ""
msgctxt "ServerPage"
@@ -3062,9 +2869,7 @@ msgid "Vidalia was unable to retrieve your bridge's usage history."
msgstr ""
msgctxt "ServerPage"
-msgid ""
-"Tor returned an improperly formatted response when Vidalia requested your "
-"bridge's usage history."
+msgid "Tor returned an improperly formatted response when Vidalia requested your bridge's usage history."
msgstr ""
msgctxt "ServerPage"
@@ -3080,20 +2885,11 @@ msgid "<a href=\"#bridgeUsage\">Who has used my bridge?</a>"
msgstr ""
msgctxt "ServerPage"
-msgid "<a href=\"#bridgeHelp\">What's this?</a>"
-msgstr ""
-
-msgctxt "ServerPage"
-msgid "Automatically distribute my bridge address"
-msgstr ""
-
-msgctxt "ServerPage"
msgid "Mirror the Relay Directory"
msgstr ""
msgctxt "ServerPage"
-msgid ""
-"Email address at which you may be reached if there is a\n"
+msgid "Email address at which you may be reached if there is a\n"
"problem with your relay. You might also include your PGP or GPG fingerprint."
msgstr ""
@@ -3102,9 +2898,7 @@ msgid "Error while trying to unpublish all services"
msgstr ""
msgctxt "ServicePage"
-msgid ""
-"Please configure at least a service directory and a virtual port for each "
-"service you want to save. Remove the other ones."
+msgid "Please configure at least a service directory and a virtual port for each service you want to save. Remove the other ones."
msgstr ""
msgctxt "ServicePage"
@@ -3179,251 +2973,6 @@ msgctxt "ServicePage"
msgid "Created by Tor"
msgstr ""
-msgctxt "StatusEventWidget"
-msgid "Copy to Clipboard"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "The Tor Software is Running"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "You are currently running version \"%1\" of the Tor software."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "The Tor Software is not Running"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Click \"Start Tor\" in the Vidalia Control Panel to restart the Tor "
-"software. If Tor exited unexpectedly, select the \"Advanced\" tab above for "
-"details about any errors encountered."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"You are currently running version \"%1\" of the Tor software, which is no "
-"longer recommended. Please upgrade to the most recent version of the "
-"software, which may contain important security, reliability and performance "
-"fixes."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"You are currently running version \"%1\" of the Tor software, which may no "
-"longer work with the current Tor network. Please upgrade to the most recent "
-"version of the software, which may contain important security, reliability "
-"and performance fixes."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Your Tor Software is Out-of-date"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Connected to the Tor Network"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"We were able to successfully establish a connection to the Tor network. You "
-"can now configure your applications to use the Internet anonymously."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Tor Software Error"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"The Tor software encountered an internal bug. Please report the following "
-"error message to the Tor developers at bugs.torproject.org: \"%1\""
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Tor has determined that your computer's clock may be set to %1 seconds in "
-"the past compared to the source \"%2\". If your clock is not correct, Tor "
-"will not be able to function. Please verify your computer displays the "
-"correct time."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Tor has determined that your computer's clock may be set to %1 seconds in "
-"the future compared to the source \"%2\". If your clock is not correct, Tor "
-"will not be able to function. Please verify your computer displays the "
-"correct time."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Your Computer's Clock is Potentially Incorrect"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"One of the applications on your computer may have attempted to make an "
-"unencrypted connection through Tor to port %1. Sending unencrypted "
-"information over the Tor network is dangerous and not recommended. For your "
-"protection, Tor has automatically closed this connection."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"One of the applications on your computer may have attempted to make an "
-"unencrypted connection through Tor to port %1. Sending unencrypted "
-"information over the Tor network is dangerous and not recommended."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Potentially Dangerous Connection!"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"One of your applications established a connection through Tor to \"%1\" "
-"using a protocol that may leak information about your destination. Please "
-"ensure you configure your applications to use only SOCKS4a or SOCKS5 with "
-"remote hostname resolution."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Unknown SOCKS Protocol"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"One of your applications tried to establish a connection through Tor using a"
-" protocol that Tor does not understand. Please ensure you configure your "
-"applications to use only SOCKS4a or SOCKS5 with remote hostname resolution."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Invalid Destination Hostname"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"One of your applications tried to establish a connection through Tor to "
-"\"%1\", which Tor does not recognize as a valid hostname. Please check your "
-"application's configuration."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "External IP Address Changed"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Tor has determined your relay's public IP address is currently %1%2. If that"
-" is not correct, please consider setting the 'Address' option in your "
-"relay's configuration."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "DNS Hijacking Detected"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Tor detected that your DNS provider is providing false responses for domains"
-" that do not exist. Some ISPs and other DNS providers, such as OpenDNS, are "
-"known to do this in order to display their own search or advertising pages."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Tor detected that your DNS provider is providing false responses for well "
-"known domains. Since clients rely on Tor network relays to provide accurate "
-"DNS repsonses, your relay will not be configured as an exit relay."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Checking Server Port Reachability"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Tor is trying to determine if your relay's server port is reachable from the"
-" Tor network by connecting to itself at %1:%2. This test could take several "
-"minutes."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Server Port Reachability Test Successful!"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Your relay's server port is reachable from the Tor network!"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Server Port Reachability Test Failed"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Your relay's server port is not reachable by other Tor clients. This can "
-"happen if you are behind a router or firewall that requires you to set up "
-"port forwarding. If %1:%2 is not your correct IP address and server port, "
-"please check your relay's configuration."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Checking Directory Port Reachability"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Tor is trying to determine if your relay's directory port is reachable from "
-"the Tor network by connecting to itself at %1:%2. This test could take "
-"several minutes."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Directory Port Reachability Test Successful!"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Your relay's directory port is reachable from the Tor network!"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Directory Port Reachability Test Failed"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Your relay's directory port is not reachable by other Tor clients. This can "
-"happen if you are behind a router or firewall that requires you to set up "
-"port forwarding. If %1:%2 is not your correct IP address and directory port,"
-" please check your relay's configuration."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Relay Descriptor Rejected"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Your relay's descriptor, which enables clients to connect to your relay, was"
-" rejected by the directory server at %1:%2. The reason given was: %3"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Your Relay is Online"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Your relay is now online and available for Tor clients to use. You should "
-"see an increase in network traffic shown by the Bandwidth Graph within a few"
-" hours as more clients learn about your relay. Thank you for contributing to"
-" the Tor network!"
-msgstr ""
-
msgctxt "Stream"
msgid "New"
msgstr ""
@@ -3476,68 +3025,6 @@ msgctxt "TorSettings"
msgid "Failed to hash the control password."
msgstr ""
-msgctxt "TorrcDialog"
-msgid "Editing torrc"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid ""
-"Save settings. If unchecked it will only apply settings to the current Tor "
-"instance."
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Cut"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Copy"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Paste"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Undo"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Redo"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Select All"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Apply all"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Apply selection only"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Error connecting to Tor"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Selection is empty. Please select some text, or check \"Apply all\""
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Error at line %1: \"%2\""
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Error"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "An error ocurred while opening torrc file"
-msgstr ""
-
msgctxt "UPNPControl"
msgid "Success"
msgstr ""
@@ -3595,15 +3082,11 @@ msgid "Testing Universal Plug & Play Support"
msgstr ""
msgctxt "UpdateProcess"
-msgid ""
-"Vidalia was unable to check for available software updates because it could "
-"not find '%1'."
+msgid "Vidalia was unable to check for available software updates because it could not find '%1'."
msgstr ""
msgctxt "UpdateProcess"
-msgid ""
-"Vidalia was unable to check for available software updates because Tor's "
-"update process exited unexpectedly."
+msgid "Vidalia was unable to check for available software updates because Tor's update process exited unexpectedly."
msgstr ""
msgctxt "UpdateProgressDialog"
@@ -3759,10 +3242,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 ""
@@ -3775,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 ""
@@ -3812,5 +3290,3 @@ msgstr ""
msgctxt "stringutil.h"
msgid "%1 mins"
msgstr ""
-
-
diff --git a/src/vidalia/i18n/po/ga/qt_ga.po b/src/vidalia/i18n/po/ga/qt_ga.po
index 60e2ea7..d408691 100644
--- a/src/vidalia/i18n/po/ga/qt_ga.po
+++ b/src/vidalia/i18n/po/ga/qt_ga.po
@@ -1,11 +1,10 @@
#
-# Translators:
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-08-20 03:25+0000\n"
-"PO-Revision-Date: 2010-12-05 19:59+0000\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"
@@ -431,5 +430,3 @@ msgstr ""
msgctxt "QFileSystemModel"
msgid "%1 bytes"
msgstr ""
-
-
diff --git a/src/vidalia/i18n/po/ga/vidalia_ga.po b/src/vidalia/i18n/po/ga/vidalia_ga.po
index 043b1b4..fa661c9 100644
--- a/src/vidalia/i18n/po/ga/vidalia_ga.po
+++ b/src/vidalia/i18n/po/ga/vidalia_ga.po
@@ -1,11 +1,10 @@
#
-# Translators:
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-09-07 14:40+0000\n"
-"PO-Revision-Date: 2010-12-05 20:03+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"
@@ -193,10 +192,6 @@ 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"
@@ -236,10 +231,6 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr ""
-
-msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -279,6 +270,10 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr ""
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -432,17 +427,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"
@@ -1266,44 +1270,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"
@@ -1331,10 +1342,6 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr ""
-
-msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1362,6 +1369,10 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr ""
+
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1644,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 ""
@@ -1680,10 +1663,6 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1796,10 +1775,6 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1882,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 ""
@@ -1934,82 +1897,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 ""
@@ -2057,19 +1949,39 @@ 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)"
+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"
@@ -2091,17 +2003,35 @@ msgid ""
msgstr ""
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"
@@ -2357,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"
@@ -2412,10 +2334,6 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2515,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 ""
@@ -2840,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 ""
@@ -3088,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 ""
@@ -3132,10 +3070,6 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
-msgid "Form"
-msgstr ""
-
-msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3424,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 ""
@@ -3460,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 ""
@@ -3538,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 ""
@@ -3666,6 +3646,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 ""
@@ -3759,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 ""
@@ -3812,5 +3796,3 @@ msgstr ""
msgctxt "stringutil.h"
msgid "%1 mins"
msgstr ""
-
-
diff --git a/src/vidalia/i18n/po/gl/qt_gl.po b/src/vidalia/i18n/po/gl/qt_gl.po
index 290b50c..cf67d75 100644
--- a/src/vidalia/i18n/po/gl/qt_gl.po
+++ b/src/vidalia/i18n/po/gl/qt_gl.po
@@ -1,11 +1,10 @@
#
-# Translators:
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-08-20 03:25+0000\n"
-"PO-Revision-Date: 2010-12-05 19:59+0000\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"
@@ -431,5 +430,3 @@ msgstr ""
msgctxt "QFileSystemModel"
msgid "%1 bytes"
msgstr ""
-
-
diff --git a/src/vidalia/i18n/po/gl/vidalia_gl.po b/src/vidalia/i18n/po/gl/vidalia_gl.po
index 5070a88..8da7090 100755
--- a/src/vidalia/i18n/po/gl/vidalia_gl.po
+++ b/src/vidalia/i18n/po/gl/vidalia_gl.po
@@ -1,11 +1,10 @@
#
-# Translators:
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-09-07 14:40+0000\n"
-"PO-Revision-Date: 2010-12-05 20:03+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"
@@ -193,10 +192,6 @@ 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"
@@ -236,10 +231,6 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr ""
-
-msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -279,6 +270,10 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr ""
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -432,17 +427,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"
@@ -1266,44 +1270,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"
@@ -1331,10 +1342,6 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr ""
-
-msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1362,6 +1369,10 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr ""
+
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1644,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 ""
@@ -1680,10 +1663,6 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1796,10 +1775,6 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1882,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 ""
@@ -1934,82 +1897,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 ""
@@ -2057,19 +1949,39 @@ 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)"
+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"
@@ -2091,17 +2003,35 @@ msgid ""
msgstr ""
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"
@@ -2357,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"
@@ -2412,10 +2334,6 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2515,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 ""
@@ -2840,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 ""
@@ -3088,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 ""
@@ -3132,10 +3070,6 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
-msgid "Form"
-msgstr ""
-
-msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3424,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 ""
@@ -3460,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 ""
@@ -3538,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 ""
@@ -3666,6 +3646,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 ""
@@ -3759,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 ""
@@ -3812,5 +3796,3 @@ msgstr ""
msgctxt "stringutil.h"
msgid "%1 mins"
msgstr ""
-
-
diff --git a/src/vidalia/i18n/po/gu/qt_gu.po b/src/vidalia/i18n/po/gu/qt_gu.po
index 476a4b9..de997d9 100644
--- a/src/vidalia/i18n/po/gu/qt_gu.po
+++ b/src/vidalia/i18n/po/gu/qt_gu.po
@@ -1,12 +1,10 @@
-# Translators:
-# Translators:
-# runasand <runa.sandvik at gmail.com>, 2011.
+#
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-08-20 03:25+0000\n"
-"PO-Revision-Date: 2010-12-05 19:59+0000\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"
@@ -201,7 +199,9 @@ msgctxt "QFileDialog"
msgid ""
"%1 already exists.\n"
"Do you want to replace it?"
-msgstr "%1 પહેલેથી હાજર છે.\nશું તમે તેના પર બદલવા માંગો છો?"
+msgstr ""
+"%1 પહેલેથી હાજર છે.\n"
+"શું તમે તેના પર બદલવા માંગો છો?"
#: qfiledialog.cpp:1690
msgctxt "QFileDialog"
@@ -209,7 +209,10 @@ msgid ""
"%1\n"
"File not found.\n"
"Please verify the correct file name was given."
-msgstr "%1\nફાઈલ મળી નહી.\nમહેરબાની કરીને ચકાસો કે સાચું ફાઈલ નામ આપવામાં આવ્યું હતું."
+msgstr ""
+"%1\n"
+"ફાઈલ મળી નહી.\n"
+"મહેરબાની કરીને ચકાસો કે સાચું ફાઈલ નામ આપવામાં આવ્યું હતું."
#: qdirmodel.cpp:833
msgctxt "QFileDialog"
diff --git a/src/vidalia/i18n/po/gu/vidalia_gu.po b/src/vidalia/i18n/po/gu/vidalia_gu.po
index b48b31a..ef05b26 100755
--- a/src/vidalia/i18n/po/gu/vidalia_gu.po
+++ b/src/vidalia/i18n/po/gu/vidalia_gu.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: 2012-03-21 17:52+0000\n"
-"PO-Revision-Date: 2012-03-22 08:51+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,17 +194,6 @@ msgid "Select a file to use for Tor socket path"
msgstr ""
msgctxt "AdvancedPage"
-msgid "Configure ControlPort automatically"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid ""
-"You've checked the autoconfiguration option for the ControlPort, but "
-"provided no Data Directory. Please add one, or uncheck the \"Configure "
-"ControlPort automatically\" option."
-msgstr ""
-
-msgctxt "AdvancedPage"
msgid ""
"Vidalia was unable to remove the Tor service.\n"
"\n"
@@ -231,23 +220,6 @@ msgctxt "AppearancePage"
msgid "Vidalia was unable to load the selected language translation."
msgstr ""
-msgctxt "AppearancePage"
-msgid ""
-"System Icon Preferences (changes will take effect when you restart Vidalia)"
-msgstr ""
-
-msgctxt "AppearancePage"
-msgid "Show the Tray Icon and Dock Icon (default)"
-msgstr ""
-
-msgctxt "AppearancePage"
-msgid "Hide the Tray Icon"
-msgstr ""
-
-msgctxt "AppearancePage"
-msgid "Hide the Dock Icon"
-msgstr ""
-
msgctxt "BandwidthGraph"
msgid "Since:"
msgstr ""
@@ -261,10 +233,6 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr ""
-
-msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -304,6 +272,10 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr ""
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -457,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"
@@ -1291,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"
@@ -1356,10 +1344,6 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr ""
-
-msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1387,6 +1371,10 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr ""
+
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1669,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 ""
@@ -1705,10 +1665,6 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1773,6 +1729,10 @@ msgid "Connected to the Tor network!"
msgstr ""
msgctxt "MainWindow"
+msgid "Unrecognized startup status"
+msgstr ""
+
+msgctxt "MainWindow"
msgid "miscellaneous"
msgstr ""
@@ -1817,10 +1777,6 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1903,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 ""
@@ -1955,82 +1899,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 ""
@@ -2078,66 +1951,89 @@ 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 "Bootstrapping torrc from %1 to %2"
+msgid "toolBar"
msgstr ""
msgctxt "MainWindow"
-msgid "(probably Telnet)"
+msgid "Start"
msgstr ""
msgctxt "MainWindow"
-msgid "(probably an email client)"
+msgid "Stop"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"One of your applications %1 appears to be making a potentially unencrypted "
-"and unsafe connection to port %2."
+msgid "Restart"
msgstr ""
msgctxt "MainWindow"
-msgid "failed (%1)"
+msgid "Reload Tor's config"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+msgid "Actions"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Bootstrapping torrc from %1 to %2"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia can't find out how to talk to Tor because it can't access this file: %1\n"
+"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
"\n"
-"Here's the last error message:\n"
-"%2"
+"Would you like to shutdown gracefully and give clients time to find a new relay?"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"It seems Tor has stopped running since Vidalia started it.\n"
+"Vidalia detected that the Tor software exited unexpectedly.\n"
"\n"
-"See the Advanced Message Log for more information."
+"Please check the message log for recent warning or error messages."
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?"
+"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 ""
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 "Error reloading configuration"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to reload Tor's configuration."
msgstr ""
msgctxt "MessageLog"
@@ -2393,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"
@@ -2448,10 +2336,6 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2551,6 +2435,30 @@ 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 ""
+
+msgctxt "NetworkPage"
+msgid "The specified bridge identifier is not valid."
+msgstr ""
+
msgctxt "NetworkPage"
msgid "Copy (Ctrl+C)"
msgstr ""
@@ -2684,11 +2592,11 @@ msgid "SOCKS 5"
msgstr ""
msgctxt "NetworkPage"
-msgid "HTTP / HTTPS"
+msgid "HTTP"
msgstr ""
msgctxt "NetworkPage"
-msgid "You must specify one or more bridges."
+msgid "HTTP / HTTPS"
msgstr ""
msgctxt "Policy"
@@ -3112,11 +3020,11 @@ msgid "Automatically distribute my bridge address"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network (exit relay)"
+msgid "Relay traffic inside the Tor network (non-exit relay)"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic inside the Tor network (non-exit relay)"
+msgid "Relay traffic for the Tor network (exit relay)"
msgstr ""
msgctxt "ServerPage"
@@ -3164,10 +3072,6 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
-msgid "Form"
-msgstr ""
-
-msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3456,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 ""
@@ -3492,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 ""
@@ -3570,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 ""
@@ -3698,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 ""
@@ -3791,10 +3749,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 ""
diff --git a/src/vidalia/i18n/po/gun/qt_gun.po b/src/vidalia/i18n/po/gun/qt_gun.po
index 7ee94bb..7439ef0 100644
--- a/src/vidalia/i18n/po/gun/qt_gun.po
+++ b/src/vidalia/i18n/po/gun/qt_gun.po
@@ -1,11 +1,10 @@
#
-# Translators:
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-08-20 03:25+0000\n"
-"PO-Revision-Date: 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"
@@ -431,5 +430,3 @@ msgstr ""
msgctxt "QFileSystemModel"
msgid "%1 bytes"
msgstr ""
-
-
diff --git a/src/vidalia/i18n/po/gun/vidalia_gun.po b/src/vidalia/i18n/po/gun/vidalia_gun.po
index d83d35c..0cdc1ea 100644
--- a/src/vidalia/i18n/po/gun/vidalia_gun.po
+++ b/src/vidalia/i18n/po/gun/vidalia_gun.po
@@ -1,11 +1,10 @@
#
-# Translators:
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-09-07 14:40+0000\n"
-"PO-Revision-Date: 2010-12-05 20:03+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"
@@ -193,10 +192,6 @@ 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"
@@ -236,10 +231,6 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr ""
-
-msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -279,6 +270,10 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr ""
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -432,17 +427,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"
@@ -1266,44 +1270,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"
@@ -1331,10 +1342,6 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr ""
-
-msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1362,6 +1369,10 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr ""
+
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1644,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 ""
@@ -1680,10 +1663,6 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1796,10 +1775,6 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1882,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 ""
@@ -1934,82 +1897,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 ""
@@ -2057,19 +1949,39 @@ 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)"
+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"
@@ -2091,17 +2003,35 @@ msgid ""
msgstr ""
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"
@@ -2357,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"
@@ -2412,10 +2334,6 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2515,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 ""
@@ -2840,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 ""
@@ -3088,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 ""
@@ -3132,10 +3070,6 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
-msgid "Form"
-msgstr ""
-
-msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3424,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 ""
@@ -3460,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 ""
@@ -3538,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 ""
@@ -3666,6 +3646,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 ""
@@ -3759,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 ""
@@ -3812,5 +3796,3 @@ msgstr ""
msgctxt "stringutil.h"
msgid "%1 mins"
msgstr ""
-
-
diff --git a/src/vidalia/i18n/po/ha/qt_ha.po b/src/vidalia/i18n/po/ha/qt_ha.po
index 5b98691..b7a61cd 100644
--- a/src/vidalia/i18n/po/ha/qt_ha.po
+++ b/src/vidalia/i18n/po/ha/qt_ha.po
@@ -1,11 +1,10 @@
#
-# Translators:
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-08-20 03:25+0000\n"
-"PO-Revision-Date: 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"
@@ -431,5 +430,3 @@ msgstr ""
msgctxt "QFileSystemModel"
msgid "%1 bytes"
msgstr ""
-
-
diff --git a/src/vidalia/i18n/po/ha/vidalia_ha.po b/src/vidalia/i18n/po/ha/vidalia_ha.po
index d29d261..de68c96 100644
--- a/src/vidalia/i18n/po/ha/vidalia_ha.po
+++ b/src/vidalia/i18n/po/ha/vidalia_ha.po
@@ -1,11 +1,10 @@
#
-# Translators:
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-09-07 14:40+0000\n"
-"PO-Revision-Date: 2010-12-05 20:03+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"
@@ -193,10 +192,6 @@ 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"
@@ -236,10 +231,6 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr ""
-
-msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -279,6 +270,10 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr ""
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -432,17 +427,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"
@@ -1266,44 +1270,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"
@@ -1331,10 +1342,6 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr ""
-
-msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1362,6 +1369,10 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr ""
+
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1644,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 ""
@@ -1680,10 +1663,6 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1796,10 +1775,6 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1882,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 ""
@@ -1934,82 +1897,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 ""
@@ -2057,19 +1949,39 @@ 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)"
+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"
@@ -2091,17 +2003,35 @@ msgid ""
msgstr ""
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"
@@ -2357,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"
@@ -2412,10 +2334,6 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2515,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 ""
@@ -2840,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 ""
@@ -3088,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 ""
@@ -3132,10 +3070,6 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
-msgid "Form"
-msgstr ""
-
-msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3424,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 ""
@@ -3460,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 ""
@@ -3538,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 ""
@@ -3666,6 +3646,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 ""
@@ -3759,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 ""
@@ -3812,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 35f2acd..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:
-# 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: 2012-02-14 09:47+0000\n"
-"Last-Translator: Amichay P. K. <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,169 +37,169 @@ 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"
msgid ""
"%1 already exists.\n"
"Do you want to replace it?"
-msgstr "%1 כבר קיים.\nהאם ברצונך להחליף אותו?"
+msgstr ""
#: qfiledialog.cpp:1690
msgctxt "QFileDialog"
@@ -210,57 +207,57 @@ msgid ""
"%1\n"
"File not found.\n"
"Please verify the correct file name was given."
-msgstr "%1\nהקובץ לא נמצא.\nאנא וודא ששם הקובץ נכון."
+msgstr ""
#: 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"
@@ -268,168 +265,168 @@ msgid ""
"%1\n"
"Directory not found.\n"
"Please verify the correct directory name was given."
-msgstr "%1\nהתיקייה לא נמצאה.\nאנא וודא את שם התיקייה."
+msgstr ""
#: qfiledialog.cpp:2281
msgctxt "QFileDialog"
msgid ""
"'%1' is write protected.\n"
"Do you want to delete it anyway?"
-msgstr "'%1' מוגן מפני כתיבה.\nהאם ברצונך למחוק אותו בכל מקרה?"
+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 "&תיקייה חדשה"
+msgstr ""
#: qfiledialog.cpp:917
msgctxt "QFileDialog"
msgid "&Choose"
-msgstr "&בחר"
+msgstr ""
#: qsidebar.cpp:388
msgctxt "QFileDialog"
msgid "Remove"
-msgstr "הסר"
+msgstr ""
#: qfiledialog.cpp:886
msgctxt "QFileDialog"
msgid "File &name:"
-msgstr "קובץ &בשם:"
+msgstr ""
#: ui_qfiledialog.h:261
msgctxt "QFileDialog"
msgid "Look in:"
-msgstr "חפש ב:"
+msgstr ""
#: ui_qfiledialog.h:279
msgctxt "QFileDialog"
msgid "Create New Folder"
-msgstr "צור תיקייה חדשה"
+msgstr ""
#: qfilesystemmodel.cpp:761
msgctxt "QFileSystemModel"
msgid "Invalid filename"
-msgstr "שם קובץ שגוי"
+msgstr ""
#: qfilesystemmodel.cpp:763
msgctxt "QFileSystemModel"
msgid ""
"<b>The name \"%1\" can not be used.</b><p>Try using another name, with fewer"
" characters or no punctuations marks."
-msgstr "<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/he/vidalia_he.po b/src/vidalia/i18n/po/he/vidalia_he.po
index d07dda7..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: 2012-03-21 17:52+0000\n"
-"PO-Revision-Date: 2012-03-22 08:51+0000\n"
-"Last-Translator: static172 <static.172 at gmail.com>\n"
+"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,29 +179,18 @@ 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 "עשה קונפיגורצייה אוטומטית עבור \"שליטת פורטים\""
-
-msgctxt "AdvancedPage"
-msgid ""
-"You've checked the autoconfiguration option for the ControlPort, but "
-"provided no Data Directory. Please add one, or uncheck the \"Configure "
-"ControlPort automatically\" option."
msgstr ""
msgctxt "AdvancedPage"
@@ -212,7 +198,7 @@ msgid ""
"Vidalia was unable to remove the Tor service.\n"
"\n"
"You may need to remove it manually."
-msgstr "Vidalia לא היתה מסוגלת להסיר את Tor.\n\nיתכן שעליך להסיר אותו ידנית."
+msgstr ""
msgctxt "AppearancePage"
msgid "Language"
@@ -232,23 +218,6 @@ msgstr "בחר את סגנון הממשק של Vidalia"
msgctxt "AppearancePage"
msgid "Vidalia was unable to load the selected language translation."
-msgstr "Vidalia לא היתה מסוגלת לטעון את קבצי התרגום המבוקשים."
-
-msgctxt "AppearancePage"
-msgid ""
-"System Icon Preferences (changes will take effect when you restart Vidalia)"
-msgstr ""
-
-msgctxt "AppearancePage"
-msgid "Show the Tray Icon and Dock Icon (default)"
-msgstr ""
-
-msgctxt "AppearancePage"
-msgid "Hide the Tray Icon"
-msgstr ""
-
-msgctxt "AppearancePage"
-msgid "Hide the Dock Icon"
msgstr ""
msgctxt "BandwidthGraph"
@@ -264,10 +233,6 @@ msgid "Show Settings"
msgstr "הצג הגדרות"
msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr "שימוש רוחב-פס של Tor"
-
-msgctxt "BandwidthGraph"
msgid "Reset"
msgstr "אתחל"
@@ -307,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"
@@ -413,11 +382,11 @@ msgstr "רשת"
msgctxt "ConfigDialog"
msgid "Sharing"
-msgstr "שיתוף"
+msgstr ""
msgctxt "ConfigDialog"
msgid "Services"
-msgstr "שירות"
+msgstr ""
msgctxt "ConfigDialog"
msgid "Appearance"
@@ -460,18 +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 ""
-"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 ""
+
+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"
msgid "Control socket is not connected."
@@ -491,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"
@@ -1344,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."
@@ -1352,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"
@@ -1408,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."
@@ -1540,48 +1525,48 @@ msgstr "מסמכים שנמצאו"
msgctxt "HelpBrowser"
msgid "Error Loading Help Contents:"
-msgstr "שגיאה בטעינת תוכן עזרה:"
+msgstr ""
msgctxt "HelpTextBrowser"
msgid "Opening External Link"
-msgstr "פותח קישור חיצוני"
+msgstr ""
msgctxt "HelpTextBrowser"
msgid ""
"Vidalia can open the link you selected in your default Web browser. If your "
"browser is not currently configured to use Tor then the request will not be "
"anonymous."
-msgstr "Vidalia יכולה לפתוח את הקישור שבחרת בדפדפן ברירת המחדל שלך. אם הדפדפן אינו מותאם לשימוש ב-Tor, הבקשה עשוייה להיות חשופה."
+msgstr ""
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 לא הצליחה לפתוח את הקישור בדפדפן. אתה עדיין יכול להעתיק את הכתובת אל הדפדפן בצורה ידנית."
+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"
@@ -1601,7 +1586,7 @@ msgstr "אזהרה"
msgctxt "LogEvent"
msgid "Error"
-msgstr "שגיאה"
+msgstr "שגיעה"
msgctxt "LogEvent"
msgid "Unknown"
@@ -1609,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"
@@ -1672,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"
@@ -1708,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"
@@ -1721,95 +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 ""
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"
@@ -1820,24 +1777,20 @@ 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 ""
@@ -1847,11 +1800,11 @@ msgstr "Vidalia לא הצליח להפעיל את Tor. אנא בדוק את הה
msgctxt "MainWindow"
msgid "Connecting to Tor"
-msgstr "מתחבר אל Tor"
+msgstr ""
msgctxt "MainWindow"
msgid "Connection Error"
-msgstr "שגיאה בחיבור"
+msgstr ""
msgctxt "MainWindow"
msgid "Relaying is Enabled"
@@ -1859,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"
@@ -1881,7 +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 תשלח עוגיית אימות, אך Vidalia לא היתה מסוגלת למצוא כזאת."
+msgstr ""
msgctxt "MainWindow"
msgid "Would you like to browse for the file 'control_auth_cookie' yourself?"
@@ -1889,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"
@@ -1903,19 +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 ""
msgctxt "MainWindow"
msgid "Tor Update Available"
@@ -1943,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"
@@ -1958,194 +1899,146 @@ 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"
+msgid "Password Reset Failed"
+msgstr ""
msgctxt "MainWindow"
-msgid "View version and license information"
-msgstr "הצג מידע גירסה ורישיון"
+msgid ""
+"The currently installed version of Tor is out of date or no longer "
+"recommended."
+msgstr "גירסת Tor הנוכחית מיושנת ולא מומלצת יותר לשימוש. אנא בקר באתר Tor על מנת להוריד את הגירסה האחרונה."
msgctxt "MainWindow"
-msgid "Exit Vidalia"
-msgstr "צא מ-Vidalia"
+msgid ""
+"Would you like to check if a newer package is available for installation?"
+msgstr ""
msgctxt "MainWindow"
-msgid "Show this window on startup"
-msgstr "הצג חלון זה בעת אתחול"
+msgid "Potentially Unsafe Connection"
+msgstr ""
msgctxt "MainWindow"
-msgid "Hide"
-msgstr "הסתר"
+msgid ""
+"Tor has automatically closed your connection in order to protect your "
+"anonymity."
+msgstr ""
msgctxt "MainWindow"
-msgid "Hide this window"
-msgstr "הסתר חלון זה"
+msgid "Update Failed"
+msgstr "עידכון Tor זמין"
msgctxt "MainWindow"
-msgid "Password Reset Failed"
-msgstr "אתחול סיסמה נכשל"
+msgid "Your software is up to date"
+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."
+"There are no new Tor software packages available for your computer at this "
+"time."
+msgstr ""
msgctxt "MainWindow"
-msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended."
-msgstr "גירסת Tor הנוכחית מיושנת ולא מומלצת יותר לשימוש. אנא בקר באתר Tor על מנת להוריד את הגירסה האחרונה."
+msgid "Installation Failed"
+msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Would you like to check if a newer package is available for installation?"
-msgstr "האם ברצונך לבדוק אם חבילות חדשות יותר זמינות להתקנה?"
+msgid "Vidalia was unable to install your software updates."
+msgstr "Vidalia לא הצליח להתקין את שירות Tor."
msgctxt "MainWindow"
-msgid "Potentially Unsafe Connection"
-msgstr "חיבור מסוכן פוטנציאלית"
+msgid "The following error occurred:"
+msgstr ""
msgctxt "MainWindow"
msgid ""
-"Tor has automatically closed your connection in order to protect your "
-"anonymity."
-msgstr "Tor סגר אוטומטית את החיבור על מנת לשמור על האנונימיות שלך."
+"One of your applications%1appears to be making a potentially unencrypted and"
+" unsafe connection to port %2."
+msgstr ""
msgctxt "MainWindow"
-msgid "Update Failed"
-msgstr "עידכון Tor זמין"
+msgid ""
+"Anything sent over this connection could be monitored. Please check your "
+"application's configuration and use only encrypted protocols, such as SSL, "
+"if possible."
+msgstr ""
msgctxt "MainWindow"
-msgid "Your software is up to date"
-msgstr "התוכנה שבידך מעודכנת"
+msgid "toolBar"
+msgstr ""
msgctxt "MainWindow"
-msgid ""
-"There are no new Tor software packages available for your computer at this "
-"time."
-msgstr "אין חבילות תוכנה חדשות שזמינות למחשבך כרגע."
+msgid "Start"
+msgstr ""
msgctxt "MainWindow"
-msgid "Installation Failed"
-msgstr "ההתקנה נכשלה"
+msgid "Stop"
+msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to install your software updates."
-msgstr "Vidalia לא הצליח להתקין את העידכונים."
+msgid "Restart"
+msgstr ""
msgctxt "MainWindow"
-msgid "The following error occurred:"
-msgstr "השגיאות הבאות אירעו:"
+msgid "Reload Tor's config"
+msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Anything 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, אם מתאפשר."
+msgid "Actions"
+msgstr ""
msgctxt "MainWindow"
msgid "Bootstrapping torrc from %1 to %2"
msgstr ""
msgctxt "MainWindow"
-msgid "(probably Telnet)"
-msgstr "(יתכן (Telnet"
+msgid ""
+"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"\n"
+"Would you like to shutdown gracefully and give clients time to find a new relay?"
+msgstr ""
msgctxt "MainWindow"
-msgid "(probably an email client)"
-msgstr "(כנראה לקוח אימייל)"
+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 ""
-"One of your applications %1 appears to be making a potentially unencrypted "
-"and unsafe connection to port %2."
+"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)"
+msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
-msgstr "הממדר שלך מכובה כעת.\nלחץ \"עצור\" על מנת לעצור אותו מיידית."
+msgid ", probably Telnet,"
+msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Vidalia can't find out how to talk to Tor because it can't access this file: %1\n"
-"\n"
-"Here's the last error message:\n"
-"%2"
+msgid ", probably an email client,"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"It seems Tor has stopped running since Vidalia started it.\n"
-"\n"
-"See the Advanced Message Log for more information."
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
-"\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
-msgstr "אתה מריץ כעת ממסר. עצירת הממסר יפגע בתקשורת של קליינטים דרכך.\n\nהאם ברצונך לעצור את הממסר בהדרגה, ולאפשר לקליינטים לאתר נתיב שונה?"
+msgid "Error reloading configuration"
+msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Vidalia detected that the Tor software exited unexpectedly.\n"
-"\n"
-"Please check the message log for recent warning or error messages."
-msgstr "Vidalia זיהה כי תוכנת Tor נעצרה באופן פתאומי.\n\nאנא בדוק את ארכיון ההודעות למידע נוסף."
+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."
@@ -2153,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."
@@ -2396,32 +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 לא יכול להמשיך."
+msgstr ""
msgctxt "MessageLog"
msgid ""
"Messages that only appear when \n"
"something has gone wrong with Tor."
-msgstr "הודעות המופיעות כאשר משהו\nהשתבש ב-Tor."
+msgstr ""
msgctxt "MessageLog"
msgid ""
@@ -2429,34 +2314,30 @@ msgid ""
"during normal Tor operation and are \n"
"not considered errors, but you may \n"
"care about."
-msgstr "הודעות המופיעות לעיתים רחוקות\nבמהלך פעילות רגילה של Tor\nואינן נחשבות לתקלות, אך יתכן\nשיעניינו אותך."
+msgstr ""
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 ""
"Cannot write file %1\n"
"\n"
"%2."
-msgstr "לא יכול לכתוב את הקובץ %1\n\n%2."
-
-msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr "מפת רשת Tor"
+msgstr ""
msgctxt "NetViewer"
msgid "Refresh"
-msgstr "רענן"
+msgstr "עדכן"
msgctxt "NetViewer"
msgid "Refresh the list of Tor relays and connections"
@@ -2536,7 +2417,7 @@ msgstr "קובץ לא נמצא"
msgctxt "NetViewer"
msgid "No details on the selected relay are available."
-msgstr "אין פרטים זמינים על החיבור הנבחר"
+msgstr ""
msgctxt "NetViewer"
msgid "Unknown"
@@ -2544,16 +2425,40 @@ 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 "גשר לא תקין"
+
+msgctxt "NetworkPage"
+msgid "The specified bridge identifier is not valid."
+msgstr "מזהה הגשר הנתון אינו תקין."
+
msgctxt "NetworkPage"
msgid "Copy (Ctrl+C)"
msgstr "העתק (Ctrl+C)"
@@ -2576,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"
@@ -2600,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"
@@ -2622,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"
@@ -2630,7 +2535,7 @@ msgstr "ספק האינטרנט שלי חוסם חיבורים לרשת Tor"
msgctxt "NetworkPage"
msgid "Bridge Settings"
-msgstr "הגדרות גשר"
+msgstr ""
msgctxt "NetworkPage"
msgid "Add a Bridge:"
@@ -2646,52 +2551,52 @@ 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 "גשרים חדשים אינם זמינים כעת. אתה יכול לחכות ולנסות שוב, או לנסות דרך אחרת לאיתור גשרים חדשים."
+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"
msgstr ""
msgctxt "NetworkPage"
-msgid "HTTP / HTTPS"
-msgstr "HTTP / HTTPS"
+msgid "HTTP"
+msgstr ""
msgctxt "NetworkPage"
-msgid "You must specify one or more bridges."
+msgid "HTTP / HTTPS"
msgstr ""
msgctxt "Policy"
@@ -2760,11 +2665,11 @@ msgstr "לא ידוע"
msgctxt "RouterInfoDialog"
msgid "Relay Details"
-msgstr "פרטי חיבור"
+msgstr ""
msgctxt "RouterInfoDialog"
msgid "Summary"
-msgstr "סיכום"
+msgstr ""
msgctxt "RouterInfoDialog"
msgid "Name:"
@@ -2804,7 +2709,7 @@ msgstr "עודכן לאחרונה:"
msgctxt "RouterInfoDialog"
msgid "Descriptor"
-msgstr "תיאור"
+msgstr ""
msgctxt "RouterListItem"
msgid "Offline"
@@ -2828,7 +2733,7 @@ msgstr "קרב למימסר"
msgctxt "RouterListWidget"
msgid "%1 relays online"
-msgstr "%1 ממסר מחובר"
+msgstr ""
msgctxt "RouterListWidget"
msgid "Copy"
@@ -2836,11 +2741,11 @@ msgstr "העתק"
msgctxt "RouterListWidget"
msgid "Nickname"
-msgstr "כינוי"
+msgstr ""
msgctxt "RouterListWidget"
msgid "Fingerprint"
-msgstr "טביעת אצבע"
+msgstr ""
msgctxt "ServerPage"
msgid "Bridge Support Unavailable"
@@ -2868,7 +2773,7 @@ msgstr "עליך לציין לפחות כינוי ופורט מימסר."
msgctxt "ServerPage"
msgid "Run as a client only"
-msgstr "הפעל כלקוח בלבד"
+msgstr ""
msgctxt "ServerPage"
msgid "Relay Port:"
@@ -2876,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:"
@@ -3041,13 +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 עדיין יחסום יציאה של דוא\"ל ושיתוף קבצים על מנת למנוע ספאם ופשיעה אחרת."
+msgstr ""
msgctxt "ServerPage"
msgid "Exit Policies"
@@ -3068,17 +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 "השאר את הממסר שלך פועל, כך שמשתמשים יוכלו למצוא ולהשתמש בו ביותר קלות."
+msgstr ""
msgctxt "ServerPage"
msgid "Bridge History"
@@ -3092,11 +2997,11 @@ msgctxt "ServerPage"
msgid ""
"Tor returned an improperly formatted response when Vidalia requested your "
"bridge's usage history."
-msgstr "Tor החזיר תשובה שאינה מאורגנת כאשר Vidalia ביקשה את היסטורית השימוש בגשר."
+msgstr ""
msgctxt "ServerPage"
msgid "The returned response was: %1"
-msgstr "התשובה המחוזרת היתה: %1"
+msgstr ""
msgctxt "ServerPage"
msgid "Help censored users reach the Tor network"
@@ -3104,115 +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 for the Tor network (exit relay)"
+msgid "Relay traffic inside the Tor network (non-exit relay)"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic inside the Tor network (non-exit relay)"
+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 שלך."
+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 "אנא הגדר לפחות תיקיית שירות ופורט ווירטואלי עבור כל שירות שאתה מעוניין שישמר. מחק את האחרים."
+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"
@@ -3220,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 ""
@@ -3255,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 ""
@@ -3269,7 +3170,7 @@ msgstr ""
msgctxt "StatusEventWidget"
msgid "Tor Software Error"
-msgstr "שגיאת תוכנה "
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
@@ -3295,7 +3196,7 @@ msgstr ""
msgctxt "StatusEventWidget"
msgid "Your Computer's Clock is Potentially Incorrect"
-msgstr "השעה של המחשב שלך עלולה להיות שגיאה"
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
@@ -3314,7 +3215,7 @@ msgstr ""
msgctxt "StatusEventWidget"
msgid "Potentially Dangerous Connection!"
-msgstr "חיבור העלול להיות מסוכן!."
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
@@ -3326,7 +3227,7 @@ msgstr ""
msgctxt "StatusEventWidget"
msgid "Unknown SOCKS Protocol"
-msgstr "SOCKS Protocol לא ידועים"
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
@@ -3359,7 +3260,7 @@ msgstr ""
msgctxt "StatusEventWidget"
msgid "DNS Hijacking Detected"
-msgstr "נמצא DNS Hijacking"
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
@@ -3459,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 "חדש"
@@ -3495,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)"
@@ -3513,7 +3436,7 @@ msgstr "ערבול סיסמת שליטה נכשל."
msgctxt "TorrcDialog"
msgid "Editing torrc"
-msgstr "ערוך torrc"
+msgstr ""
msgctxt "TorrcDialog"
msgid ""
@@ -3523,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"
@@ -3543,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"
@@ -3651,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"
@@ -3667,11 +3614,11 @@ msgstr "אישור"
msgctxt "UpdateProgressDialog"
msgid "Software Updates"
-msgstr "עדכוני תוכנה"
+msgstr ""
msgctxt "UpdateProgressDialog"
msgid "Checking for updates..."
-msgstr "מחפש עדכונים..."
+msgstr ""
msgctxt "UpdateProgressDialog"
msgid "Cancel"
@@ -3683,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"
@@ -3794,31 +3749,27 @@ 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 ""
"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 ""
msgctxt "stringutil.h"
msgid "%1 secs"
-msgstr "%1 שניות"
+msgstr ""
msgctxt "stringutil.h"
msgid "%1 B/s"
@@ -3838,12 +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/qt_hi.po b/src/vidalia/i18n/po/hi/qt_hi.po
index 8ca424b..9e761e3 100644
--- a/src/vidalia/i18n/po/hi/qt_hi.po
+++ b/src/vidalia/i18n/po/hi/qt_hi.po
@@ -1,11 +1,10 @@
#
-# Translators:
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-08-20 03:25+0000\n"
-"PO-Revision-Date: 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"
@@ -431,5 +430,3 @@ msgstr ""
msgctxt "QFileSystemModel"
msgid "%1 bytes"
msgstr ""
-
-
diff --git a/src/vidalia/i18n/po/hi/vidalia_hi.po b/src/vidalia/i18n/po/hi/vidalia_hi.po
index 7e5a5c5..dae7296 100644
--- a/src/vidalia/i18n/po/hi/vidalia_hi.po
+++ b/src/vidalia/i18n/po/hi/vidalia_hi.po
@@ -1,14 +1,13 @@
#
# Translators:
-# <mayurchanakya at gmail.com>, 2011.
# runasand <runa.sandvik at gmail.com>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2012-03-21 17:52+0000\n"
-"PO-Revision-Date: 2012-03-22 08:51+0000\n"
-"Last-Translator: mayurchanakya <mayurchanakya at gmail.com>\n"
+"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"
@@ -27,11 +26,11 @@ msgstr "लाइसेंस"
msgctxt "AboutDialog"
msgid "Vidalia 0.2.0"
-msgstr "विडालिया 0.2.0"
+msgstr ""
msgctxt "AboutDialog"
msgid "Tor 0.2.0.32"
-msgstr "टोर 0.2.0.32 "
+msgstr ""
msgctxt "AboutDialog"
msgid "Qt 4.4.2"
@@ -44,7 +43,7 @@ msgstr "'% १' IP पता मन्य नहि है ।"
msgctxt "AdvancedPage"
msgid ""
"You selected 'Password' authentication, but did not specify a password."
-msgstr "आपने 'पासवर्ड' प्रमाणीकरण का चयन किया है, लेकिन पासवर्ड निर्दिष्ट नहीं किया."
+msgstr ""
msgctxt "AdvancedPage"
msgid "Select Tor Configuration File"
@@ -124,7 +123,7 @@ msgstr "आपकि संरूपण संचिका के लिये
msgctxt "AdvancedPage"
msgid "Browse"
-msgstr "ब्राउज़ "
+msgstr ""
msgctxt "AdvancedPage"
msgid "Data Directory"
@@ -195,22 +194,11 @@ msgid "Select a file to use for Tor socket path"
msgstr ""
msgctxt "AdvancedPage"
-msgid "Configure ControlPort automatically"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid ""
-"You've checked the autoconfiguration option for the ControlPort, but "
-"provided no Data Directory. Please add one, or uncheck the \"Configure "
-"ControlPort automatically\" option."
-msgstr ""
-
-msgctxt "AdvancedPage"
msgid ""
"Vidalia was unable to remove the Tor service.\n"
"\n"
"You may need to remove it manually."
-msgstr "विडालिया टोर सेवा को हटाने में असमर्थ था. आपको इसे स्वयं हटाने की आवश्यकता हो सकती है."
+msgstr ""
msgctxt "AppearancePage"
msgid "Language"
@@ -222,7 +210,7 @@ msgstr "वीडालीया मे प्रयुक्त होने
msgctxt "AppearancePage"
msgid "Style"
-msgstr "शैली"
+msgstr ""
msgctxt "AppearancePage"
msgid "Choose Vidalia's interface style"
@@ -232,50 +220,29 @@ msgctxt "AppearancePage"
msgid "Vidalia was unable to load the selected language translation."
msgstr "विडालिया चुनि गयी भाषा के अनुवाद को लोड करने मे असमर्थ रहा ।"
-msgctxt "AppearancePage"
-msgid ""
-"System Icon Preferences (changes will take effect when you restart Vidalia)"
-msgstr ""
-
-msgctxt "AppearancePage"
-msgid "Show the Tray Icon and Dock Icon (default)"
-msgstr ""
-
-msgctxt "AppearancePage"
-msgid "Hide the Tray Icon"
-msgstr ""
-
-msgctxt "AppearancePage"
-msgid "Hide the Dock Icon"
-msgstr ""
-
msgctxt "BandwidthGraph"
msgid "Since:"
-msgstr "पश्चात"
+msgstr ""
msgctxt "BandwidthGraph"
msgid "Hide Settings"
-msgstr "सेटिंग्स छुपाएँ"
+msgstr ""
msgctxt "BandwidthGraph"
msgid "Show Settings"
msgstr "अनुकुलन दिखाओ"
msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr "टोर बैंडविड्थ का उपयोग "
-
-msgctxt "BandwidthGraph"
msgid "Reset"
msgstr "पुनःस्थाप"
msgctxt "BandwidthGraph"
msgid "Receive Rate"
-msgstr "जानकारी भेजें जाने का दर "
+msgstr ""
msgctxt "BandwidthGraph"
msgid "Send Rate"
-msgstr "जानकारी प्राप्त का दर"
+msgstr ""
msgctxt "BandwidthGraph"
msgid "Always on Top"
@@ -305,6 +272,10 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr "रद्द "
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr ""
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -335,7 +306,7 @@ msgstr ""
msgctxt "BridgeUsageDialog"
msgid "Country"
-msgstr "देश"
+msgstr ""
msgctxt "BridgeUsageDialog"
msgid "# Clients"
@@ -363,7 +334,7 @@ msgstr "खोले"
msgctxt "Circuit"
msgid "Building"
-msgstr "इमारत"
+msgstr ""
msgctxt "Circuit"
msgid "Failed"
@@ -423,11 +394,11 @@ msgstr ""
msgctxt "ConfigDialog"
msgid "Advanced"
-msgstr "उन्नत"
+msgstr ""
msgctxt "ConfigDialog"
msgid "Help"
-msgstr "मदद"
+msgstr ""
msgctxt "ConfigDialog"
msgid "Error Saving Settings"
@@ -447,7 +418,7 @@ msgstr ""
msgctxt "ConfigDialog"
msgid "Settings"
-msgstr "सेटिंग्स"
+msgstr ""
msgctxt "ControlConnection"
msgid "Vidalia was unable to connect to Tor. (%1)"
@@ -458,17 +429,26 @@ 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 ""
-"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"
@@ -489,143 +469,143 @@ msgstr ""
msgctxt "CountryInfo"
msgid "Afghanistan"
-msgstr "अफ़ग़ानिस्तान"
+msgstr ""
msgctxt "CountryInfo"
msgid "Andorra"
-msgstr "एंडोरा"
+msgstr ""
msgctxt "CountryInfo"
msgid "Angola"
-msgstr "अंगोला"
+msgstr ""
msgctxt "CountryInfo"
msgid "Antigua & Barbuda"
-msgstr "एंटीगुआ और बारबुडा"
+msgstr ""
msgctxt "CountryInfo"
msgid "Argentina"
-msgstr "अर्जेंटीना"
+msgstr ""
msgctxt "CountryInfo"
msgid "Armenia"
-msgstr "अर्मेनिआ"
+msgstr ""
msgctxt "CountryInfo"
msgid "Australia"
-msgstr "ऑस्ट्रेलिया"
+msgstr ""
msgctxt "CountryInfo"
msgid "Azerbaijan"
-msgstr "अज़रबैजान"
+msgstr ""
msgctxt "CountryInfo"
msgid "Bahamas"
-msgstr "बहमास"
+msgstr ""
msgctxt "CountryInfo"
msgid "Bangladesh"
-msgstr "बांग्लादेश"
+msgstr ""
msgctxt "CountryInfo"
msgid "Barbados"
-msgstr "बारबाडोस"
+msgstr ""
msgctxt "CountryInfo"
msgid "Belarus"
-msgstr "बेलारूस"
+msgstr ""
msgctxt "CountryInfo"
msgid "Belgium"
-msgstr "बेल्जियम"
+msgstr ""
msgctxt "CountryInfo"
msgid "Belize"
-msgstr "बेलीज़"
+msgstr ""
msgctxt "CountryInfo"
msgid "Bhutan"
-msgstr "भूटान"
+msgstr ""
msgctxt "CountryInfo"
msgid "Bolivia"
-msgstr "बोलीविया"
+msgstr ""
msgctxt "CountryInfo"
msgid "Bosnia & Herzegovina"
-msgstr "बोस्निया और हर्ज़ेगोविना"
+msgstr ""
msgctxt "CountryInfo"
msgid "Botswana"
-msgstr "बोत्सवाना"
+msgstr ""
msgctxt "CountryInfo"
msgid "Brazil"
-msgstr "ब्राज़िल"
+msgstr ""
msgctxt "CountryInfo"
msgid "Brunei Darussalam"
-msgstr "ब्रुनेई दारुसलाम"
+msgstr ""
msgctxt "CountryInfo"
msgid "Bulgaria"
-msgstr "बुल्गारिया"
+msgstr ""
msgctxt "CountryInfo"
msgid "Burkina Faso"
-msgstr "बुर्किना फासो"
+msgstr ""
msgctxt "CountryInfo"
msgid "Burundi"
-msgstr "बुस्र्न्दी"
+msgstr ""
msgctxt "CountryInfo"
msgid "Cambodia"
-msgstr "कंबोडिया"
+msgstr ""
msgctxt "CountryInfo"
msgid "Cameroon"
-msgstr "कैमरून"
+msgstr ""
msgctxt "CountryInfo"
msgid "Canada"
-msgstr "कनाडा"
+msgstr ""
msgctxt "CountryInfo"
msgid "Cape Verde"
-msgstr "केप वर्ड"
+msgstr ""
msgctxt "CountryInfo"
msgid "Central African Republic"
-msgstr "मध्य अफ्रीकी गणराज्य"
+msgstr ""
msgctxt "CountryInfo"
msgid "Chad"
-msgstr "चाड"
+msgstr ""
msgctxt "CountryInfo"
msgid "Chile"
-msgstr "चिली"
+msgstr ""
msgctxt "CountryInfo"
msgid "China"
-msgstr "चीन"
+msgstr ""
msgctxt "CountryInfo"
msgid "Colombia"
-msgstr "कोलंबिया"
+msgstr ""
msgctxt "CountryInfo"
msgid "Comoros"
-msgstr "कोमोरोज़"
+msgstr ""
msgctxt "CountryInfo"
msgid "Congo, The Democratic Republic of the"
-msgstr "कांगो, लोकतांत्रिक गणराज्य"
+msgstr ""
msgctxt "CountryInfo"
msgid "Congo"
-msgstr "कांगो"
+msgstr ""
msgctxt "CountryInfo"
msgid "Costa Rica"
@@ -633,103 +613,103 @@ msgstr ""
msgctxt "CountryInfo"
msgid "Cote d’Ivoire"
-msgstr "कोटे डा आइवर"
+msgstr ""
msgctxt "CountryInfo"
msgid "Croatia"
-msgstr "क्रोएशिया"
+msgstr ""
msgctxt "CountryInfo"
msgid "Cuba"
-msgstr "क्यूबा"
+msgstr ""
msgctxt "CountryInfo"
msgid "Cyprus"
-msgstr "सायप्रस"
+msgstr ""
msgctxt "CountryInfo"
msgid "Czech Republic"
-msgstr "चेक गणराज्य"
+msgstr ""
msgctxt "CountryInfo"
msgid "Denmark"
-msgstr "डेनमार्क"
+msgstr ""
msgctxt "CountryInfo"
msgid "Djibouti"
-msgstr "जिबोटी"
+msgstr ""
msgctxt "CountryInfo"
msgid "Dominica"
-msgstr "डॉमिनिका"
+msgstr ""
msgctxt "CountryInfo"
msgid "Dominican Republic"
-msgstr "डॉमिनिक गणराज्य"
+msgstr ""
msgctxt "CountryInfo"
msgid "Ecuador"
-msgstr "इक्वेडोर"
+msgstr ""
msgctxt "CountryInfo"
msgid "Egypt"
-msgstr "मिस्र"
+msgstr ""
msgctxt "CountryInfo"
msgid "El Salvador"
-msgstr "अल सल्वाडोर"
+msgstr ""
msgctxt "CountryInfo"
msgid "Equatorial Guinea"
-msgstr "इक्वेटोरियल गिनी"
+msgstr ""
msgctxt "CountryInfo"
msgid "Eritrea"
-msgstr "इरीट्रिया"
+msgstr ""
msgctxt "CountryInfo"
msgid "Estonia"
-msgstr "एस्तोनिया"
+msgstr ""
msgctxt "CountryInfo"
msgid "France"
-msgstr "फ्रांस"
+msgstr ""
msgctxt "CountryInfo"
msgid "Gabon"
-msgstr "गैबन"
+msgstr ""
msgctxt "CountryInfo"
msgid "Gambia"
-msgstr "जाम्बिया"
+msgstr ""
msgctxt "CountryInfo"
msgid "Georgia"
-msgstr "जॉर्जिया"
+msgstr ""
msgctxt "CountryInfo"
msgid "Germany"
-msgstr "जर्मनी"
+msgstr ""
msgctxt "CountryInfo"
msgid "Ghana"
-msgstr "घाना"
+msgstr ""
msgctxt "CountryInfo"
msgid "Grenada"
-msgstr "ग्रेनेडा"
+msgstr ""
msgctxt "CountryInfo"
msgid "Guatemala"
-msgstr "ग्वाटेमाला"
+msgstr ""
msgctxt "CountryInfo"
msgid "Guinea"
-msgstr "गिनी"
+msgstr ""
msgctxt "CountryInfo"
msgid "Guinea-Bissau"
-msgstr "गिन्नी - बिसाउ"
+msgstr ""
msgctxt "CountryInfo"
msgid "Guyana"
@@ -737,451 +717,451 @@ msgstr ""
msgctxt "CountryInfo"
msgid "Hong Kong"
-msgstr "हाँग काँग"
+msgstr ""
msgctxt "CountryInfo"
msgid "Haiti"
-msgstr "हैती"
+msgstr ""
msgctxt "CountryInfo"
msgid "Honduras"
-msgstr "होंडुरस"
+msgstr ""
msgctxt "CountryInfo"
msgid "Israel"
-msgstr "इजराइल"
+msgstr ""
msgctxt "CountryInfo"
msgid "Italy"
-msgstr "इटली"
+msgstr ""
msgctxt "CountryInfo"
msgid "Jamaica"
-msgstr "जमैका"
+msgstr ""
msgctxt "CountryInfo"
msgid "Japan"
-msgstr "जापान"
+msgstr ""
msgctxt "CountryInfo"
msgid "Jordan"
-msgstr "जॉर्डन"
+msgstr ""
msgctxt "CountryInfo"
msgid "Kazakhstan"
-msgstr "कजाखस्तान"
+msgstr ""
msgctxt "CountryInfo"
msgid "Kenya"
-msgstr "केन्या"
+msgstr ""
msgctxt "CountryInfo"
msgid "Kiribati"
-msgstr "किरबाती"
+msgstr ""
msgctxt "CountryInfo"
msgid "Kuwait"
-msgstr "कुवैत"
+msgstr ""
msgctxt "CountryInfo"
msgid "Kyrgyzstan"
-msgstr "किर्गिस्तान"
+msgstr ""
msgctxt "CountryInfo"
msgid "Laos"
-msgstr "लाओस"
+msgstr ""
msgctxt "CountryInfo"
msgid "Latvia"
-msgstr "लाटविया"
+msgstr ""
msgctxt "CountryInfo"
msgid "Lebanon"
-msgstr "लेबनान"
+msgstr ""
msgctxt "CountryInfo"
msgid "Lesotho"
-msgstr "लेसोथो"
+msgstr ""
msgctxt "CountryInfo"
msgid "Liberia"
-msgstr "लाइबेरिया"
+msgstr ""
msgctxt "CountryInfo"
msgid "Liechtenstein"
-msgstr "लिचेंस्टीन"
+msgstr ""
msgctxt "CountryInfo"
msgid "Lithuania"
-msgstr "लिथुआनिया"
+msgstr ""
msgctxt "CountryInfo"
msgid "Luxembourg"
-msgstr "लक्ज़मबर्ग"
+msgstr ""
msgctxt "CountryInfo"
msgid "Macedonia"
-msgstr "मकदूनिया"
+msgstr ""
msgctxt "CountryInfo"
msgid "Madagascar"
-msgstr "मेडागास्कर"
+msgstr ""
msgctxt "CountryInfo"
msgid "Malawi"
-msgstr "मलावी"
+msgstr ""
msgctxt "CountryInfo"
msgid "Malaysia"
-msgstr "मलेशिया"
+msgstr ""
msgctxt "CountryInfo"
msgid "Mali"
-msgstr "माली"
+msgstr ""
msgctxt "CountryInfo"
msgid "Malta"
-msgstr "माल्टा"
+msgstr ""
msgctxt "CountryInfo"
msgid "Marshall Islands"
-msgstr "मार्शल द्वीप"
+msgstr ""
msgctxt "CountryInfo"
msgid "Mauritania"
-msgstr "मॉरिटानिया"
+msgstr ""
msgctxt "CountryInfo"
msgid "Mauritius"
-msgstr "मॉरिशस"
+msgstr ""
msgctxt "CountryInfo"
msgid "Micronesia"
-msgstr "माइक्रोनेशिया"
+msgstr ""
msgctxt "CountryInfo"
msgid "Moldova"
-msgstr "माल्डोवा"
+msgstr ""
msgctxt "CountryInfo"
msgid "Monaco"
-msgstr "मोनाको"
+msgstr ""
msgctxt "CountryInfo"
msgid "Mongolia"
-msgstr "मंगोलिया"
+msgstr ""
msgctxt "CountryInfo"
msgid "Montenegro"
-msgstr "मॉन्टेंगरो"
+msgstr ""
msgctxt "CountryInfo"
msgid "Morocco"
-msgstr "मोरक्को"
+msgstr ""
msgctxt "CountryInfo"
msgid "Mozambique"
-msgstr "मोज़ाम्बिक"
+msgstr ""
msgctxt "CountryInfo"
msgid "Namibia"
-msgstr "नामीबिया"
+msgstr ""
msgctxt "CountryInfo"
msgid "Nauru"
-msgstr "नॉरू"
+msgstr ""
msgctxt "CountryInfo"
msgid "Nepal"
-msgstr "नेपाल"
+msgstr ""
msgctxt "CountryInfo"
msgid "Netherlands"
-msgstr "नीदरलैंड"
+msgstr ""
msgctxt "CountryInfo"
msgid "New Zealand"
-msgstr "न्यूज़ीलैंड"
+msgstr ""
msgctxt "CountryInfo"
msgid "Nicaragua"
-msgstr "निकारागुआ"
+msgstr ""
msgctxt "CountryInfo"
msgid "Niger"
-msgstr "नाइजर"
+msgstr ""
msgctxt "CountryInfo"
msgid "Nigeria"
-msgstr "नाइजीरिया"
+msgstr ""
msgctxt "CountryInfo"
msgid "Norway"
-msgstr "नॉर्वे"
+msgstr ""
msgctxt "CountryInfo"
msgid "Oman"
-msgstr "ओमान"
+msgstr ""
msgctxt "CountryInfo"
msgid "Pakistan"
-msgstr "पाकिस्तान"
+msgstr ""
msgctxt "CountryInfo"
msgid "Palau"
-msgstr "पलाऊ"
+msgstr ""
msgctxt "CountryInfo"
msgid "Palestine"
-msgstr "पलेस्टाइन"
+msgstr ""
msgctxt "CountryInfo"
msgid "Panama"
-msgstr "पनामा"
+msgstr ""
msgctxt "CountryInfo"
msgid "Papua New Guinea"
-msgstr "पापुआ न्यू गिनी"
+msgstr ""
msgctxt "CountryInfo"
msgid "Paraguay"
-msgstr "पैराग्वे"
+msgstr ""
msgctxt "CountryInfo"
msgid "Peru"
-msgstr "पेरू"
+msgstr ""
msgctxt "CountryInfo"
msgid "Philippines"
-msgstr "फ़िलिपींस"
+msgstr ""
msgctxt "CountryInfo"
msgid "Poland"
-msgstr "पोलैंड"
+msgstr ""
msgctxt "CountryInfo"
msgid "Portugal"
-msgstr "पुर्तगाल"
+msgstr ""
msgctxt "CountryInfo"
msgid "Qatar"
-msgstr "क़तर"
+msgstr ""
msgctxt "CountryInfo"
msgid "Romania"
-msgstr "रोमानिया"
+msgstr ""
msgctxt "CountryInfo"
msgid "Russia"
-msgstr "रूस"
+msgstr ""
msgctxt "CountryInfo"
msgid "Rwanda"
-msgstr "रवांडा"
+msgstr ""
msgctxt "CountryInfo"
msgid "Saint Kitts & Nevis"
-msgstr "सेंट किट्स और नेविस"
+msgstr ""
msgctxt "CountryInfo"
msgid "Saint Lucia"
-msgstr "सेंट लूसिया"
+msgstr ""
msgctxt "CountryInfo"
msgid "Saint Vincent & the Grenadines"
-msgstr "सेंट विन्सेंट और ग्रेनेजियन्स"
+msgstr ""
msgctxt "CountryInfo"
msgid "Samoa"
-msgstr "सामोआ"
+msgstr ""
msgctxt "CountryInfo"
msgid "San Marino"
-msgstr "सैन मारिनो"
+msgstr ""
msgctxt "CountryInfo"
msgid "Sao Tome & Principe"
-msgstr "साओ टोम और प्रिंसिपे"
+msgstr ""
msgctxt "CountryInfo"
msgid "Saudi Arabia"
-msgstr "सऊदी अरब"
+msgstr ""
msgctxt "CountryInfo"
msgid "Senegal"
-msgstr "सेनेगल"
+msgstr ""
msgctxt "CountryInfo"
msgid "Serbia"
-msgstr "सर्बिआ"
+msgstr ""
msgctxt "CountryInfo"
msgid "Seychelles"
-msgstr "सेशेल्स"
+msgstr ""
msgctxt "CountryInfo"
msgid "Sierra Leone"
-msgstr "सिएरा लियोन"
+msgstr ""
msgctxt "CountryInfo"
msgid "Singapore"
-msgstr "सिंगापुर"
+msgstr ""
msgctxt "CountryInfo"
msgid "Slovakia"
-msgstr "स्लोवाकिया"
+msgstr ""
msgctxt "CountryInfo"
msgid "Slovenia"
-msgstr "स्लोवेनिया"
+msgstr ""
msgctxt "CountryInfo"
msgid "Solomon Islands"
-msgstr "सोलोमन आइलैंड्स"
+msgstr ""
msgctxt "CountryInfo"
msgid "Somalia"
-msgstr "सोमालिया"
+msgstr ""
msgctxt "CountryInfo"
msgid "South Africa"
-msgstr "दक्षिण अफ्रीका"
+msgstr ""
msgctxt "CountryInfo"
msgid "Spain"
-msgstr "स्पेन"
+msgstr ""
msgctxt "CountryInfo"
msgid "Sri Lanka"
-msgstr "श्रीलंका"
+msgstr ""
msgctxt "CountryInfo"
msgid "Sudan"
-msgstr "सूडान"
+msgstr ""
msgctxt "CountryInfo"
msgid "Suriname"
-msgstr "सूरीनाम"
+msgstr ""
msgctxt "CountryInfo"
msgid "Swaziland"
-msgstr "स्वाज़ीलैंड"
+msgstr ""
msgctxt "CountryInfo"
msgid "Sweden"
-msgstr "स्वीडन"
+msgstr ""
msgctxt "CountryInfo"
msgid "Switzerland"
-msgstr "स्विजरलैंड"
+msgstr ""
msgctxt "CountryInfo"
msgid "Syria"
-msgstr "सीरिया"
+msgstr ""
msgctxt "CountryInfo"
msgid "Tajikistan"
-msgstr "ताजीकिस्तान"
+msgstr ""
msgctxt "CountryInfo"
msgid "Tanzania"
-msgstr "तंज़ानिया"
+msgstr ""
msgctxt "CountryInfo"
msgid "Thailand"
-msgstr "थाईलैंड"
+msgstr ""
msgctxt "CountryInfo"
msgid "Timor-Leste (East Timor)"
-msgstr "तिमोर लेस्ते (पूर्वी तिमोर)"
+msgstr ""
msgctxt "CountryInfo"
msgid "Togo"
-msgstr "टोगो"
+msgstr ""
msgctxt "CountryInfo"
msgid "Tonga"
-msgstr "टोंगा"
+msgstr ""
msgctxt "CountryInfo"
msgid "Trinidad & Tobago"
-msgstr "त्रिनिदाद एवं टोबैगो"
+msgstr ""
msgctxt "CountryInfo"
msgid "Tunisia"
-msgstr "ट्यूनीशिया"
+msgstr ""
msgctxt "CountryInfo"
msgid "Turkey"
-msgstr "टर्की"
+msgstr ""
msgctxt "CountryInfo"
msgid "Turkmenistan"
-msgstr "तुर्कमेनिस्तान"
+msgstr ""
msgctxt "CountryInfo"
msgid "Tuvalu"
-msgstr "टवालू"
+msgstr ""
msgctxt "CountryInfo"
msgid "Uganda"
-msgstr "यूगांडा"
+msgstr ""
msgctxt "CountryInfo"
msgid "Ukraine"
-msgstr "यूक्रेन"
+msgstr ""
msgctxt "CountryInfo"
msgid "United Arab Emirates"
-msgstr "संयुक्त अरब अमीरात"
+msgstr ""
msgctxt "CountryInfo"
msgid "United Kingdom"
-msgstr "यूनाइटेड किंगडम"
+msgstr ""
msgctxt "CountryInfo"
msgid "United States"
-msgstr "अमेरिका"
+msgstr ""
msgctxt "CountryInfo"
msgid "Uruguay"
-msgstr "उरुग्वे"
+msgstr ""
msgctxt "CountryInfo"
msgid "Uzbekistan"
-msgstr "उज़्बेकिस्तान"
+msgstr ""
msgctxt "CountryInfo"
msgid "Vanuatu"
-msgstr "वानातू"
+msgstr ""
msgctxt "CountryInfo"
msgid "Vatican"
-msgstr "पादरी सरकार"
+msgstr ""
msgctxt "CountryInfo"
msgid "Venezuela"
-msgstr "वेनेज़ुएला"
+msgstr ""
msgctxt "CountryInfo"
msgid "Vietnam"
-msgstr "वियतनाम"
+msgstr ""
msgctxt "CountryInfo"
msgid "Western Sahara"
-msgstr "पश्चिमी सहारा"
+msgstr ""
msgctxt "CountryInfo"
msgid "Yemen"
-msgstr "यमन"
+msgstr ""
msgctxt "CountryInfo"
msgid "Zambia"
-msgstr "ज़ाम्बिया"
+msgstr ""
msgctxt "CountryInfo"
msgid "Zimbabwe"
-msgstr "ज़िम्बाब्वे"
+msgstr ""
msgctxt "CountryInfo"
msgid "Zaire"
@@ -1189,99 +1169,99 @@ msgstr ""
msgctxt "CountryInfo"
msgid "Albania"
-msgstr "अल्बानिया"
+msgstr ""
msgctxt "CountryInfo"
msgid "Algeria"
-msgstr "अल्जीरिया"
+msgstr ""
msgctxt "CountryInfo"
msgid "Austria"
-msgstr "ऑस्ट्रिया"
+msgstr ""
msgctxt "CountryInfo"
msgid "Bahrain"
-msgstr "बहरीन"
+msgstr ""
msgctxt "CountryInfo"
msgid "Benin"
-msgstr "बेनिन"
+msgstr ""
msgctxt "CountryInfo"
msgid "Ethiopia"
-msgstr "इथियोपिया"
+msgstr ""
msgctxt "CountryInfo"
msgid "Fiji"
-msgstr "फिजी"
+msgstr ""
msgctxt "CountryInfo"
msgid "Finland"
-msgstr "फ़िनलैंड"
+msgstr ""
msgctxt "CountryInfo"
msgid "Greece"
-msgstr "ग्रीस"
+msgstr ""
msgctxt "CountryInfo"
msgid "Guam"
-msgstr "गुआम"
+msgstr ""
msgctxt "CountryInfo"
msgid "Hungary"
-msgstr "हंगरी"
+msgstr ""
msgctxt "CountryInfo"
msgid "Iceland"
-msgstr "आइसलैंड"
+msgstr ""
msgctxt "CountryInfo"
msgid "India"
-msgstr "भारत"
+msgstr ""
msgctxt "CountryInfo"
msgid "Indonesia"
-msgstr "इंडोनेशिया"
+msgstr ""
msgctxt "CountryInfo"
msgid "Iran"
-msgstr "ईरान"
+msgstr ""
msgctxt "CountryInfo"
msgid "Iraq"
-msgstr "इराक"
+msgstr ""
msgctxt "CountryInfo"
msgid "Ireland"
-msgstr "आयरलैंड"
+msgstr ""
msgctxt "CountryInfo"
msgid "Korea, North"
-msgstr "उत्तर कोरिया"
+msgstr ""
msgctxt "CountryInfo"
msgid "Korea, South"
-msgstr "दक्षिण कोरिया"
+msgstr ""
msgctxt "CountryInfo"
msgid "Libya"
-msgstr "लीबिया"
+msgstr ""
msgctxt "CountryInfo"
msgid "Maldives"
-msgstr "मालदीव"
+msgstr ""
msgctxt "CountryInfo"
msgid "Mexico"
-msgstr "मेक्सिको"
+msgstr ""
msgctxt "CountryInfo"
msgid "Myanmar"
-msgstr "म्यांमार"
+msgstr ""
msgctxt "CountryInfo"
msgid "Taiwan"
-msgstr "ताइवान"
+msgstr ""
msgctxt "CrashReportDialog"
msgid "Submit a Crash Report"
@@ -1292,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"
@@ -1357,12 +1344,8 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr ""
-
-msgctxt "GeneralPage"
msgid "Tor"
-msgstr "टो"
+msgstr ""
msgctxt "GeneralPage"
msgid "Proxy Application (optional)"
@@ -1386,7 +1369,11 @@ msgstr ""
msgctxt "GeneralPage"
msgid "Check Now"
-msgstr "जाँच करें"
+msgstr ""
+
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr ""
msgctxt "GraphFrame"
msgid "%1 KB/s"
@@ -1426,7 +1413,7 @@ msgstr ""
msgctxt "HelpBrowser"
msgid "Text not found in document"
-msgstr "दस्तावेज़ में पाठ नहीं मिला"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Found %1 results"
@@ -1438,11 +1425,11 @@ msgstr ""
msgctxt "HelpBrowser"
msgid "Back"
-msgstr "वापस"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Move to previous page (Backspace)"
-msgstr "पिछले पृष्ठ पे जाएँ (बैकस्पेस)"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Backspace"
@@ -1454,7 +1441,7 @@ msgstr ""
msgctxt "HelpBrowser"
msgid "Move to next page (Shift+Backspace)"
-msgstr "अगले पृष्ठ पर ले जाएँ (शिफ्ट + बैकस्पेस )"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Shift+Backspace"
@@ -1670,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 ""
@@ -1706,10 +1665,6 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1774,6 +1729,10 @@ msgid "Connected to the Tor network!"
msgstr ""
msgctxt "MainWindow"
+msgid "Unrecognized startup status"
+msgstr ""
+
+msgctxt "MainWindow"
msgid "miscellaneous"
msgstr ""
@@ -1818,10 +1777,6 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1904,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 ""
@@ -1956,82 +1899,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 ""
@@ -2079,66 +1951,89 @@ 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 "Bootstrapping torrc from %1 to %2"
+msgid "toolBar"
msgstr ""
msgctxt "MainWindow"
-msgid "(probably Telnet)"
+msgid "Start"
msgstr ""
msgctxt "MainWindow"
-msgid "(probably an email client)"
+msgid "Stop"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"One of your applications %1 appears to be making a potentially unencrypted "
-"and unsafe connection to port %2."
+msgid "Restart"
msgstr ""
msgctxt "MainWindow"
-msgid "failed (%1)"
+msgid "Reload Tor's config"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+msgid "Actions"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Bootstrapping torrc from %1 to %2"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia can't find out how to talk to Tor because it can't access this file: %1\n"
+"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
"\n"
-"Here's the last error message:\n"
-"%2"
+"Would you like to shutdown gracefully and give clients time to find a new relay?"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"It seems Tor has stopped running since Vidalia started it.\n"
+"Vidalia detected that the Tor software exited unexpectedly.\n"
"\n"
-"See the Advanced Message Log for more information."
+"Please check the message log for recent warning or error messages."
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?"
+"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 ""
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 "Error reloading configuration"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to reload Tor's configuration."
msgstr ""
msgctxt "MessageLog"
@@ -2394,19 +2289,11 @@ msgid "Automatically save new log messages to a file"
msgstr ""
msgctxt "MessageLog"
-msgid "Basic"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Tor Status"
+msgid "Always Save New Log Messages"
msgstr ""
msgctxt "MessageLog"
-msgid "Advanced"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
+msgid "toolbar"
msgstr ""
msgctxt "MessageLog"
@@ -2449,10 +2336,6 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2552,6 +2435,30 @@ 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 ""
+
+msgctxt "NetworkPage"
+msgid "The specified bridge identifier is not valid."
+msgstr ""
+
msgctxt "NetworkPage"
msgid "Copy (Ctrl+C)"
msgstr ""
@@ -2685,11 +2592,11 @@ msgid "SOCKS 5"
msgstr ""
msgctxt "NetworkPage"
-msgid "HTTP / HTTPS"
+msgid "HTTP"
msgstr ""
msgctxt "NetworkPage"
-msgid "You must specify one or more bridges."
+msgid "HTTP / HTTPS"
msgstr ""
msgctxt "Policy"
@@ -3113,11 +3020,11 @@ msgid "Automatically distribute my bridge address"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network (exit relay)"
+msgid "Relay traffic inside the Tor network (non-exit relay)"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic inside the Tor network (non-exit relay)"
+msgid "Relay traffic for the Tor network (exit relay)"
msgstr ""
msgctxt "ServerPage"
@@ -3165,10 +3072,6 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
-msgid "Form"
-msgstr ""
-
-msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3457,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 "नया"
@@ -3493,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 ""
@@ -3571,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 ""
@@ -3699,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 ""
@@ -3792,10 +3749,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 ""
diff --git a/src/vidalia/i18n/po/hr/qt_hr.po b/src/vidalia/i18n/po/hr/qt_hr.po
index fa5810c..5f5c70e 100644
--- a/src/vidalia/i18n/po/hr/qt_hr.po
+++ b/src/vidalia/i18n/po/hr/qt_hr.po
@@ -1,11 +1,10 @@
#
-# Translators:
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-08-20 03:25+0000\n"
-"PO-Revision-Date: 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"
@@ -431,5 +430,3 @@ msgstr ""
msgctxt "QFileSystemModel"
msgid "%1 bytes"
msgstr ""
-
-
diff --git a/src/vidalia/i18n/po/hr/vidalia_hr.po b/src/vidalia/i18n/po/hr/vidalia_hr.po
index 722f069..7fb3b9f 100755
--- a/src/vidalia/i18n/po/hr/vidalia_hr.po
+++ b/src/vidalia/i18n/po/hr/vidalia_hr.po
@@ -1,11 +1,10 @@
#
-# Translators:
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-09-07 14:40+0000\n"
-"PO-Revision-Date: 2010-12-05 20:03+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"
@@ -193,10 +192,6 @@ 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"
@@ -236,10 +231,6 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr ""
-
-msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -279,6 +270,10 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr ""
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -432,17 +427,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"
@@ -1266,44 +1270,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"
@@ -1331,10 +1342,6 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr ""
-
-msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1362,6 +1369,10 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr ""
+
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1644,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 ""
@@ -1680,10 +1663,6 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1796,10 +1775,6 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1882,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 ""
@@ -1934,82 +1897,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 ""
@@ -2057,19 +1949,39 @@ 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)"
+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"
@@ -2091,17 +2003,35 @@ msgid ""
msgstr ""
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"
@@ -2357,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"
@@ -2412,10 +2334,6 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2515,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 ""
@@ -2840,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 ""
@@ -3088,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 ""
@@ -3132,10 +3070,6 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
-msgid "Form"
-msgstr ""
-
-msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3424,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 ""
@@ -3460,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 ""
@@ -3538,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 ""
@@ -3666,6 +3646,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 ""
@@ -3759,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 ""
@@ -3812,5 +3796,3 @@ msgstr ""
msgctxt "stringutil.h"
msgid "%1 mins"
msgstr ""
-
-
diff --git a/src/vidalia/i18n/po/hr_HR/qt_hr_HR.po b/src/vidalia/i18n/po/hr_HR/qt_hr_HR.po
deleted file mode 100644
index f309161..0000000
--- a/src/vidalia/i18n/po/hr_HR/qt_hr_HR.po
+++ /dev/null
@@ -1,435 +0,0 @@
-# Translators:
-# Translators:
-# Armando Vega <synaan at gmail.com>, 2012.
-# <trebelnik2 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-05-09 08:52+0000\n"
-"Last-Translator: gogo <trebelnik2 at gmail.com>\n"
-"Language-Team: none\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: hr_HR\n"
-"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2\n"
-"X-Generator: Vidalia ts2po 0.2\n"
-
-#: qaccessibleobject.cpp:348
-msgctxt "QApplication"
-msgid "Activate"
-msgstr "Aktiviraj"
-
-#: qmessagebox.h:319
-msgctxt "QApplication"
-msgid "Executable '%1' requires Qt %2, found Qt %3."
-msgstr "Izvršna datoteka '%1' zahtjeva Qt %2, pronađen Qt %3."
-
-#: qmessagebox.h:321
-msgctxt "QApplication"
-msgid "Incompatible Qt Library Error"
-msgstr "Greška nekompatibilne Qt knjižnice"
-
-#: qapplication.cpp:2095
-msgctxt "QApplication"
-msgid "QT_LAYOUT_DIRECTION"
-msgstr "QT_SMJER_RASPOREDA"
-
-#: qaccessibleobject.cpp:350
-msgctxt "QApplication"
-msgid "Activates the program's main window"
-msgstr "Aktivira glavni prozor aplikacije"
-
-#: qmessagebox.cpp:2104
-msgctxt "QDialogButtonBox"
-msgid "OK"
-msgstr "OK"
-
-#: qdialogbuttonbox.cpp:528
-msgctxt "QDialogButtonBox"
-msgid "Save"
-msgstr "Spremi"
-
-#: qdialogbuttonbox.cpp:531
-msgctxt "QDialogButtonBox"
-msgid "Open"
-msgstr "Otvori"
-
-#: qdialogbuttonbox.cpp:534
-msgctxt "QDialogButtonBox"
-msgid "Cancel"
-msgstr "Odustani"
-
-#: qdialogbuttonbox.cpp:537
-msgctxt "QDialogButtonBox"
-msgid "Close"
-msgstr "Zatvori"
-
-#: qdialogbuttonbox.cpp:540
-msgctxt "QDialogButtonBox"
-msgid "Apply"
-msgstr "Primjeni"
-
-#: qdialogbuttonbox.cpp:543
-msgctxt "QDialogButtonBox"
-msgid "Reset"
-msgstr "Poništi"
-
-#: qdialogbuttonbox.cpp:546
-msgctxt "QDialogButtonBox"
-msgid "Help"
-msgstr "Pomoć"
-
-#: qdialogbuttonbox.cpp:550
-msgctxt "QDialogButtonBox"
-msgid "Don't Save"
-msgstr "Ne spremaj"
-
-#: qdialogbuttonbox.cpp:554
-msgctxt "QDialogButtonBox"
-msgid "Discard"
-msgstr "Odbaci"
-
-#: qdialogbuttonbox.cpp:557
-msgctxt "QDialogButtonBox"
-msgid "&Yes"
-msgstr "&Da"
-
-#: qdialogbuttonbox.cpp:560
-msgctxt "QDialogButtonBox"
-msgid "Yes to &All"
-msgstr "Da z&a sve"
-
-#: qdialogbuttonbox.cpp:563
-msgctxt "QDialogButtonBox"
-msgid "&No"
-msgstr "&Ne"
-
-#: qdialogbuttonbox.cpp:566
-msgctxt "QDialogButtonBox"
-msgid "N&o to All"
-msgstr "N&e za sve"
-
-#: qdialogbuttonbox.cpp:569
-msgctxt "QDialogButtonBox"
-msgid "Save All"
-msgstr "Spremi sve"
-
-#: qdialogbuttonbox.cpp:572
-msgctxt "QDialogButtonBox"
-msgid "Abort"
-msgstr "Prekini"
-
-#: qdialogbuttonbox.cpp:575
-msgctxt "QDialogButtonBox"
-msgid "Retry"
-msgstr "Pokušaj ponovno"
-
-#: qdialogbuttonbox.cpp:578
-msgctxt "QDialogButtonBox"
-msgid "Ignore"
-msgstr "Ignoriraj"
-
-#: qdialogbuttonbox.cpp:581
-msgctxt "QDialogButtonBox"
-msgid "Restore Defaults"
-msgstr "Vrati uobičajeno"
-
-#: qdialogbuttonbox.cpp:552
-msgctxt "QDialogButtonBox"
-msgid "Close without Saving"
-msgstr "Zatvori bez spremanja"
-
-#: qdialogbuttonbox.cpp:525
-msgctxt "QDialogButtonBox"
-msgid "&OK"
-msgstr "&U redu"
-
-#: qdirmodel.cpp:423
-msgctxt "QDirModel"
-msgid "Name"
-msgstr "Naziv"
-
-#: qdirmodel.cpp:424
-msgctxt "QDirModel"
-msgid "Size"
-msgstr "Veličina"
-
-#: qdirmodel.cpp:427
-msgctxt "QDirModel"
-msgid "Kind"
-msgstr "Vrsta"
-
-#: qdirmodel.cpp:429
-msgctxt "QDirModel"
-msgid "Type"
-msgstr "Tip"
-
-#: qdirmodel.cpp:435
-msgctxt "QDirModel"
-msgid "Date Modified"
-msgstr "Datum izmjene"
-
-#: qfiledialog_win.cpp:126
-msgctxt "QFileDialog"
-msgid "All Files (*)"
-msgstr "Sve datoteke(*)"
-
-#: qfiledialog.cpp:881
-msgctxt "QFileDialog"
-msgid "Directories"
-msgstr "Direktoriji"
-
-#: qfiledialog.cpp:2408
-msgctxt "QFileDialog"
-msgid "&Open"
-msgstr "&Otvori"
-
-#: qfiledialog.cpp:919
-msgctxt "QFileDialog"
-msgid "&Save"
-msgstr "&Spremi"
-
-#: qfiledialog.cpp:435
-msgctxt "QFileDialog"
-msgid "Open"
-msgstr "Otvori"
-
-#: qfiledialog.cpp:1670
-msgctxt "QFileDialog"
-msgid ""
-"%1 already exists.\n"
-"Do you want to replace it?"
-msgstr "%1 već postoji.\nŽelite li ju zamjeniti?"
-
-#: qfiledialog.cpp:1690
-msgctxt "QFileDialog"
-msgid ""
-"%1\n"
-"File not found.\n"
-"Please verify the correct file name was given."
-msgstr "%1\nDatoteka nije pronađena.\nMolimo provjerite točnost datog naziva datoteke."
-
-#: qdirmodel.cpp:833
-msgctxt "QFileDialog"
-msgid "My Computer"
-msgstr "Moje Računalo"
-
-#: qfiledialog.cpp:462
-msgctxt "QFileDialog"
-msgid "&Rename"
-msgstr "P&reimenuj"
-
-#: qfiledialog.cpp:463
-msgctxt "QFileDialog"
-msgid "&Delete"
-msgstr "&Izbriši"
-
-#: qfiledialog.cpp:464
-msgctxt "QFileDialog"
-msgid "Show &hidden files"
-msgstr "Prikaži skrivene datoteke"
-
-#: ui_qfiledialog.h:264
-msgctxt "QFileDialog"
-msgid "Back"
-msgstr "Natrag"
-
-#: ui_qfiledialog.h:274
-msgctxt "QFileDialog"
-msgid "Parent Directory"
-msgstr "Nadređeni direktorij"
-
-#: ui_qfiledialog.h:284
-msgctxt "QFileDialog"
-msgid "List View"
-msgstr "Popisni pogled"
-
-#: ui_qfiledialog.h:289
-msgctxt "QFileDialog"
-msgid "Detail View"
-msgstr "Detaljni pogled"
-
-#: ui_qfiledialog.h:292
-msgctxt "QFileDialog"
-msgid "Files of type:"
-msgstr "Vrsta datoteka:"
-
-#: qfiledialog.cpp:883
-msgctxt "QFileDialog"
-msgid "Directory:"
-msgstr "Direktorij:"
-
-#: qfiledialog.cpp:2476
-msgctxt "QFileDialog"
-msgid ""
-"%1\n"
-"Directory not found.\n"
-"Please verify the correct directory name was given."
-msgstr "%1\nDirektorij nije pronađen.\nMolimo provjerite točnost naziva datog direktorija."
-
-#: qfiledialog.cpp:2281
-msgctxt "QFileDialog"
-msgid ""
-"'%1' is write protected.\n"
-"Do you want to delete it anyway?"
-msgstr "'%1' je zaštićena od pisanja.\nŽelite li ju svejedno izbrisati?"
-
-#: qfiledialog.cpp:2286
-msgctxt "QFileDialog"
-msgid "Are sure you want to delete '%1'?"
-msgstr "Sigurno želite izbrisati '%1'?"
-
-#: qfiledialog.cpp:2299
-msgctxt "QFileDialog"
-msgid "Could not delete directory."
-msgstr "Nemoguće brisanje direktorija."
-
-#: qfiledialog_win.cpp:128
-msgctxt "QFileDialog"
-msgid "All Files (*.*)"
-msgstr "Sve datoteke (*.*)"
-
-#: qfiledialog.cpp:437
-msgctxt "QFileDialog"
-msgid "Save As"
-msgstr "Spremi kao"
-
-#: qfileiconprovider.cpp:379
-msgctxt "QFileDialog"
-msgid "Drive"
-msgstr "Pogon"
-
-#: qfileiconprovider.cpp:383
-msgctxt "QFileDialog"
-msgid "File"
-msgstr "Datoteka"
-
-#: qfileiconprovider.cpp:412
-msgctxt "QFileDialog"
-msgid "Unknown"
-msgstr "Nepoznato"
-
-#: qfiledialog.cpp:439
-msgctxt "QFileDialog"
-msgid "Find Directory"
-msgstr "Pronađi direktorij"
-
-#: qfiledialog.cpp:458
-msgctxt "QFileDialog"
-msgid "Show "
-msgstr "Prikaži "
-
-#: ui_qfiledialog.h:269
-msgctxt "QFileDialog"
-msgid "Forward"
-msgstr "Naprijed"
-
-#: qfiledialog.cpp:2137
-msgctxt "QFileDialog"
-msgid "New Folder"
-msgstr "Nova mapa"
-
-#: qfiledialog.cpp:465
-msgctxt "QFileDialog"
-msgid "&New Folder"
-msgstr "&Nova mapa"
-
-#: qfiledialog.cpp:917
-msgctxt "QFileDialog"
-msgid "&Choose"
-msgstr "&Odaberi"
-
-#: qsidebar.cpp:388
-msgctxt "QFileDialog"
-msgid "Remove"
-msgstr "Ukloni"
-
-#: qfiledialog.cpp:886
-msgctxt "QFileDialog"
-msgid "File &name:"
-msgstr "Naziv datoteke:"
-
-#: ui_qfiledialog.h:261
-msgctxt "QFileDialog"
-msgid "Look in:"
-msgstr "Pogledaj u:"
-
-#: ui_qfiledialog.h:279
-msgctxt "QFileDialog"
-msgid "Create New Folder"
-msgstr "Stvori novu mapu"
-
-#: qfilesystemmodel.cpp:761
-msgctxt "QFileSystemModel"
-msgid "Invalid filename"
-msgstr "Neispravni naziv datoteke"
-
-#: 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>Naziv \"%1\" nije moguće koristiti.</b><p>Pokušajte koristiti drugi naziv, sa manje znakova ili bez interpunkcijskih znakova."
-
-#: qfilesystemmodel.cpp:832
-msgctxt "QFileSystemModel"
-msgid "Name"
-msgstr "Naziv"
-
-#: qfilesystemmodel.cpp:834
-msgctxt "QFileSystemModel"
-msgid "Size"
-msgstr "Veličina"
-
-#: qfilesystemmodel.cpp:838
-msgctxt "QFileSystemModel"
-msgid "Kind"
-msgstr "Vrsta"
-
-#: qfilesystemmodel.cpp:840
-msgctxt "QFileSystemModel"
-msgid "Type"
-msgstr "Tip"
-
-#: qfilesystemmodel.cpp:847
-msgctxt "QFileSystemModel"
-msgid "Date Modified"
-msgstr "Datum izmjene"
-
-#: qfilesystemmodel_p.h:198
-msgctxt "QFileSystemModel"
-msgid "My Computer"
-msgstr "Moje Računalo"
-
-#: qfilesystemmodel_p.h:200
-msgctxt "QFileSystemModel"
-msgid "Computer"
-msgstr "Računalo"
-
-#: qfilesystemmodel.cpp:677
-msgctxt "QFileSystemModel"
-msgid "%1 TB"
-msgstr "%1 TB"
-
-#: qfilesystemmodel.cpp:679
-msgctxt "QFileSystemModel"
-msgid "%1 GB"
-msgstr "%1 GB"
-
-#: qfilesystemmodel.cpp:681
-msgctxt "QFileSystemModel"
-msgid "%1 MB"
-msgstr "%1 MB"
-
-#: qfilesystemmodel.cpp:683
-msgctxt "QFileSystemModel"
-msgid "%1 KB"
-msgstr "%1 KB"
-
-#: qfilesystemmodel.cpp:684
-msgctxt "QFileSystemModel"
-msgid "%1 bytes"
-msgstr "%1 byteova"
diff --git a/src/vidalia/i18n/po/hr_HR/vidalia_hr_HR.po b/src/vidalia/i18n/po/hr_HR/vidalia_hr_HR.po
deleted file mode 100644
index 4a5ecae..0000000
--- a/src/vidalia/i18n/po/hr_HR/vidalia_hr_HR.po
+++ /dev/null
@@ -1,3847 +0,0 @@
-#
-# Translators:
-# Armando Vega <synaan at gmail.com>, 2012.
-# <trebelnik2 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: 2012-03-21 17:52+0000\n"
-"PO-Revision-Date: 2012-05-09 08:49+0000\n"
-"Last-Translator: gogo <trebelnik2 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: hr_HR\n"
-"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2\n"
-"X-Generator: Vidalia ts2po 0.2\n"
-
-msgctxt "AboutDialog"
-msgid "About Vidalia"
-msgstr "O Vidalia"
-
-msgctxt "AboutDialog"
-msgid "License"
-msgstr "Licenca"
-
-msgctxt "AboutDialog"
-msgid "Vidalia 0.2.0"
-msgstr "Vidalia 0.2.0"
-
-msgctxt "AboutDialog"
-msgid "Tor 0.2.0.32"
-msgstr "Tor 0.2.0.32"
-
-msgctxt "AboutDialog"
-msgid "Qt 4.4.2"
-msgstr "Qt 4.4.2"
-
-msgctxt "AdvancedPage"
-msgid "'%1' is not a valid IP address."
-msgstr "'%1' nije važeća IP adresa."
-
-msgctxt "AdvancedPage"
-msgid ""
-"You selected 'Password' authentication, but did not specify a password."
-msgstr "Odabrali ste autentifikaciju 'Lozinkom', ali niste postavili lozinku."
-
-msgctxt "AdvancedPage"
-msgid "Select Tor Configuration File"
-msgstr "Odaberi Tor Konfiguracijsku Datoteku"
-
-msgctxt "AdvancedPage"
-msgid "File Not Found"
-msgstr "Datoteka Nije Pronađena"
-
-msgctxt "AdvancedPage"
-msgid "%1 does not exist. Would you like to create it?"
-msgstr "%1 ne postoji. Da li biste ju željeli stvoriti?"
-
-msgctxt "AdvancedPage"
-msgid "Failed to Create File"
-msgstr "Neuspješno Stvaranje Datoteke"
-
-msgctxt "AdvancedPage"
-msgid "Unable to create %1 [%2]"
-msgstr "Nije moguće stvoriti %1 [%2]"
-
-msgctxt "AdvancedPage"
-msgid "Select a Directory to Use for Tor Data"
-msgstr "Odaberite Mapu za Tor Podatke"
-
-msgctxt "AdvancedPage"
-msgid "Unable to remove Tor Service"
-msgstr "Neuspješno uklanjanje Tor Usluge"
-
-msgctxt "AdvancedPage"
-msgid "Unable to install Tor Service"
-msgstr "Neuspješna instalacija Tor Usluge"
-
-msgctxt "AdvancedPage"
-msgid "Vidalia was unable to install the Tor service."
-msgstr "Vidalia nije bila u mogućnosti instalirati Tor uslugu."
-
-msgctxt "AdvancedPage"
-msgid "Authentication:"
-msgstr "Autentifikacija:"
-
-msgctxt "AdvancedPage"
-msgid "Address:"
-msgstr "Adresa:"
-
-msgctxt "AdvancedPage"
-msgid "None"
-msgstr "Ništa"
-
-msgctxt "AdvancedPage"
-msgid "Cookie"
-msgstr "Cookie"
-
-msgctxt "AdvancedPage"
-msgid "Password"
-msgstr "Lozinka"
-
-msgctxt "AdvancedPage"
-msgid "Randomly Generate"
-msgstr "Nasumično Generiraj"
-
-msgctxt "AdvancedPage"
-msgid ":"
-msgstr ":"
-
-msgctxt "AdvancedPage"
-msgid "Tor Configuration File"
-msgstr "Tor Konfiguracijska Datoteka"
-
-msgctxt "AdvancedPage"
-msgid "Start the Tor software with the specified configuration file (torrc)"
-msgstr "Pokreni Tor software sa specificiranom konfiguracijskom datotekom (torrc)"
-
-msgctxt "AdvancedPage"
-msgid "Select path to your configuration file"
-msgstr "Odaberite putanju do vaše konfiguracijske datoteke"
-
-msgctxt "AdvancedPage"
-msgid "Browse"
-msgstr "Pretraži"
-
-msgctxt "AdvancedPage"
-msgid "Data Directory"
-msgstr "Podatkovna Mapa"
-
-msgctxt "AdvancedPage"
-msgid "Store data for the Tor software in the following directory"
-msgstr "Spremaj podatke za Tor software u sljedećoj mapi"
-
-msgctxt "AdvancedPage"
-msgid "Select the directory used to store data for the Tor software"
-msgstr "Odaberite mapu koja će biti korištena za spremanje podataka Tor softwarea"
-
-msgctxt "AdvancedPage"
-msgid "Tor Control"
-msgstr "Tor Upravljanje"
-
-msgctxt "AdvancedPage"
-msgid "Use TCP connection (ControlPort)"
-msgstr "Koristi TCP vezu (KontrolniPort)"
-
-msgctxt "AdvancedPage"
-msgid "Path:"
-msgstr "Putanja:"
-
-msgctxt "AdvancedPage"
-msgid "Use Unix domain socket (ControlSocket)"
-msgstr "Koristi Unix domain socket (KontrolniSocket)"
-
-msgctxt "AdvancedPage"
-msgid "Edit current torrc"
-msgstr "Izmjeni trenutni torrc"
-
-msgctxt "AdvancedPage"
-msgid "NOTE: this will edit the currently loaded torrc"
-msgstr "NAPOMENA: ovo će izmjeniti trenutno učitani torrc"
-
-msgctxt "AdvancedPage"
-msgid "ControlSocket path doesn't exist."
-msgstr "Putanja KontrolnogSocketa ne postoji."
-
-msgctxt "AdvancedPage"
-msgid ""
-"The specified Tor configuration file location contains characters that "
-"cannot be represented in your system's current 8-bit character encoding."
-msgstr "Specificirana lokacija Tor konfiguracijske datoteke sadrži znakove koji se ne mogu koristiti u trenutnom 8 bitnom kodiranju vašeg sustava."
-
-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 "Specificirana lokacija Tor podatkovne mape sadrži znakove koji se ne mogu koristiti u trenutnom 8 bitnom kodiranju vašeg sustava."
-
-msgctxt "AdvancedPage"
-msgid "Warning"
-msgstr "Upozorenje"
-
-msgctxt "AdvancedPage"
-msgid "You changed torrc path, would you like to restart Tor?"
-msgstr "Promjenili ste putanju torrc datoteke, želite li ponovno pokrenuti Tor?"
-
-msgctxt "AdvancedPage"
-msgid "Tor Configuration File (torrc);;All Files (*)"
-msgstr "Tor Konfiguracijska Datoteka (torrc);;All Files(*)"
-
-msgctxt "AdvancedPage"
-msgid "Select a file to use for Tor socket path"
-msgstr "Odaberite datoteku za korištenje kao Tor socket putanju"
-
-msgctxt "AdvancedPage"
-msgid "Configure ControlPort automatically"
-msgstr "Automatski podesi KontrolniPort"
-
-msgctxt "AdvancedPage"
-msgid ""
-"You've checked the autoconfiguration option for the ControlPort, but "
-"provided no Data Directory. Please add one, or uncheck the \"Configure "
-"ControlPort automatically\" option."
-msgstr "Odabrali ste mogućnost automatskog podešavanja za Kontrolni ulaz, ali bez direktorija podatka. Dodajte jedan direktorij ili odznačite mogućnost \"Podesi kontrolni ulaz automatski\"."
-
-msgctxt "AdvancedPage"
-msgid ""
-"Vidalia was unable to remove the Tor service.\n"
-"\n"
-"You may need to remove it manually."
-msgstr "Vidalia nije bila u mogućnosti ukloniti Tor uslugu.\n\nMožda ćete ju morati ukloniti ručno."
-
-msgctxt "AppearancePage"
-msgid "Language"
-msgstr "Jezik"
-
-msgctxt "AppearancePage"
-msgid "Choose the language used in Vidalia"
-msgstr "Odaberite jezik korišten u Vidaliji"
-
-msgctxt "AppearancePage"
-msgid "Style"
-msgstr "Stil"
-
-msgctxt "AppearancePage"
-msgid "Choose Vidalia's interface style"
-msgstr "Odaberite Vidalijin stil sučelja"
-
-msgctxt "AppearancePage"
-msgid "Vidalia was unable to load the selected language translation."
-msgstr "Vidalia nije bila u mogućnosti učitati odabrani jezični prijevod."
-
-msgctxt "AppearancePage"
-msgid ""
-"System Icon Preferences (changes will take effect when you restart Vidalia)"
-msgstr "Postavke ikone sustava (izmjene će se primjeniti nakon ponovnog pokretanja Vidalia)"
-
-msgctxt "AppearancePage"
-msgid "Show the Tray Icon and Dock Icon (default)"
-msgstr "Prikaži ikonu obavijesnog područja i ikonu pokretača (uobičajeno)"
-
-msgctxt "AppearancePage"
-msgid "Hide the Tray Icon"
-msgstr "Sakrij ikonu "
-
-msgctxt "AppearancePage"
-msgid "Hide the Dock Icon"
-msgstr "Sakrij ikonu pokretača"
-
-msgctxt "BandwidthGraph"
-msgid "Since:"
-msgstr "Od:"
-
-msgctxt "BandwidthGraph"
-msgid "Hide Settings"
-msgstr "Sakrij Postavke"
-
-msgctxt "BandwidthGraph"
-msgid "Show Settings"
-msgstr "Prikaži Postavke"
-
-msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr "Tor Korištenje Propusnosti"
-
-msgctxt "BandwidthGraph"
-msgid "Reset"
-msgstr "Reset"
-
-msgctxt "BandwidthGraph"
-msgid "Receive Rate"
-msgstr "Brzina Primanja"
-
-msgctxt "BandwidthGraph"
-msgid "Send Rate"
-msgstr "Brzina Slanja"
-
-msgctxt "BandwidthGraph"
-msgid "Always on Top"
-msgstr "Uvijek na Vrhu"
-
-msgctxt "BandwidthGraph"
-msgid "Style"
-msgstr "Stil"
-
-msgctxt "BandwidthGraph"
-msgid "Changes the transparency of the Bandwidth Graph"
-msgstr "Mijenja transparenciju Grafa Propusnosti"
-
-msgctxt "BandwidthGraph"
-msgid "100"
-msgstr "100"
-
-msgctxt "BandwidthGraph"
-msgid "% Opaque"
-msgstr "% Neproziran"
-
-msgctxt "BandwidthGraph"
-msgid "Save"
-msgstr "Spremi"
-
-msgctxt "BandwidthGraph"
-msgid "Cancel"
-msgstr "Odustani"
-
-msgctxt "BridgeDownloader"
-msgid "Starting HTTPS bridge request..."
-msgstr "Započinjem zahtjev za HTTPS mostom..."
-
-msgctxt "BridgeDownloader"
-msgid "Connecting to %1:%2..."
-msgstr "Spajanje na %1:%2..."
-
-msgctxt "BridgeDownloader"
-msgid "Sending an HTTPS request for bridges..."
-msgstr "Slanje HTTPS zahtjeva za mostovima..."
-
-msgctxt "BridgeDownloader"
-msgid "Downloading a list of bridges..."
-msgstr "Preuzimanje popisa mostova..."
-
-msgctxt "BridgeDownloaderProgressDialog"
-msgid "Downloading Bridges"
-msgstr "Preuzimanje Mostova"
-
-msgctxt "BridgeDownloaderProgressDialog"
-msgid "Unable to download bridges: %1"
-msgstr "Nije moguće preuzeti mostove: %1"
-
-msgctxt "BridgeDownloaderProgressDialog"
-msgid "Retrying bridge request..."
-msgstr "Ponovni pokušaj zahtjeva za mostom..."
-
-msgctxt "BridgeUsageDialog"
-msgid "Country"
-msgstr "Država"
-
-msgctxt "BridgeUsageDialog"
-msgid "# Clients"
-msgstr "# Klijenti"
-
-msgctxt "BridgeUsageDialog"
-msgid "Clients from the following countries have used your relay since %1"
-msgstr "Klijenti iz sljedećih država su koristili vaš relej od %1"
-
-msgctxt "BridgeUsageDialog"
-msgid "Bridge Usage Summary"
-msgstr "Sažetak Korištenja Mosta"
-
-msgctxt "BridgeUsageDialog"
-msgid "Client Summary"
-msgstr "Sažetak Klijenata"
-
-msgctxt "Circuit"
-msgid "New"
-msgstr "Novo"
-
-msgctxt "Circuit"
-msgid "Open"
-msgstr "Otvori"
-
-msgctxt "Circuit"
-msgid "Building"
-msgstr "Građenje"
-
-msgctxt "Circuit"
-msgid "Failed"
-msgstr "Neuspjelo"
-
-msgctxt "Circuit"
-msgid "Closed"
-msgstr "Zatvoreno"
-
-msgctxt "Circuit"
-msgid "Unknown"
-msgstr "Nepoznato"
-
-msgctxt "CircuitItem"
-msgid "<Path Empty>"
-msgstr "<Putanja Prazna>"
-
-msgctxt "CircuitListWidget"
-msgid "Connection"
-msgstr "Veza"
-
-msgctxt "CircuitListWidget"
-msgid "Status"
-msgstr "Status"
-
-msgctxt "CircuitListWidget"
-msgid "Zoom to Circuit"
-msgstr "Uvećaj prema Krugu"
-
-msgctxt "CircuitListWidget"
-msgid "Close Circuit (Del)"
-msgstr "Zatvori Krug (Del)"
-
-msgctxt "CircuitListWidget"
-msgid "Close Stream (Del)"
-msgstr "Zatvori Tok (Del)"
-
-msgctxt "ConfigDialog"
-msgid "General"
-msgstr "Općenito"
-
-msgctxt "ConfigDialog"
-msgid "Network"
-msgstr "Mreža"
-
-msgctxt "ConfigDialog"
-msgid "Sharing"
-msgstr "Dijeljenje"
-
-msgctxt "ConfigDialog"
-msgid "Services"
-msgstr "Usluge"
-
-msgctxt "ConfigDialog"
-msgid "Appearance"
-msgstr "Izgled"
-
-msgctxt "ConfigDialog"
-msgid "Advanced"
-msgstr "Napredno"
-
-msgctxt "ConfigDialog"
-msgid "Help"
-msgstr "Pomoć"
-
-msgctxt "ConfigDialog"
-msgid "Error Saving Settings"
-msgstr "Greška pri Spremanju Postavki"
-
-msgctxt "ConfigDialog"
-msgid "Vidalia was unable to save your %1 settings."
-msgstr "Vidalia nije bila u mogućnosti spremiti vaše %1 postavke."
-
-msgctxt "ConfigDialog"
-msgid "Error Applying Settings"
-msgstr "Greška pri Primjenjivanju Postavki"
-
-msgctxt "ConfigDialog"
-msgid "Vidalia was unable to apply your %1 settings to Tor."
-msgstr "Vidalia nije bila u mogućnosti primjeniti vaše %1 postavke za Tor."
-
-msgctxt "ConfigDialog"
-msgid "Settings"
-msgstr "Postavke"
-
-msgctxt "ControlConnection"
-msgid "Vidalia was unable to connect to Tor. (%1)"
-msgstr "Vidalia nije bila u mogućnosti spojiti se na Tor. (%1)"
-
-msgctxt "ControlConnection"
-msgid "Control socket is not connected."
-msgstr "Kontrolni socket nije spojen."
-
-msgctxt "ControlPasswordInputDialog"
-msgid "Password Required"
-msgstr "Potrebna Lozinka"
-
-msgctxt "ControlPasswordInputDialog"
-msgid "Remember my password"
-msgstr "Zapamti moju lozinku"
-
-msgctxt "ControlPasswordInputDialog"
-msgid ""
-"Vidalia has connected to a running Tor process that requires a password. "
-"Please enter your control password:"
-msgstr "Vidalia se spojila na pokrenuti Tor proces koji zahtjeva lozinku. Molimo unesite svoju kontrolnu lozinku:"
-
-msgctxt "ControlSocket"
-msgid "Control socket is not connected."
-msgstr "Kontrolni socket nije spojen."
-
-msgctxt "ControlSocket"
-msgid "Error sending control command. [%1]"
-msgstr "Greška pri slanju kontrolne naredbe. [%1]"
-
-msgctxt "ControlSocket"
-msgid "Socket disconnected while attempting to read a line of data."
-msgstr "Socket se odspojio tijekom pokušaja čitanja linije podataka."
-
-msgctxt "ControlSocket"
-msgid "Invalid control reply. [%1]"
-msgstr "Nevažeći kontrolni odgovor. [%1]"
-
-msgctxt "CountryInfo"
-msgid "Afghanistan"
-msgstr "Afganistan"
-
-msgctxt "CountryInfo"
-msgid "Andorra"
-msgstr "Andora"
-
-msgctxt "CountryInfo"
-msgid "Angola"
-msgstr "Angola"
-
-msgctxt "CountryInfo"
-msgid "Antigua & Barbuda"
-msgstr "Antigua & Barbuda"
-
-msgctxt "CountryInfo"
-msgid "Argentina"
-msgstr "Argentina"
-
-msgctxt "CountryInfo"
-msgid "Armenia"
-msgstr "Armenija"
-
-msgctxt "CountryInfo"
-msgid "Australia"
-msgstr "Australija"
-
-msgctxt "CountryInfo"
-msgid "Azerbaijan"
-msgstr "Azerbedžan"
-
-msgctxt "CountryInfo"
-msgid "Bahamas"
-msgstr "Bahami"
-
-msgctxt "CountryInfo"
-msgid "Bangladesh"
-msgstr "Bangladeš"
-
-msgctxt "CountryInfo"
-msgid "Barbados"
-msgstr "Barbados"
-
-msgctxt "CountryInfo"
-msgid "Belarus"
-msgstr "Bjelorusija"
-
-msgctxt "CountryInfo"
-msgid "Belgium"
-msgstr "Belgija"
-
-msgctxt "CountryInfo"
-msgid "Belize"
-msgstr "Belize"
-
-msgctxt "CountryInfo"
-msgid "Bhutan"
-msgstr "Butan"
-
-msgctxt "CountryInfo"
-msgid "Bolivia"
-msgstr "Bolivija"
-
-msgctxt "CountryInfo"
-msgid "Bosnia & Herzegovina"
-msgstr "Bosna i Hercegovina"
-
-msgctxt "CountryInfo"
-msgid "Botswana"
-msgstr "Bocvana"
-
-msgctxt "CountryInfo"
-msgid "Brazil"
-msgstr "Brazil"
-
-msgctxt "CountryInfo"
-msgid "Brunei Darussalam"
-msgstr "Brunei Darussalam"
-
-msgctxt "CountryInfo"
-msgid "Bulgaria"
-msgstr "Bugarska"
-
-msgctxt "CountryInfo"
-msgid "Burkina Faso"
-msgstr "Burkina Faso"
-
-msgctxt "CountryInfo"
-msgid "Burundi"
-msgstr "Burundi"
-
-msgctxt "CountryInfo"
-msgid "Cambodia"
-msgstr "Kambodža"
-
-msgctxt "CountryInfo"
-msgid "Cameroon"
-msgstr "Kamerun"
-
-msgctxt "CountryInfo"
-msgid "Canada"
-msgstr "Kanada"
-
-msgctxt "CountryInfo"
-msgid "Cape Verde"
-msgstr "Cape Verde"
-
-msgctxt "CountryInfo"
-msgid "Central African Republic"
-msgstr "Centralna Afrička Republika"
-
-msgctxt "CountryInfo"
-msgid "Chad"
-msgstr "Čad"
-
-msgctxt "CountryInfo"
-msgid "Chile"
-msgstr "Čile"
-
-msgctxt "CountryInfo"
-msgid "China"
-msgstr "Kina"
-
-msgctxt "CountryInfo"
-msgid "Colombia"
-msgstr "Kolumbija"
-
-msgctxt "CountryInfo"
-msgid "Comoros"
-msgstr "Comoros"
-
-msgctxt "CountryInfo"
-msgid "Congo, The Democratic Republic of the"
-msgstr "Kongo, Demokratska Republika"
-
-msgctxt "CountryInfo"
-msgid "Congo"
-msgstr "Kongo"
-
-msgctxt "CountryInfo"
-msgid "Costa Rica"
-msgstr "Kostarika"
-
-msgctxt "CountryInfo"
-msgid "Cote d’Ivoire"
-msgstr "Obala Bjelokosti"
-
-msgctxt "CountryInfo"
-msgid "Croatia"
-msgstr "Hrvatska"
-
-msgctxt "CountryInfo"
-msgid "Cuba"
-msgstr "Kuba"
-
-msgctxt "CountryInfo"
-msgid "Cyprus"
-msgstr "Cipar"
-
-msgctxt "CountryInfo"
-msgid "Czech Republic"
-msgstr "Češka Republika"
-
-msgctxt "CountryInfo"
-msgid "Denmark"
-msgstr "Danska"
-
-msgctxt "CountryInfo"
-msgid "Djibouti"
-msgstr "Djibouti"
-
-msgctxt "CountryInfo"
-msgid "Dominica"
-msgstr "Dominica"
-
-msgctxt "CountryInfo"
-msgid "Dominican Republic"
-msgstr "Dominikanska Republika"
-
-msgctxt "CountryInfo"
-msgid "Ecuador"
-msgstr "Ekvador"
-
-msgctxt "CountryInfo"
-msgid "Egypt"
-msgstr "Egipat"
-
-msgctxt "CountryInfo"
-msgid "El Salvador"
-msgstr "El Salvador"
-
-msgctxt "CountryInfo"
-msgid "Equatorial Guinea"
-msgstr "Ekvatorijalna Gvineja"
-
-msgctxt "CountryInfo"
-msgid "Eritrea"
-msgstr "Eritreja"
-
-msgctxt "CountryInfo"
-msgid "Estonia"
-msgstr "Estonija"
-
-msgctxt "CountryInfo"
-msgid "France"
-msgstr "Francuska"
-
-msgctxt "CountryInfo"
-msgid "Gabon"
-msgstr "Gabon"
-
-msgctxt "CountryInfo"
-msgid "Gambia"
-msgstr "Gambia"
-
-msgctxt "CountryInfo"
-msgid "Georgia"
-msgstr "Gruzija"
-
-msgctxt "CountryInfo"
-msgid "Germany"
-msgstr "Njemačka"
-
-msgctxt "CountryInfo"
-msgid "Ghana"
-msgstr "Gana"
-
-msgctxt "CountryInfo"
-msgid "Grenada"
-msgstr "Grenada"
-
-msgctxt "CountryInfo"
-msgid "Guatemala"
-msgstr "Gvatemala"
-
-msgctxt "CountryInfo"
-msgid "Guinea"
-msgstr "Gvineja"
-
-msgctxt "CountryInfo"
-msgid "Guinea-Bissau"
-msgstr "Gvineja-Bissau"
-
-msgctxt "CountryInfo"
-msgid "Guyana"
-msgstr "Guyana"
-
-msgctxt "CountryInfo"
-msgid "Hong Kong"
-msgstr "Hong Kong"
-
-msgctxt "CountryInfo"
-msgid "Haiti"
-msgstr "Haiti"
-
-msgctxt "CountryInfo"
-msgid "Honduras"
-msgstr "Honduras"
-
-msgctxt "CountryInfo"
-msgid "Israel"
-msgstr "Izrael"
-
-msgctxt "CountryInfo"
-msgid "Italy"
-msgstr "Italija"
-
-msgctxt "CountryInfo"
-msgid "Jamaica"
-msgstr "Jamajka"
-
-msgctxt "CountryInfo"
-msgid "Japan"
-msgstr "Japan"
-
-msgctxt "CountryInfo"
-msgid "Jordan"
-msgstr "Jordan"
-
-msgctxt "CountryInfo"
-msgid "Kazakhstan"
-msgstr "Kazahstan"
-
-msgctxt "CountryInfo"
-msgid "Kenya"
-msgstr "Kenija"
-
-msgctxt "CountryInfo"
-msgid "Kiribati"
-msgstr "Kiribati"
-
-msgctxt "CountryInfo"
-msgid "Kuwait"
-msgstr "Kuvajt"
-
-msgctxt "CountryInfo"
-msgid "Kyrgyzstan"
-msgstr "Kirgistan"
-
-msgctxt "CountryInfo"
-msgid "Laos"
-msgstr "Laos"
-
-msgctxt "CountryInfo"
-msgid "Latvia"
-msgstr "Latvija"
-
-msgctxt "CountryInfo"
-msgid "Lebanon"
-msgstr "Libanon"
-
-msgctxt "CountryInfo"
-msgid "Lesotho"
-msgstr "Lesoto"
-
-msgctxt "CountryInfo"
-msgid "Liberia"
-msgstr "Liberija"
-
-msgctxt "CountryInfo"
-msgid "Liechtenstein"
-msgstr "Lihtenštajn"
-
-msgctxt "CountryInfo"
-msgid "Lithuania"
-msgstr "Litva"
-
-msgctxt "CountryInfo"
-msgid "Luxembourg"
-msgstr "Luksemburg"
-
-msgctxt "CountryInfo"
-msgid "Macedonia"
-msgstr "Makedonija"
-
-msgctxt "CountryInfo"
-msgid "Madagascar"
-msgstr "Madagaskar"
-
-msgctxt "CountryInfo"
-msgid "Malawi"
-msgstr "Malawi"
-
-msgctxt "CountryInfo"
-msgid "Malaysia"
-msgstr "Malezija"
-
-msgctxt "CountryInfo"
-msgid "Mali"
-msgstr "Mali"
-
-msgctxt "CountryInfo"
-msgid "Malta"
-msgstr "Malta"
-
-msgctxt "CountryInfo"
-msgid "Marshall Islands"
-msgstr "Maršalovi Otoci"
-
-msgctxt "CountryInfo"
-msgid "Mauritania"
-msgstr "Mauritanija"
-
-msgctxt "CountryInfo"
-msgid "Mauritius"
-msgstr "Mauricijus"
-
-msgctxt "CountryInfo"
-msgid "Micronesia"
-msgstr "Mikronezija"
-
-msgctxt "CountryInfo"
-msgid "Moldova"
-msgstr "Moldavija"
-
-msgctxt "CountryInfo"
-msgid "Monaco"
-msgstr "Monako"
-
-msgctxt "CountryInfo"
-msgid "Mongolia"
-msgstr "Mongolia"
-
-msgctxt "CountryInfo"
-msgid "Montenegro"
-msgstr "Crna Gora"
-
-msgctxt "CountryInfo"
-msgid "Morocco"
-msgstr "Maroko"
-
-msgctxt "CountryInfo"
-msgid "Mozambique"
-msgstr "Mozambik"
-
-msgctxt "CountryInfo"
-msgid "Namibia"
-msgstr "Namibija"
-
-msgctxt "CountryInfo"
-msgid "Nauru"
-msgstr "Nauru"
-
-msgctxt "CountryInfo"
-msgid "Nepal"
-msgstr "Nepal"
-
-msgctxt "CountryInfo"
-msgid "Netherlands"
-msgstr "Nizozemska"
-
-msgctxt "CountryInfo"
-msgid "New Zealand"
-msgstr "Novi Zeland"
-
-msgctxt "CountryInfo"
-msgid "Nicaragua"
-msgstr "Nikaragva"
-
-msgctxt "CountryInfo"
-msgid "Niger"
-msgstr "Niger"
-
-msgctxt "CountryInfo"
-msgid "Nigeria"
-msgstr "Nigerija"
-
-msgctxt "CountryInfo"
-msgid "Norway"
-msgstr "Norveška"
-
-msgctxt "CountryInfo"
-msgid "Oman"
-msgstr "Oman"
-
-msgctxt "CountryInfo"
-msgid "Pakistan"
-msgstr "Pakistan"
-
-msgctxt "CountryInfo"
-msgid "Palau"
-msgstr "Palau"
-
-msgctxt "CountryInfo"
-msgid "Palestine"
-msgstr "Palestina"
-
-msgctxt "CountryInfo"
-msgid "Panama"
-msgstr "Panama"
-
-msgctxt "CountryInfo"
-msgid "Papua New Guinea"
-msgstr "Papua Nova Gvineja"
-
-msgctxt "CountryInfo"
-msgid "Paraguay"
-msgstr "Paragvaj"
-
-msgctxt "CountryInfo"
-msgid "Peru"
-msgstr "Peru"
-
-msgctxt "CountryInfo"
-msgid "Philippines"
-msgstr "Filipini"
-
-msgctxt "CountryInfo"
-msgid "Poland"
-msgstr "Poljska"
-
-msgctxt "CountryInfo"
-msgid "Portugal"
-msgstr "Portugal"
-
-msgctxt "CountryInfo"
-msgid "Qatar"
-msgstr "Katar"
-
-msgctxt "CountryInfo"
-msgid "Romania"
-msgstr "Rumunjska"
-
-msgctxt "CountryInfo"
-msgid "Russia"
-msgstr "Rusija"
-
-msgctxt "CountryInfo"
-msgid "Rwanda"
-msgstr "Ruanda"
-
-msgctxt "CountryInfo"
-msgid "Saint Kitts & Nevis"
-msgstr "Saint Kitts & Nevis"
-
-msgctxt "CountryInfo"
-msgid "Saint Lucia"
-msgstr "Saint Lucia"
-
-msgctxt "CountryInfo"
-msgid "Saint Vincent & the Grenadines"
-msgstr "Saint Vincent & the Grenadines"
-
-msgctxt "CountryInfo"
-msgid "Samoa"
-msgstr "Samoa"
-
-msgctxt "CountryInfo"
-msgid "San Marino"
-msgstr "San Marino"
-
-msgctxt "CountryInfo"
-msgid "Sao Tome & Principe"
-msgstr "Sao Tome & Principe"
-
-msgctxt "CountryInfo"
-msgid "Saudi Arabia"
-msgstr "Saudijska Arabija"
-
-msgctxt "CountryInfo"
-msgid "Senegal"
-msgstr "Senegal"
-
-msgctxt "CountryInfo"
-msgid "Serbia"
-msgstr "Srbija"
-
-msgctxt "CountryInfo"
-msgid "Seychelles"
-msgstr "Sejšeli"
-
-msgctxt "CountryInfo"
-msgid "Sierra Leone"
-msgstr "Sierra Leone"
-
-msgctxt "CountryInfo"
-msgid "Singapore"
-msgstr "Singapur"
-
-msgctxt "CountryInfo"
-msgid "Slovakia"
-msgstr "Slovačka"
-
-msgctxt "CountryInfo"
-msgid "Slovenia"
-msgstr "Slovenija"
-
-msgctxt "CountryInfo"
-msgid "Solomon Islands"
-msgstr "Solomonski Otoci"
-
-msgctxt "CountryInfo"
-msgid "Somalia"
-msgstr "Somalija"
-
-msgctxt "CountryInfo"
-msgid "South Africa"
-msgstr "Južna Afrika"
-
-msgctxt "CountryInfo"
-msgid "Spain"
-msgstr "Španjolska"
-
-msgctxt "CountryInfo"
-msgid "Sri Lanka"
-msgstr "Sri Lanka"
-
-msgctxt "CountryInfo"
-msgid "Sudan"
-msgstr "Sudan"
-
-msgctxt "CountryInfo"
-msgid "Suriname"
-msgstr "Suriname"
-
-msgctxt "CountryInfo"
-msgid "Swaziland"
-msgstr "Swaziland"
-
-msgctxt "CountryInfo"
-msgid "Sweden"
-msgstr "Švedska"
-
-msgctxt "CountryInfo"
-msgid "Switzerland"
-msgstr "Švicarska"
-
-msgctxt "CountryInfo"
-msgid "Syria"
-msgstr "Sirija"
-
-msgctxt "CountryInfo"
-msgid "Tajikistan"
-msgstr "Tadžikistan"
-
-msgctxt "CountryInfo"
-msgid "Tanzania"
-msgstr "Tanzanija"
-
-msgctxt "CountryInfo"
-msgid "Thailand"
-msgstr "Tajland"
-
-msgctxt "CountryInfo"
-msgid "Timor-Leste (East Timor)"
-msgstr "Timor-Leste (Istočni Timor)"
-
-msgctxt "CountryInfo"
-msgid "Togo"
-msgstr "Togo"
-
-msgctxt "CountryInfo"
-msgid "Tonga"
-msgstr "Tonga"
-
-msgctxt "CountryInfo"
-msgid "Trinidad & Tobago"
-msgstr "Trinidad i Tobago"
-
-msgctxt "CountryInfo"
-msgid "Tunisia"
-msgstr "Tunis"
-
-msgctxt "CountryInfo"
-msgid "Turkey"
-msgstr "Turska"
-
-msgctxt "CountryInfo"
-msgid "Turkmenistan"
-msgstr "Turkmenistan"
-
-msgctxt "CountryInfo"
-msgid "Tuvalu"
-msgstr "Tuvalu"
-
-msgctxt "CountryInfo"
-msgid "Uganda"
-msgstr "Uganda"
-
-msgctxt "CountryInfo"
-msgid "Ukraine"
-msgstr "Ukrajina"
-
-msgctxt "CountryInfo"
-msgid "United Arab Emirates"
-msgstr "Ujedinjeni Arapski Emirati"
-
-msgctxt "CountryInfo"
-msgid "United Kingdom"
-msgstr "Ujedinjeno Kraljevstvo"
-
-msgctxt "CountryInfo"
-msgid "United States"
-msgstr "Sjedinjene Američke Države"
-
-msgctxt "CountryInfo"
-msgid "Uruguay"
-msgstr "Urugvaj"
-
-msgctxt "CountryInfo"
-msgid "Uzbekistan"
-msgstr "Uzbekistan"
-
-msgctxt "CountryInfo"
-msgid "Vanuatu"
-msgstr "Vanuatu"
-
-msgctxt "CountryInfo"
-msgid "Vatican"
-msgstr "Vatikan"
-
-msgctxt "CountryInfo"
-msgid "Venezuela"
-msgstr "Venecuela"
-
-msgctxt "CountryInfo"
-msgid "Vietnam"
-msgstr "Vijetnam"
-
-msgctxt "CountryInfo"
-msgid "Western Sahara"
-msgstr "Zapadna Sahara"
-
-msgctxt "CountryInfo"
-msgid "Yemen"
-msgstr "Jemen"
-
-msgctxt "CountryInfo"
-msgid "Zambia"
-msgstr "Zambia"
-
-msgctxt "CountryInfo"
-msgid "Zimbabwe"
-msgstr "Zimbabve"
-
-msgctxt "CountryInfo"
-msgid "Zaire"
-msgstr "Zaire"
-
-msgctxt "CountryInfo"
-msgid "Albania"
-msgstr "Albanija"
-
-msgctxt "CountryInfo"
-msgid "Algeria"
-msgstr "Alžir"
-
-msgctxt "CountryInfo"
-msgid "Austria"
-msgstr "Austrija"
-
-msgctxt "CountryInfo"
-msgid "Bahrain"
-msgstr "Bahrejn"
-
-msgctxt "CountryInfo"
-msgid "Benin"
-msgstr "Benin"
-
-msgctxt "CountryInfo"
-msgid "Ethiopia"
-msgstr "Etiopija"
-
-msgctxt "CountryInfo"
-msgid "Fiji"
-msgstr "Fidži"
-
-msgctxt "CountryInfo"
-msgid "Finland"
-msgstr "Finska"
-
-msgctxt "CountryInfo"
-msgid "Greece"
-msgstr "Grčka"
-
-msgctxt "CountryInfo"
-msgid "Guam"
-msgstr "Guam"
-
-msgctxt "CountryInfo"
-msgid "Hungary"
-msgstr "Mađarska"
-
-msgctxt "CountryInfo"
-msgid "Iceland"
-msgstr "Island"
-
-msgctxt "CountryInfo"
-msgid "India"
-msgstr "Indija"
-
-msgctxt "CountryInfo"
-msgid "Indonesia"
-msgstr "Indonezija"
-
-msgctxt "CountryInfo"
-msgid "Iran"
-msgstr "Iran"
-
-msgctxt "CountryInfo"
-msgid "Iraq"
-msgstr "Irak"
-
-msgctxt "CountryInfo"
-msgid "Ireland"
-msgstr "Irska"
-
-msgctxt "CountryInfo"
-msgid "Korea, North"
-msgstr "Koreja, Sjeverna"
-
-msgctxt "CountryInfo"
-msgid "Korea, South"
-msgstr "Koreja, Južna"
-
-msgctxt "CountryInfo"
-msgid "Libya"
-msgstr "Libija"
-
-msgctxt "CountryInfo"
-msgid "Maldives"
-msgstr "Maldivi"
-
-msgctxt "CountryInfo"
-msgid "Mexico"
-msgstr "Meksiko"
-
-msgctxt "CountryInfo"
-msgid "Myanmar"
-msgstr "Mijanmar"
-
-msgctxt "CountryInfo"
-msgid "Taiwan"
-msgstr "Tajvan"
-
-msgctxt "CrashReportDialog"
-msgid "Submit a Crash Report"
-msgstr "Predaj Izvještaj o Rušenju"
-
-msgctxt "CrashReportDialog"
-msgid "Vidalia encountered an error and needed to close"
-msgstr "Vidalia je naišla na grešku i treba se zatvoriti"
-
-msgctxt "CrashReportDialog"
-msgid "Restart Vidalia"
-msgstr "Ponovno Pokreni Vidaliu"
-
-msgctxt "CrashReportDialog"
-msgid "Don't Restart"
-msgstr "Ne Pokreći Ponovno"
-
-msgctxt "CrashReportDialog"
-msgid "Unable to restart Vidalia"
-msgstr "Nije bilo moguće ponovno pokrenuti Vidaliu"
-
-msgctxt "CrashReportDialog"
-msgid ""
-"We were unable to automatically restart Vidalia. Please restart Vidalia "
-"manually."
-msgstr "Nismo bili u mogućnosti automatski ponovno pokrenuti Vidaliu. Molimo pokrenite ponovno Vidaliu ručno."
-
-msgctxt "CrashReportDialog"
-msgid "Please fill a ticket in:"
-msgstr "Molimo unesite tiket:"
-
-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 "Kreirano je izvješće o rušenju koje možete poslati developerima Vidalie kako biste pomogli identificirati i riješiti problem. Podnesena prijava ne sadrži nikakve osobne identifikacijske podatke."
-
-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 "sa opisom što se tradili prije no što se aplikacija srušila, zajedno sa sljedećim datotekama vezanim uz izvješće o rušenju:"
-
-msgctxt "GeneralPage"
-msgid "Executables (*.exe)"
-msgstr "Izvršne datoteke (*.exe)"
-
-msgctxt "GeneralPage"
-msgid "Select Path to Tor"
-msgstr "Odaberite Putanju do Tora"
-
-msgctxt "GeneralPage"
-msgid "Select Proxy Executable"
-msgstr "Odaberite Proxy Izvršnu Datoteku"
-
-msgctxt "GeneralPage"
-msgid "You must specify the name of your Tor executable."
-msgstr "Morate specificirati ime vaše Tor izvršne datoteke."
-
-msgctxt "GeneralPage"
-msgid "Start Vidalia when my system starts"
-msgstr "Pokreni Vidaliu pri pokretanju sustava"
-
-msgctxt "GeneralPage"
-msgid "Browse"
-msgstr "Pretraži"
-
-msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr "Pokreni Tor software pri pokretanju Vidalie"
-
-msgctxt "GeneralPage"
-msgid "Tor"
-msgstr "Tor"
-
-msgctxt "GeneralPage"
-msgid "Proxy Application (optional)"
-msgstr "Proxy Aplikacija (opcionalno)"
-
-msgctxt "GeneralPage"
-msgid "Start a proxy application when Tor starts"
-msgstr "Pokreni proxy aplikaciju kada se Tor pokrene"
-
-msgctxt "GeneralPage"
-msgid "Proxy Application Arguments:"
-msgstr "Parametri Proxy Aplikacije:"
-
-msgctxt "GeneralPage"
-msgid "Software Updates"
-msgstr "Ažuriranje Softwarea"
-
-msgctxt "GeneralPage"
-msgid "Check for new software updates automatically"
-msgstr "Automatski provjeravaj za ažuriranje softwarea"
-
-msgctxt "GeneralPage"
-msgid "Check Now"
-msgstr "Provjeri Sada"
-
-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 "Prim:"
-
-msgctxt "GraphFrame"
-msgid "Sent:"
-msgstr "Posl:"
-
-msgctxt "HelpBrowser"
-msgid "Supplied XML file is not a valid Contents document."
-msgstr "Data XML datoteka nije važeći dokument Sadržaja"
-
-msgctxt "HelpBrowser"
-msgid "Search reached end of document"
-msgstr "Pretraga je došla do kraja dokumenta"
-
-msgctxt "HelpBrowser"
-msgid "Search reached start of document"
-msgstr "Pretraga je došla do početka dokumenta"
-
-msgctxt "HelpBrowser"
-msgid "Text not found in document"
-msgstr "Tekst nije pronađen u dokumentu"
-
-msgctxt "HelpBrowser"
-msgid "Found %1 results"
-msgstr "Pronađeno %1 rezultata"
-
-msgctxt "HelpBrowser"
-msgid "Vidalia Help"
-msgstr "Vidalia Pomoć"
-
-msgctxt "HelpBrowser"
-msgid "Back"
-msgstr "Natrag"
-
-msgctxt "HelpBrowser"
-msgid "Move to previous page (Backspace)"
-msgstr "Povratak na prethodnu stranicu (Backspace)"
-
-msgctxt "HelpBrowser"
-msgid "Backspace"
-msgstr "Backspace"
-
-msgctxt "HelpBrowser"
-msgid "Forward"
-msgstr "Naprijed"
-
-msgctxt "HelpBrowser"
-msgid "Move to next page (Shift+Backspace)"
-msgstr "Pomicanje na sljedeću stranicu (Shift+Backspace)"
-
-msgctxt "HelpBrowser"
-msgid "Shift+Backspace"
-msgstr "Shift+Backspace"
-
-msgctxt "HelpBrowser"
-msgid "Home"
-msgstr "Home"
-
-msgctxt "HelpBrowser"
-msgid "Move to the Home page (Ctrl+H)"
-msgstr "Povratak na domaću stranicu (Ctrl+H)"
-
-msgctxt "HelpBrowser"
-msgid "Ctrl+H"
-msgstr "Ctrl+H"
-
-msgctxt "HelpBrowser"
-msgid "Find"
-msgstr "Pronađi"
-
-msgctxt "HelpBrowser"
-msgid "Search for a word or phrase on current page (Ctrl+F)"
-msgstr "Pretraga za riječ ili frazu na trenutnoj stranici (Ctrl+F)"
-
-msgctxt "HelpBrowser"
-msgid "Ctrl+F"
-msgstr "Ctrl+F"
-
-msgctxt "HelpBrowser"
-msgid "Close"
-msgstr "Zatvori"
-
-msgctxt "HelpBrowser"
-msgid "Close Vidalia Help"
-msgstr "Zatvori Vidalia Pomoć"
-
-msgctxt "HelpBrowser"
-msgid "Esc"
-msgstr "Esc"
-
-msgctxt "HelpBrowser"
-msgid "Find:"
-msgstr "Pronađi:"
-
-msgctxt "HelpBrowser"
-msgid "Find Previous"
-msgstr "Pronađi prethodno"
-
-msgctxt "HelpBrowser"
-msgid "Find Next"
-msgstr "Pronađi sljedeće"
-
-msgctxt "HelpBrowser"
-msgid "Case sensitive"
-msgstr "Osjetljiv na veličinu slova"
-
-msgctxt "HelpBrowser"
-msgid "Whole words only"
-msgstr "Samo cijele riječi"
-
-msgctxt "HelpBrowser"
-msgid "Help Topics"
-msgstr "Teme Pomoći"
-
-msgctxt "HelpBrowser"
-msgid "Contents"
-msgstr "Sadržaj"
-
-msgctxt "HelpBrowser"
-msgid "Search"
-msgstr "Pretraživanje"
-
-msgctxt "HelpBrowser"
-msgid "Searching for:"
-msgstr "Pretražujem za:"
-
-msgctxt "HelpBrowser"
-msgid "Found Documents"
-msgstr "Pronađeni Dokumenti"
-
-msgctxt "HelpBrowser"
-msgid "Error Loading Help Contents:"
-msgstr "Greška pri Učitavanju Sadržaja Pomoći:"
-
-msgctxt "HelpTextBrowser"
-msgid "Opening External Link"
-msgstr "Otvaranje Vanjske Poveznice"
-
-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 može otvoriti poveznicu koju ste odabrali u vašem pretpostavljenom Web pregledniku. Ako vaš preglednik nije trenutno podešen za korištenje Tora onda zahtjev neće biti anoniman."
-
-msgctxt "HelpTextBrowser"
-msgid "Do you want Vidalia to open the link in your Web browser?"
-msgstr "Želite li da VIdalia otvori poveznicu u vašem Web pregledniku?"
-
-msgctxt "HelpTextBrowser"
-msgid "Unable to Open Link"
-msgstr "Nije Bilo Boguće Otvoriti Poveznicu"
-
-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 nije bila u mogućnosti otvoriti odabranu poveznicu u vašem Web pregledniku. Još uvijek možete kopirati URL i zalijepiti ga u vaš preglednik."
-
-msgctxt "HelpTextBrowser"
-msgid "Error opening help file:"
-msgstr "Greška pri otvaranju datoteke pomoći:"
-
-msgctxt "LicenseDialog"
-msgid "License Information"
-msgstr "Informacije o Licenci"
-
-msgctxt "LicenseDialog"
-msgid "License"
-msgstr "Licenca"
-
-msgctxt "LicenseDialog"
-msgid "Credits"
-msgstr "Zasluge"
-
-msgctxt "LogEvent"
-msgid "Debug"
-msgstr "Debugiranje"
-
-msgctxt "LogEvent"
-msgid "Info"
-msgstr "Info"
-
-msgctxt "LogEvent"
-msgid "Notice"
-msgstr "Obavijest"
-
-msgctxt "LogEvent"
-msgid "Warning"
-msgstr "Upozorenje"
-
-msgctxt "LogEvent"
-msgid "Error"
-msgstr "Greška"
-
-msgctxt "LogEvent"
-msgid "Unknown"
-msgstr "Nepoznato"
-
-msgctxt "LogTreeItem"
-msgid "Debug"
-msgstr "Debugiranje"
-
-msgctxt "LogTreeItem"
-msgid "Info"
-msgstr "Info"
-
-msgctxt "LogTreeItem"
-msgid "Notice"
-msgstr "Obavijest"
-
-msgctxt "LogTreeItem"
-msgid "Warning"
-msgstr "Upozorenje"
-
-msgctxt "LogTreeItem"
-msgid "Error"
-msgstr "Greška"
-
-msgctxt "LogTreeItem"
-msgid "Unknown"
-msgstr "Nepoznato"
-
-msgctxt "MainWindow"
-msgid "Start Tor"
-msgstr "Pokreni Tor"
-
-msgctxt "MainWindow"
-msgid "Exit"
-msgstr "Izlaz"
-
-msgctxt "MainWindow"
-msgid "Bandwidth Graph"
-msgstr "Graf Propusnosti"
-
-msgctxt "MainWindow"
-msgid "Message Log"
-msgstr "Dnevnik Poruka"
-
-msgctxt "MainWindow"
-msgid "Network Map"
-msgstr "Mrežna Karta"
-
-msgctxt "MainWindow"
-msgid "Control Panel"
-msgstr "Kontrolna Ploča"
-
-msgctxt "MainWindow"
-msgid "Settings"
-msgstr "Postavke"
-
-msgctxt "MainWindow"
-msgid "About"
-msgstr "O"
-
-msgctxt "MainWindow"
-msgid "Help"
-msgstr "Pomoć"
-
-msgctxt "MainWindow"
-msgid "New Identity"
-msgstr "Novi 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"
-
-msgctxt "MainWindow"
-msgid "View"
-msgstr "Pogled"
-
-msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr "Vidalia Pomoć"
-
-msgctxt "MainWindow"
-msgid "Error starting web browser"
-msgstr "Greška pri pokretanju web pretraživača"
-
-msgctxt "MainWindow"
-msgid "Vidalia was unable to start the configured web browser"
-msgstr "Vidalia nije bila u mogućnosti pokrenuti podešeni web pretraživač"
-
-msgctxt "MainWindow"
-msgid "Error starting IM client"
-msgstr "Greška pri pokretanju IM klijenta"
-
-msgctxt "MainWindow"
-msgid "Vidalia was unable to start the configured IM client"
-msgstr "Vidalia nije bila u mogućnosti pokrenuti podešeni IM klijent"
-
-msgctxt "MainWindow"
-msgid "Error starting proxy server"
-msgstr "Greška pri pokretanju proxy poslužitelja"
-
-msgctxt "MainWindow"
-msgid "Vidalia was unable to start the configured proxy server"
-msgstr "Vidalia nije bila u mogućnosti pokrenuti podešeni proxy poslužitelj"
-
-msgctxt "MainWindow"
-msgid "Connecting to a relay directory"
-msgstr "Spajanje na mapu releja"
-
-msgctxt "MainWindow"
-msgid "Establishing an encrypted directory connection"
-msgstr "Uspostavljanje šifrirane veze prema mapi"
-
-msgctxt "MainWindow"
-msgid "Retrieving network status"
-msgstr "Dohvaćanje statusa mreže"
-
-msgctxt "MainWindow"
-msgid "Loading network status"
-msgstr "Učitavanje statusa mreže"
-
-msgctxt "MainWindow"
-msgid "Loading authority certificates"
-msgstr "Učitavanje certifikata autoriteta"
-
-msgctxt "MainWindow"
-msgid "Requesting relay information"
-msgstr "Zahtjevanje informacije o releju"
-
-msgctxt "MainWindow"
-msgid "Loading relay information"
-msgstr "Učitavanje informacija o releju"
-
-msgctxt "MainWindow"
-msgid "Connecting to the Tor network"
-msgstr "Spajanje na Tor mrežu"
-
-msgctxt "MainWindow"
-msgid "Establishing a Tor circuit"
-msgstr "Uspostavljanje Tor kruga"
-
-msgctxt "MainWindow"
-msgid "Connected to the Tor network!"
-msgstr "Spojen na Tor mrežu!"
-
-msgctxt "MainWindow"
-msgid "miscellaneous"
-msgstr "razno"
-
-msgctxt "MainWindow"
-msgid "identity mismatch"
-msgstr "nepodudaranje identiteta"
-
-msgctxt "MainWindow"
-msgid "done"
-msgstr "gotovo"
-
-msgctxt "MainWindow"
-msgid "connection refused"
-msgstr "veza odbijena"
-
-msgctxt "MainWindow"
-msgid "connection timeout"
-msgstr "vrijeme čekanja veze isteklo"
-
-msgctxt "MainWindow"
-msgid "read/write error"
-msgstr "greška čitanja/pisanja"
-
-msgctxt "MainWindow"
-msgid "no route to host"
-msgstr "nema rute do domaćina"
-
-msgctxt "MainWindow"
-msgid "insufficient resources"
-msgstr "nedostatni resursi"
-
-msgctxt "MainWindow"
-msgid "unknown"
-msgstr "nepoznato"
-
-msgctxt "MainWindow"
-msgid "Tor is not running"
-msgstr "Tor nije pokrenut"
-
-msgctxt "MainWindow"
-msgid "Tor is shutting down"
-msgstr "Tor je u procesu gašenja"
-
-msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr "Zaustavi Tor Odmah"
-
-msgctxt "MainWindow"
-msgid "Stop Tor"
-msgstr "Zaustavi Tor"
-
-msgctxt "MainWindow"
-msgid "Starting the Tor software"
-msgstr "Pokrećem Tor software"
-
-msgctxt "MainWindow"
-msgid "Starting Tor"
-msgstr "Pokrećem Tor"
-
-msgctxt "MainWindow"
-msgid "Error Starting Tor"
-msgstr "Greška pri Pokretanju Tora"
-
-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 nije bila u mogućnosti pokrenuti Tor. Provjerite svoje postavke i uvjerite se da su naziv i lokacija vaše Tor izvršne datoteke ispravni."
-
-msgctxt "MainWindow"
-msgid "Connecting to Tor"
-msgstr "Spajanje na Tor"
-
-msgctxt "MainWindow"
-msgid "Connection Error"
-msgstr "Greška pri Spajanju"
-
-msgctxt "MainWindow"
-msgid "Relaying is Enabled"
-msgstr "Relej je Omogućen"
-
-msgctxt "MainWindow"
-msgid "Error Shutting Down"
-msgstr "Greška pri Isključivanju"
-
-msgctxt "MainWindow"
-msgid "Vidalia was unable to stop the Tor software."
-msgstr "Vidalia nije bila u mogućnosti zaustaviti Tor software."
-
-msgctxt "MainWindow"
-msgid "Unexpected Error"
-msgstr "Neočekivana Greška"
-
-msgctxt "MainWindow"
-msgid "Authenticating to Tor"
-msgstr "Autentificiranje Toru"
-
-msgctxt "MainWindow"
-msgid "Cookie Authentication Required"
-msgstr "Zahtjevana Autentifikacija Cookijima"
-
-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 traži od Vidalije da pošalje sadržaj autentifikacijskog cookia, ali Vidalia ga nije bila u mogućnosti pronaći."
-
-msgctxt "MainWindow"
-msgid "Would you like to browse for the file 'control_auth_cookie' yourself?"
-msgstr "Dali biste sami željeli potražiti datoteku 'control_auth_cookie'?"
-
-msgctxt "MainWindow"
-msgid "Data Directory"
-msgstr "Podatkovna Mapa"
-
-msgctxt "MainWindow"
-msgid "Control Cookie (control_auth_cookie)"
-msgstr "Kontrolni Cookie (control_auth_cookie)"
-
-msgctxt "MainWindow"
-msgid "Error Registering for Events"
-msgstr "Greška pri Registriranju za Događaje"
-
-msgctxt "MainWindow"
-msgid ""
-"Vidalia was unable to register for some events. Many of Vidalia's features "
-"may be unavailable."
-msgstr "Vidalia nije bila u mogućnosti registrirati se za neke događaje. Mnoge mogućnosti Vidalije mogle bi biti nedostupne."
-
-msgctxt "MainWindow"
-msgid "Authentication Error"
-msgstr "Greška pri Autentifikaciji"
-
-msgctxt "MainWindow"
-msgid "Vidalia was unable to authenticate to the Tor software. (%1)"
-msgstr "Vidalija nije bila u mogućnosti autentificirati se Toru. (%1)"
-
-msgctxt "MainWindow"
-msgid "Please check your control port authentication settings."
-msgstr "Molimo provjerite svoje postavke autentifikacije kontrolnog porta."
-
-msgctxt "MainWindow"
-msgid "Tor Update Available"
-msgstr "Dostupno Ažuriranje Tora"
-
-msgctxt "MainWindow"
-msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended. Please visit the Tor website to download the latest version."
-msgstr "Trenutno instalirana inačica tora nije ažurna ili se više ne preporuča. Molimo posjetite Tor web stranicu za preuzimanje posljednje inačice."
-
-msgctxt "MainWindow"
-msgid "Tor website: %1"
-msgstr "Tor web stranica: %1"
-
-msgctxt "MainWindow"
-msgid ""
-"All subsequent connections will appear to be different than your old "
-"connections."
-msgstr "Sve daljnje veze činiti će se drugačije od vaše stare veze."
-
-msgctxt "MainWindow"
-msgid "Failed to Create New Identity"
-msgstr "Neuspješno Kreiranje Novog Identiteta"
-
-msgctxt "MainWindow"
-msgid "Port Forwarding Failed"
-msgstr "Preusmjeravanje Portova Neuspjelo"
-
-msgctxt "MainWindow"
-msgid "Vidalia was unable to configure automatic port forwarding."
-msgstr "Vidalia nije bila u mogućnosti podesiti automatsko preusmjeravanje portova."
-
-msgctxt "MainWindow"
-msgid "Vidalia Control Panel"
-msgstr "Vidalia Kontrolna Ploča"
-
-msgctxt "MainWindow"
-msgid "Status"
-msgstr "Status"
-
-msgctxt "MainWindow"
-msgid "Vidalia Shortcuts"
-msgstr "Vidalia Kratice"
-
-msgctxt "MainWindow"
-msgid "Setup Relaying"
-msgstr "Postavljanje Releja"
-
-msgctxt "MainWindow"
-msgid "Set up a relay and help the network grow"
-msgstr "Postavite relej i pomognite rastu mreže"
-
-msgctxt "MainWindow"
-msgid "View the Network"
-msgstr "Pregled Mreže"
-
-msgctxt "MainWindow"
-msgid "View a map of the Tor network"
-msgstr "Pregled karte Tor mreže"
-
-msgctxt "MainWindow"
-msgid "Use a New Identity"
-msgstr "Korištenje Novog Identiteta"
-
-msgctxt "MainWindow"
-msgid "Make subsequent connections appear new"
-msgstr "Učini da se daljnje veze čine novima"
-
-msgctxt "MainWindow"
-msgid "View recent bandwidth usage"
-msgstr "Pregled nedavnog korištenja propusnosti"
-
-msgctxt "MainWindow"
-msgid "View log message history"
-msgstr "Pregled povijesti dnevnika poruka"
-
-msgctxt "MainWindow"
-msgid "View help documentation"
-msgstr "Pregled pomoćne dokumentacije"
-
-msgctxt "MainWindow"
-msgid "Configure Vidalia"
-msgstr "Podešavanje Vidalije"
-
-msgctxt "MainWindow"
-msgid "View version and license information"
-msgstr "Pregled informacija inačice i licence"
-
-msgctxt "MainWindow"
-msgid "Exit Vidalia"
-msgstr "Izlaz iz Vidalie"
-
-msgctxt "MainWindow"
-msgid "Show this window on startup"
-msgstr "Prikaži ovaj prozor pri pokretanju"
-
-msgctxt "MainWindow"
-msgid "Hide"
-msgstr "Sakrij"
-
-msgctxt "MainWindow"
-msgid "Hide this window"
-msgstr "Sakrij ovaj prozor"
-
-msgctxt "MainWindow"
-msgid "Password Reset Failed"
-msgstr "Resetiranje Lozinke Neuspjelo"
-
-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 je pokušala resetirati Tor kontrolnu lozinku, ali nije bila u mogućnosti ponovno pokrenuti Tor. Molimo provjerite svoj Task Manager da biste se uvjerili da nema trenutno drugih pokrenutih Tor procesa."
-
-msgctxt "MainWindow"
-msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended."
-msgstr "Trenutno instalirana inačica Tora je zastarjela i nije više preporučena."
-
-msgctxt "MainWindow"
-msgid ""
-"Would you like to check if a newer package is available for installation?"
-msgstr "Dali biste željeli provjeriti ako postoji novi paket dostupan za instalaciju?"
-
-msgctxt "MainWindow"
-msgid "Potentially Unsafe Connection"
-msgstr "Potencijalno Nesigurna Veza"
-
-msgctxt "MainWindow"
-msgid ""
-"Tor has automatically closed your connection in order to protect your "
-"anonymity."
-msgstr "Tor je automatski zatvorio vašu vezu kako bi zaštitio vašu anonimnost."
-
-msgctxt "MainWindow"
-msgid "Update Failed"
-msgstr "Ažuriranje Neuspjelo"
-
-msgctxt "MainWindow"
-msgid "Your software is up to date"
-msgstr "Vaš software je ažuran."
-
-msgctxt "MainWindow"
-msgid ""
-"There are no new Tor software packages available for your computer at this "
-"time."
-msgstr "Nema novih Tor paketa dostupnih za vaše računalo u ovom trenutku."
-
-msgctxt "MainWindow"
-msgid "Installation Failed"
-msgstr "Instalacija Neuspjela"
-
-msgctxt "MainWindow"
-msgid "Vidalia was unable to install your software updates."
-msgstr "Vidalia nije bila u mogućnosti instalirati ažuriranja softwarea."
-
-msgctxt "MainWindow"
-msgid "The following error occurred:"
-msgstr "Sljedeća greška se pojavila:"
-
-msgctxt "MainWindow"
-msgid ""
-"Anything sent over this connection could be monitored. Please check your "
-"application's configuration and use only encrypted protocols, such as SSL, "
-"if possible."
-msgstr "Sve poslano preko ove veze može biti nadgledano. Molimo provjerite postavke svoje aplikacije i koristite samo šifrirane protokole, poput SSL-a, ukoliko je moguće."
-
-msgctxt "MainWindow"
-msgid "Bootstrapping torrc from %1 to %2"
-msgstr "Bootstrapping torrc iz %1 u %2"
-
-msgctxt "MainWindow"
-msgid "(probably Telnet)"
-msgstr "(vjerojatno Telnet)"
-
-msgctxt "MainWindow"
-msgid "(probably an email client)"
-msgstr "(vjerojatno email klijent)"
-
-msgctxt "MainWindow"
-msgid ""
-"One of your applications %1 appears to be making a potentially unencrypted "
-"and unsafe connection to port %2."
-msgstr "Jedna od vaših aplikacija %1 čini se pokušava napraviti potencijalno nešifriranu i nesigurnu vezu na port %2."
-
-msgctxt "MainWindow"
-msgid "failed (%1)"
-msgstr "neuspjelo (%1)"
-
-msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
-msgstr "Vaš relej je u procesu gašenja.\nKliknite 'Zaustavi' ponovno za trenutno zaustavljanje releja."
-
-msgctxt "MainWindow"
-msgid ""
-"Vidalia can't find out how to talk to Tor because it can't access this file: %1\n"
-"\n"
-"Here's the last error message:\n"
-"%2"
-msgstr "Vidalia ne može saznati kako komunicirati sa Tor-om zato jer ne može pristupiti ovoj datoteci: %1\n\nOvdje je posljednja poruka greške:\n%2"
-
-msgctxt "MainWindow"
-msgid ""
-"It seems Tor has stopped running since Vidalia started it.\n"
-"\n"
-"See the Advanced Message Log for more information."
-msgstr "Čini se da je Tor prestao sa radom od kada je Vidalia pokrenuta.\n\nPogledajte 'Napredni popis poruka' za više informacija."
-
-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 "Trenutno imate pokrenut relej. Gašenjem svog releja ćete prekinuti sve trenutno otvorene veze klijenata.\n\nŽelite li pravilno ugasiti i dozvoliti klijentima vrijeme za pronalazak novog releja?"
-
-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 je detektirala da je Tor neočekivano izašao.\n\nMolimo provjerite dnevnik poruka za nedavna upozorenja i greške."
-
-msgctxt "MessageLog"
-msgid "Error Setting Filter"
-msgstr "Filter Postavki Grešaka"
-
-msgctxt "MessageLog"
-msgid "Vidalia was unable to register for Tor's log events."
-msgstr "Vidalia se nije uspjela prijaviti za dnevnik događaja Tora."
-
-msgctxt "MessageLog"
-msgid "Error Opening Log File"
-msgstr "Greška pri Otvaranju Datoteke Dnevnika"
-
-msgctxt "MessageLog"
-msgid "Vidalia was unable to open the specified log file."
-msgstr "Vidalia nije bila u mogućnosti otvoriti specificiranu datoteku dnevnika."
-
-msgctxt "MessageLog"
-msgid "Log Filename Required"
-msgstr "Naziv Datoteke Dnevnika Potreban"
-
-msgctxt "MessageLog"
-msgid "You must enter a filename to be able to save log messages to a file."
-msgstr "Morate unesti naziv datoteke da biste bili u mogućnosti spremati poruke dnevnika u datoteku."
-
-msgctxt "MessageLog"
-msgid "Select Log File"
-msgstr "Odaberi Datoteku Dnevnika"
-
-msgctxt "MessageLog"
-msgid "Save Log Messages"
-msgstr "Spremi Poruke Dnevnika"
-
-msgctxt "MessageLog"
-msgid "Text Files (*.txt)"
-msgstr "Tekstualne Datoteke (*.txt)"
-
-msgctxt "MessageLog"
-msgid "Vidalia"
-msgstr "Vidalia"
-
-msgctxt "MessageLog"
-msgid "Find in Message Log"
-msgstr "Pronađi u Dnevniku Poruka"
-
-msgctxt "MessageLog"
-msgid "Find:"
-msgstr "Pronađi:"
-
-msgctxt "MessageLog"
-msgid "Not Found"
-msgstr "Nije Pronađeno"
-
-msgctxt "MessageLog"
-msgid "Search found 0 matches."
-msgstr "Pretraga je pronašla 0 podudarnosti."
-
-msgctxt "MessageLog"
-msgid "Message Log"
-msgstr "Dnevnik Poruka"
-
-msgctxt "MessageLog"
-msgid "Message Filters..."
-msgstr "Filteri Poruka..."
-
-msgctxt "MessageLog"
-msgid "Set message filters"
-msgstr "Postavi filtere poruka"
-
-msgctxt "MessageLog"
-msgid "History Size..."
-msgstr "Veličina Povijesti..."
-
-msgctxt "MessageLog"
-msgid "Set maximum number of messages to display"
-msgstr "Postavi maksimalni broj poruka za prikaz"
-
-msgctxt "MessageLog"
-msgid "Clear"
-msgstr "Očisti"
-
-msgctxt "MessageLog"
-msgid "Clear all messages from the Message Log (Ctrl+E)"
-msgstr "Očisti sve poruke iz Dnevnika Poruka (Ctrl+E)"
-
-msgctxt "MessageLog"
-msgid "Ctrl+E"
-msgstr "Ctrl+E"
-
-msgctxt "MessageLog"
-msgid "Copy"
-msgstr "Kopiraj"
-
-msgctxt "MessageLog"
-msgid "Copy the selected messages to the clipboard (Ctrl+C)"
-msgstr "Kopiraj odabrane poruke u međuspremnik (Ctrl+C)"
-
-msgctxt "MessageLog"
-msgid "Ctrl+C"
-msgstr "Ctrl+C"
-
-msgctxt "MessageLog"
-msgid "Select All"
-msgstr "Odaberi Sve"
-
-msgctxt "MessageLog"
-msgid "Select all messages (Ctrl+A)"
-msgstr "Odaberi sve poruke (Ctrl+A)"
-
-msgctxt "MessageLog"
-msgid "Ctrl+A"
-msgstr "Ctrl+A"
-
-msgctxt "MessageLog"
-msgid "Save All"
-msgstr "Spremi Sve"
-
-msgctxt "MessageLog"
-msgid "Save all messages to a file"
-msgstr "Spremi sve poruke u datoteku"
-
-msgctxt "MessageLog"
-msgid "Save Selected"
-msgstr "Spremi odabrano"
-
-msgctxt "MessageLog"
-msgid "Save selected messages to a file"
-msgstr "Spremi odabrane poruke u datoteku"
-
-msgctxt "MessageLog"
-msgid "Settings"
-msgstr "Postavke"
-
-msgctxt "MessageLog"
-msgid "Adjust Message Log Settings"
-msgstr "Prilagodi Postavke Dnevnika Poruka"
-
-msgctxt "MessageLog"
-msgid "Ctrl+T"
-msgstr "Ctrl+T"
-
-msgctxt "MessageLog"
-msgid "Help"
-msgstr "Pomoć"
-
-msgctxt "MessageLog"
-msgid "Show the help browser"
-msgstr "Prikaži preglednih pomoći"
-
-msgctxt "MessageLog"
-msgid "F1"
-msgstr "F1"
-
-msgctxt "MessageLog"
-msgid "Close"
-msgstr "Zatvori"
-
-msgctxt "MessageLog"
-msgid "Close the Message Log"
-msgstr "Zatvori Dnevnik Poruka"
-
-msgctxt "MessageLog"
-msgid "Esc"
-msgstr "Esc"
-
-msgctxt "MessageLog"
-msgid "Find"
-msgstr "Pronađi"
-
-msgctxt "MessageLog"
-msgid "Find all messages containing the search text (Ctrl+F)"
-msgstr "Pronađi sve poruke koje sadržavaju tekst pretrage (Ctrl+F)"
-
-msgctxt "MessageLog"
-msgid "Ctrl+F"
-msgstr "Ctrl+F"
-
-msgctxt "MessageLog"
-msgid "Time"
-msgstr "Vrijeme"
-
-msgctxt "MessageLog"
-msgid "Type"
-msgstr "Tip"
-
-msgctxt "MessageLog"
-msgid "Message"
-msgstr "Poruka"
-
-msgctxt "MessageLog"
-msgid "Saves the current Message Log settings"
-msgstr "Sprema trenutne postavke Dnevnika Poruka"
-
-msgctxt "MessageLog"
-msgid "Save Settings"
-msgstr "Spremi Postavke"
-
-msgctxt "MessageLog"
-msgid "Cancels changes made to settings"
-msgstr "Otkaži izmjene učinjenje postavkama"
-
-msgctxt "MessageLog"
-msgid "Cancel"
-msgstr "Odustani"
-
-msgctxt "MessageLog"
-msgid "Message Filter"
-msgstr "Filter Poruka"
-
-msgctxt "MessageLog"
-msgid "Error"
-msgstr "Greška"
-
-msgctxt "MessageLog"
-msgid "Warning"
-msgstr "Upozorenje"
-
-msgctxt "MessageLog"
-msgid "Notice"
-msgstr "Napomena"
-
-msgctxt "MessageLog"
-msgid "Info"
-msgstr "Info"
-
-msgctxt "MessageLog"
-msgid "Debug"
-msgstr "Debugiranje"
-
-msgctxt "MessageLog"
-msgid "Message Log History"
-msgstr "Povijest Dnevnika Poruka"
-
-msgctxt "MessageLog"
-msgid "Number of messages to display in the message log window"
-msgstr "Broj poruka koje će se prikazivati u prozoru dnevnika poruka"
-
-msgctxt "MessageLog"
-msgid "messages"
-msgstr "poruke"
-
-msgctxt "MessageLog"
-msgid "Browse"
-msgstr "Pretraži"
-
-msgctxt "MessageLog"
-msgid "Enable automatically saving all new log messages to a file"
-msgstr "Omogući automatsko spremanje novih poruka dnevnika u datoteku"
-
-msgctxt "MessageLog"
-msgid "Automatically save new log messages to a file"
-msgstr "Automatski spremi nove poruke dnevnika u datoteku"
-
-msgctxt "MessageLog"
-msgid "Basic"
-msgstr "Osnovno"
-
-msgctxt "MessageLog"
-msgid "Tor Status"
-msgstr "Tor Status"
-
-msgctxt "MessageLog"
-msgid "Advanced"
-msgstr "Napredno"
-
-msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
-msgstr "Uvijek Spremi Nove Poruke Dnevnika"
-
-msgctxt "MessageLog"
-msgid ""
-"Messages that appear when something has \n"
-"gone very wrong and Tor cannot proceed."
-msgstr "Poruke koje se pojavljuju kada je nešto\nzaista pošlo po krivu i Tor ne može nastaviti."
-
-msgctxt "MessageLog"
-msgid ""
-"Messages that only appear when \n"
-"something has gone wrong with Tor."
-msgstr "Poruke koje se pojavljuju samo kada\nje nešto pošlo po krivu sa Torom."
-
-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 "Poruke koje se pojavljuju rijetko\ntijekom uobičajenog rada Tora i nisu\nsmatrane greškama, ali su vam\nmožda bitne."
-
-msgctxt "MessageLog"
-msgid ""
-"Messages that appear frequently \n"
-"during normal Tor operation."
-msgstr "Poruke koje se pojavljuju često\ntijekom uobičajenog rada Tora."
-
-msgctxt "MessageLog"
-msgid ""
-"Hyper-verbose messages primarily of \n"
-"interest to Tor developers."
-msgstr "Vrlo detaljne poruke od primarnog\ninteresa Tor developerima."
-
-msgctxt "MessageLog"
-msgid ""
-"Cannot write file %1\n"
-"\n"
-"%2."
-msgstr "Nije moguće zapisati datoteku %1\n\n%2."
-
-msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr "Tor Karta Mreže"
-
-msgctxt "NetViewer"
-msgid "Refresh"
-msgstr "Osvježi"
-
-msgctxt "NetViewer"
-msgid "Refresh the list of Tor relays and connections"
-msgstr "Osvježi listu Tor releja i veza"
-
-msgctxt "NetViewer"
-msgid "Ctrl+R"
-msgstr "Ctrl+R"
-
-msgctxt "NetViewer"
-msgid "Help"
-msgstr "Pomoć"
-
-msgctxt "NetViewer"
-msgid "Show the network map help"
-msgstr "Prikaži pomoć karte mreže"
-
-msgctxt "NetViewer"
-msgid "Show network map help"
-msgstr "Prikaži pomoć karte mreže"
-
-msgctxt "NetViewer"
-msgid "F1"
-msgstr "F1"
-
-msgctxt "NetViewer"
-msgid "Close"
-msgstr "Zatvori"
-
-msgctxt "NetViewer"
-msgid "Close the network map"
-msgstr "Zatvori kartu mreže"
-
-msgctxt "NetViewer"
-msgid "Esc"
-msgstr "Esc"
-
-msgctxt "NetViewer"
-msgid "Zoom In"
-msgstr "Uvećaj"
-
-msgctxt "NetViewer"
-msgid "Zoom in on the network map"
-msgstr "Uvećavanje karte mreže"
-
-msgctxt "NetViewer"
-msgid "+"
-msgstr "+"
-
-msgctxt "NetViewer"
-msgid "Zoom Out"
-msgstr "Umanjivanje"
-
-msgctxt "NetViewer"
-msgid "Zoom out on the network map"
-msgstr "Umanjivanje karte mreže"
-
-msgctxt "NetViewer"
-msgid "-"
-msgstr "-"
-
-msgctxt "NetViewer"
-msgid "Zoom To Fit"
-msgstr "Uvećaj Optimalno"
-
-msgctxt "NetViewer"
-msgid "Zooms to fit all currently displayed circuits"
-msgstr "Uvećava dok se ne prikazuju svi trenutno prikazani krugovi."
-
-msgctxt "NetViewer"
-msgid "Ctrl+Z"
-msgstr "Ctrl+Z"
-
-msgctxt "NetViewer"
-msgid "Relay Not Found"
-msgstr "Relej Nije Pronađen"
-
-msgctxt "NetViewer"
-msgid "No details on the selected relay are available."
-msgstr "Nikakvi detalji o odabranom releju nisu dostupni."
-
-msgctxt "NetViewer"
-msgid "Unknown"
-msgstr "Nepoznato"
-
-msgctxt "NetViewer"
-msgid "Full Screen"
-msgstr "Cijeli Zaslon"
-
-msgctxt "NetViewer"
-msgid "View the network map as a full screen window"
-msgstr "Pregled karte mreže preko cijelog zaslona"
-
-msgctxt "NetViewer"
-msgid "Ctrl+F"
-msgstr "Ctrl+F"
-
-msgctxt "NetworkPage"
-msgid "Copy (Ctrl+C)"
-msgstr "Kopiraj (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 "Morate specificirati i IP adresu ili naziv domaćina i broj porta da biste podesili Tor za korištenje proxya za pristup Internetu."
-
-msgctxt "NetworkPage"
-msgid ""
-"You must specify one or more ports to which your firewall allows you to "
-"connect."
-msgstr "Morate specificirati jedan ili više portova na koje vam vaš vatrozid dozvoljava spajanje."
-
-msgctxt "NetworkPage"
-msgid "'%1' is not a valid port number."
-msgstr "'%1' nije važeći broj porta."
-
-msgctxt "NetworkPage"
-msgid "Check if your local network requires a proxy to access the Internet"
-msgstr "Provjerite dali vaša lokalna mreža zahtjeva proxy za pristup Internetu"
-
-msgctxt "NetworkPage"
-msgid "I use a proxy to access the Internet"
-msgstr "Koristim proxy za pristup Internetu"
-
-msgctxt "NetworkPage"
-msgid "Proxy Settings"
-msgstr "Postavke Proxya"
-
-msgctxt "NetworkPage"
-msgid "Username:"
-msgstr "Korisničko ime:"
-
-msgctxt "NetworkPage"
-msgid "Password:"
-msgstr "Lozinka:"
-
-msgctxt "NetworkPage"
-msgid "Port:"
-msgstr "Port:"
-
-msgctxt "NetworkPage"
-msgid "Check to only connect to relays using ports allowed by your firewall"
-msgstr "Označite za spajanje na releje samo portovima koje vaš vatrozid dozvoljava"
-
-msgctxt "NetworkPage"
-msgid "My firewall only lets me connect to certain ports"
-msgstr "Moj vatrozid mi dopušta spajanje samo na određene portove"
-
-msgctxt "NetworkPage"
-msgid "Firewall Settings"
-msgstr "Postavke Vatrozida"
-
-msgctxt "NetworkPage"
-msgid "Allowed Ports:"
-msgstr "Dozvoljeni Portovi:"
-
-msgctxt "NetworkPage"
-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 "Označite za šifriranje zahtjeva za imenikom i, opcionalno, korištenje mostovnih releja za pristup Tor mreži"
-
-msgctxt "NetworkPage"
-msgid "My ISP blocks connections to the Tor network"
-msgstr "Moj ISP blokira veze prema Tor mreži"
-
-msgctxt "NetworkPage"
-msgid "Bridge Settings"
-msgstr "Postavke Mosta"
-
-msgctxt "NetworkPage"
-msgid "Add a Bridge:"
-msgstr "Dodaj Most:"
-
-msgctxt "NetworkPage"
-msgid "Remove the selected bridges from the list"
-msgstr "Ukloni odabrane mostove sa liste"
-
-msgctxt "NetworkPage"
-msgid "Copy the selected bridges to the clipboard"
-msgstr "Kopiraj odabrane mostove u međuspremnik"
-
-msgctxt "NetworkPage"
-msgid "Find Bridges Now"
-msgstr "Pronađi Mostove Sada"
-
-msgctxt "NetworkPage"
-msgid "<a href=\"bridges.finding\">How else can I find bridges?</a>"
-msgstr "<a href=\"bridges.finding\">Kako još mogu pronaći mostove?</a>"
-
-msgctxt "NetworkPage"
-msgid "<a href=\"bridges.finding\">How can I find bridges?</a>"
-msgstr "<a href=\"bridges.finding\">Kako mogu pronaći mostove?</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 "Trenutno nema dostupnih novih mostova. Možete ili pričekati neko vrijeme i pokušati ponovno, ili pokušati nekom drugom metodom pronalaska novih mostova."
-
-msgctxt "NetworkPage"
-msgid "Click Help to see other methods of finding new bridges."
-msgstr "Kliknite Pomoć za pregled drugih metoda pronalaska novih mostova."
-
-msgctxt "NetworkPage"
-msgid "Address:"
-msgstr "Adresa:"
-
-msgctxt "NetworkPage"
-msgid "Type:"
-msgstr "Tip:"
-
-msgctxt "NetworkPage"
-msgid "You must select the proxy type."
-msgstr "Morate odabrati tip proxya."
-
-msgctxt "NetworkPage"
-msgid "SOCKS 4"
-msgstr "SOCKS 4"
-
-msgctxt "NetworkPage"
-msgid "SOCKS 5"
-msgstr "SOCKS 5"
-
-msgctxt "NetworkPage"
-msgid "HTTP / HTTPS"
-msgstr "HTTP / HTTPS"
-
-msgctxt "NetworkPage"
-msgid "You must specify one or more bridges."
-msgstr "Morate odrediti jedan ili više mostova."
-
-msgctxt "Policy"
-msgid "accept"
-msgstr "prihvati"
-
-msgctxt "Policy"
-msgid "reject"
-msgstr "odbij"
-
-msgctxt "RouterDescriptor"
-msgid "Online"
-msgstr "Online"
-
-msgctxt "RouterDescriptor"
-msgid "Hibernating"
-msgstr "Hibernacija"
-
-msgctxt "RouterDescriptor"
-msgid "Offline"
-msgstr "Offline"
-
-msgctxt "RouterDescriptorView"
-msgid "Location:"
-msgstr "Lokacija:"
-
-msgctxt "RouterDescriptorView"
-msgid "IP Address:"
-msgstr "IP Adresa:"
-
-msgctxt "RouterDescriptorView"
-msgid "Platform:"
-msgstr "Platforma:"
-
-msgctxt "RouterDescriptorView"
-msgid "Bandwidth:"
-msgstr "Propusnost:"
-
-msgctxt "RouterDescriptorView"
-msgid "Uptime:"
-msgstr "Vrijeme rada:"
-
-msgctxt "RouterDescriptorView"
-msgid "Last Updated:"
-msgstr "Posljednje Ažuriranje:"
-
-msgctxt "RouterDescriptorView"
-msgid "Copy"
-msgstr "Kopiraj"
-
-msgctxt "RouterInfoDialog"
-msgid "Hibernating"
-msgstr "Hiberniranje"
-
-msgctxt "RouterInfoDialog"
-msgid "Online"
-msgstr "Online"
-
-msgctxt "RouterInfoDialog"
-msgid "Offline"
-msgstr "Offline"
-
-msgctxt "RouterInfoDialog"
-msgid "Unknown"
-msgstr "Nepoznato"
-
-msgctxt "RouterInfoDialog"
-msgid "Relay Details"
-msgstr "Detalji Releja"
-
-msgctxt "RouterInfoDialog"
-msgid "Summary"
-msgstr "Sažetak"
-
-msgctxt "RouterInfoDialog"
-msgid "Name:"
-msgstr "Naziv:"
-
-msgctxt "RouterInfoDialog"
-msgid "Status:"
-msgstr "Status:"
-
-msgctxt "RouterInfoDialog"
-msgid "Location:"
-msgstr "Lokacija:"
-
-msgctxt "RouterInfoDialog"
-msgid "IP Address:"
-msgstr "IP Adresa:"
-
-msgctxt "RouterInfoDialog"
-msgid "Platform:"
-msgstr "Platforma:"
-
-msgctxt "RouterInfoDialog"
-msgid "Bandwidth:"
-msgstr "Propusnost:"
-
-msgctxt "RouterInfoDialog"
-msgid "Uptime:"
-msgstr "Vrijeme rada:"
-
-msgctxt "RouterInfoDialog"
-msgid "Contact:"
-msgstr "Kontakt:"
-
-msgctxt "RouterInfoDialog"
-msgid "Last Updated:"
-msgstr "Posljednje ažuriranje:"
-
-msgctxt "RouterInfoDialog"
-msgid "Descriptor"
-msgstr "Opis"
-
-msgctxt "RouterListItem"
-msgid "Offline"
-msgstr "Offline"
-
-msgctxt "RouterListItem"
-msgid "Hibernating"
-msgstr "Hiberniranje"
-
-msgctxt "RouterListItem"
-msgid "%1 KB/s"
-msgstr "%1 KB/s"
-
-msgctxt "RouterListWidget"
-msgid "Relay"
-msgstr "Relej"
-
-msgctxt "RouterListWidget"
-msgid "Zoom to Relay"
-msgstr "Uvećaj do Releja"
-
-msgctxt "RouterListWidget"
-msgid "%1 relays online"
-msgstr "%1 Releja Online"
-
-msgctxt "RouterListWidget"
-msgid "Copy"
-msgstr "Kopiraj"
-
-msgctxt "RouterListWidget"
-msgid "Nickname"
-msgstr "Nadimak"
-
-msgctxt "RouterListWidget"
-msgid "Fingerprint"
-msgstr "Otisak"
-
-msgctxt "ServerPage"
-msgid "Bridge Support Unavailable"
-msgstr "Podrška Mosta Nedostupna"
-
-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 "Podesili ste Tor da se ponaša kao mostni relej za cenzurirane korisnike, ali vaša inačica Tora ne podržava mostove."
-
-msgctxt "ServerPage"
-msgid ""
-"Please upgrade your Tor software or configure Tor to act as a normal Tor "
-"relay."
-msgstr "Molimo ažurirajte vaš Tor software ili podesite Tor da se ponaša kao uobičajeni Tor relej."
-
-msgctxt "ServerPage"
-msgid "Your bridge relay is not running."
-msgstr "Vaš mostni relej nije pokrenut."
-
-msgctxt "ServerPage"
-msgid "You must specify at least a relay nickname and port."
-msgstr "Morate specificirati barem nadimak i port releja."
-
-msgctxt "ServerPage"
-msgid "Run as a client only"
-msgstr "Pokreni samo kao klijent"
-
-msgctxt "ServerPage"
-msgid "Relay Port:"
-msgstr "Port Releja:"
-
-msgctxt "ServerPage"
-msgid "Enable to mirror the relay directory"
-msgstr "Omogući za zrcaljenje imenika releja"
-
-msgctxt "ServerPage"
-msgid "Attempt to automatically configure port forwarding"
-msgstr "Pokušaj automatski podesiti preusmjeravanje portova"
-
-msgctxt "ServerPage"
-msgid "Test"
-msgstr "Test"
-
-msgctxt "ServerPage"
-msgid "Show help topic on port forwarding"
-msgstr "Prikaži temu pomoći vezanu uz preusmjeravanje portova"
-
-msgctxt "ServerPage"
-msgid "Directory Port:"
-msgstr "Port Imenika:"
-
-msgctxt "ServerPage"
-msgid "Directory Port Number"
-msgstr "Broj Porta Imenika"
-
-msgctxt "ServerPage"
-msgid "Contact Info:"
-msgstr "Kontakt Podaci:"
-
-msgctxt "ServerPage"
-msgid "Name of your relay"
-msgstr "Ime vašeg releja"
-
-msgctxt "ServerPage"
-msgid "Port on which users and other relays can communicate with your relay"
-msgstr "Port na kojem korisnici i drugi releji mogu komunicirati sa vašim relejom"
-
-msgctxt "ServerPage"
-msgid "Nickname:"
-msgstr "Nadimak:"
-
-msgctxt "ServerPage"
-msgid "Basic Settings"
-msgstr "Osnovne Postavke"
-
-msgctxt "ServerPage"
-msgid ""
-"For Internet connections with fast download speed but slow upload, please "
-"list your upload speed here."
-msgstr "Za Internet veze sa brzom brzinom preuzimanja i sporim slanjem, molimo navedite svoju brzinu slanja."
-
-msgctxt "ServerPage"
-msgid "Cable/DSL 256 Kbps"
-msgstr "Cable/DSL 256 Kbps"
-
-msgctxt "ServerPage"
-msgid "Cable/DSL 512 Kbps"
-msgstr "Cable/DSL 512 Kbps"
-
-msgctxt "ServerPage"
-msgid "Cable/DSL 768 Kbps"
-msgstr "Cable/DSL 768 Kbps"
-
-msgctxt "ServerPage"
-msgid "T1/Cable/DSL 1.5 Mbps"
-msgstr "T1/Cable/DSL 1.5 Mbps"
-
-msgctxt "ServerPage"
-msgid "> 1.5 Mbps"
-msgstr "> 1.5 Mbps"
-
-msgctxt "ServerPage"
-msgid "Custom"
-msgstr "Prilagođeno"
-
-msgctxt "ServerPage"
-msgid "Select the entry that most closely resembles your Internet connection"
-msgstr "Odaberite unos koji najbliže opisuje vašu Internet vezu"
-
-msgctxt "ServerPage"
-msgid "Show help topic on bandwidth rate limits"
-msgstr "Prikaži temu pomoći vezanu uz ograničenja propusnosti"
-
-msgctxt "ServerPage"
-msgid "Average Rate"
-msgstr "Prosječna brzina"
-
-msgctxt "ServerPage"
-msgid "Long-term average bandwidth limit"
-msgstr "Dugotrajno prosječno ograničenje propusnosti"
-
-msgctxt "ServerPage"
-msgid "KB/s"
-msgstr "KB/s"
-
-msgctxt "ServerPage"
-msgid "Maximum Rate"
-msgstr "Maksimalna Brzina"
-
-msgctxt "ServerPage"
-msgid "Peak bandwidth rate limit"
-msgstr "Vršno ograničenje propusnosti"
-
-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 "Vaša maksimalna propusnost mora biti veća od ili jednaka vašoj prosječnoj propusnosti. Obje vrijednosti moraju biti barem 20 KB/s."
-
-msgctxt "ServerPage"
-msgid "Bandwidth Limits"
-msgstr "Ograničenja Propusnosti"
-
-msgctxt "ServerPage"
-msgid "Ports 6660 - 6669 and 6697"
-msgstr "Portovi 6660 - 6669 i 6697"
-
-msgctxt "ServerPage"
-msgid "Internet Relay Chat (IRC)"
-msgstr "Internet Relay Chat (IRC)"
-
-msgctxt "ServerPage"
-msgid "Ports 110, 143, 993 and 995"
-msgstr "Portovi 110, 143, 993 i 995"
-
-msgctxt "ServerPage"
-msgid "Retrieve Mail (POP, IMAP)"
-msgstr "Dohvati Poštu (POP, IMAP)"
-
-msgctxt "ServerPage"
-msgid "Ports unspecified by other checkboxes"
-msgstr "Portovi nespecificirani drugim checkboxovima"
-
-msgctxt "ServerPage"
-msgid "Misc Other Services"
-msgstr "Razne Druge Usluge"
-
-msgctxt "ServerPage"
-msgid "Ports 706, 1863, 5050, 5190, 5222, 5223, 8300 and 8888"
-msgstr "Portovi 706, 1863, 5050, 5190, 5222, 5223, 8300 i 8888"
-
-msgctxt "ServerPage"
-msgid "Instant Messaging (IM)"
-msgstr "Instant Messaging (IM)"
-
-msgctxt "ServerPage"
-msgid "Port 443"
-msgstr "Port 443"
-
-msgctxt "ServerPage"
-msgid "Secure Websites (SSL)"
-msgstr "Sigurne Web Stranice (SSL)"
-
-msgctxt "ServerPage"
-msgid "Port 80"
-msgstr "Port 80"
-
-msgctxt "ServerPage"
-msgid "Websites"
-msgstr "Web Stranice"
-
-msgctxt "ServerPage"
-msgid "Show help topic on exit policies"
-msgstr "Prikaži teme pomoći vezane uz izlazne politike"
-
-msgctxt "ServerPage"
-msgid ""
-"What Internet resources should users be able to access from your relay?"
-msgstr "Kojim Internet resursima bi korisnik trebao biti u mogućnosti pristupiti sa vašeg releja?"
-
-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 svejedno blokirati neke aplikacije za slanje pošte i dijeljenja datoteka po defaultu kako bi se smanjio spam i druge zloupotrebe."
-
-msgctxt "ServerPage"
-msgid "Exit Policies"
-msgstr "Izlazne Politike"
-
-msgctxt "ServerPage"
-msgid "Let others access your bridge by giving them this line:"
-msgstr "Dozvolite drugima pristup vašem mostu davanjem sljedećeg reda:"
-
-msgctxt "ServerPage"
-msgid ""
-"This is the identity of your bridge relay that you can give to other people"
-msgstr "Ovo je identitet vašeg mostnog releja koji možete davati drugim ljudima"
-
-msgctxt "ServerPage"
-msgid "Copy your bridge relay's identity to the clipboard"
-msgstr "Kopirajte identitet svog mostnog releja u međuspremnik"
-
-msgctxt "ServerPage"
-msgid "No Recent Usage"
-msgstr "Nema Nedavnog Korištenja"
-
-msgctxt "ServerPage"
-msgid "No clients have used your relay recently."
-msgstr "Niti jedan klijent nije nedavno koristio vaš relej."
-
-msgctxt "ServerPage"
-msgid ""
-"Leave your relay running so clients have a better chance of finding and "
-"using it."
-msgstr "Ostavite svoj relej pokrenut kako bi klijenti imali bolju šansu da ga pronađu i koriste."
-
-msgctxt "ServerPage"
-msgid "Bridge History"
-msgstr "Povijest Mosta"
-
-msgctxt "ServerPage"
-msgid "Vidalia was unable to retrieve your bridge's usage history."
-msgstr "Vidalia nije bila u mogućnosti dohvatiti povijest korištenja vašeg mosta."
-
-msgctxt "ServerPage"
-msgid ""
-"Tor returned an improperly formatted response when Vidalia requested your "
-"bridge's usage history."
-msgstr "Tor je vratio nepravilno formatirani odgovor kada je Vidalia zatražila povijest korištenja vašeg mosta."
-
-msgctxt "ServerPage"
-msgid "The returned response was: %1"
-msgstr "Vraćeni odgovor je bio: %1"
-
-msgctxt "ServerPage"
-msgid "Help censored users reach the Tor network"
-msgstr "Pomognite cenzuriranim korisnicima dolazak do Tor mreže"
-
-msgctxt "ServerPage"
-msgid "<a href=\"#bridgeUsage\">Who has used my bridge?</a>"
-msgstr "<a href=\"#bridgeUsage\">Tko je koristio moj most?</a>"
-
-msgctxt "ServerPage"
-msgid "<a href=\"#bridgeHelp\">What's this?</a>"
-msgstr "<a href=\"#bridgeHelp\">Što je ovo?</a>"
-
-msgctxt "ServerPage"
-msgid "Automatically distribute my bridge address"
-msgstr "Automatski distribuiraj adresu mog mosta"
-
-msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network (exit relay)"
-msgstr "Relej prometa za Tor mrežu (napusti relej)"
-
-msgctxt "ServerPage"
-msgid "Relay traffic inside the Tor network (non-exit relay)"
-msgstr "Relej prometa unutar Tor mreže (nemoguće napuštanje releja)"
-
-msgctxt "ServerPage"
-msgid "Mirror the Relay Directory"
-msgstr "Zrcali Imenik Releja"
-
-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 adresa kojom vas se može doseći ako postoji\nproblem sa vašim relejom. Možete ujedno i uključiti vaš PGP ili GPG otisak."
-
-msgctxt "ServicePage"
-msgid "Error while trying to unpublish all services"
-msgstr "Greška pri povlačenju svih usluga"
-
-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 "Molimo podesite barem imenik usluga i virtualni port za svaku uslugu koju želite spremiti. Ukolnite ostale."
-
-msgctxt "ServicePage"
-msgid "Error"
-msgstr "Greška"
-
-msgctxt "ServicePage"
-msgid "Please select a Service."
-msgstr "Molimo odaberite Uslugu."
-
-msgctxt "ServicePage"
-msgid "Select Service Directory"
-msgstr "Odaberite Imenik Usluga"
-
-msgctxt "ServicePage"
-msgid "Virtual Port may only contain valid port numbers [1..65535]."
-msgstr "Virtualni Port može sadržavati samo važeće brojeve portova [1..65535]."
-
-msgctxt "ServicePage"
-msgid "Target may only contain address:port, address, or port."
-msgstr "Meta može sadržavati samo adresa:port, adresu, ili port."
-
-msgctxt "ServicePage"
-msgid "Directory already in use by another service."
-msgstr "Imenik već koristi neka druga usluga."
-
-msgctxt "ServicePage"
-msgid "Form"
-msgstr "Formular"
-
-msgctxt "ServicePage"
-msgid "Provided Hidden Services"
-msgstr "Pružene Skrivene Usluge"
-
-msgctxt "ServicePage"
-msgid "Onion Address"
-msgstr "Onion Adresa"
-
-msgctxt "ServicePage"
-msgid "Virtual Port"
-msgstr "Virtualni Port"
-
-msgctxt "ServicePage"
-msgid "Target"
-msgstr "Meta"
-
-msgctxt "ServicePage"
-msgid "Directory Path"
-msgstr "Putanja Imenika"
-
-msgctxt "ServicePage"
-msgid "Enabled"
-msgstr "Omogućeno"
-
-msgctxt "ServicePage"
-msgid "Add new service to list"
-msgstr "Dodaj novu uslugu na popis"
-
-msgctxt "ServicePage"
-msgid "Remove selected service from list"
-msgstr "Ukloni odabranu uslugu sa popisa"
-
-msgctxt "ServicePage"
-msgid "Copy onion address of selected service to clipboard"
-msgstr "Kopiraj onion adresu odabranog servisa u međuspremnik"
-
-msgctxt "ServicePage"
-msgid "Browse in local file system and choose directory for selected service"
-msgstr "Pretražite u lokalnom datotečnom sustavu i odaberite imenik za odabranu uslugu"
-
-msgctxt "ServicePage"
-msgid "Created by Tor"
-msgstr "Stvorio Tor"
-
-msgctxt "StatusEventWidget"
-msgid "Copy to Clipboard"
-msgstr "Kopiraj u Međuspremnik"
-
-msgctxt "StatusEventWidget"
-msgid "The Tor Software is Running"
-msgstr "Tor Software je Pokrenut"
-
-msgctxt "StatusEventWidget"
-msgid "You are currently running version \"%1\" of the Tor software."
-msgstr "Trenutno imate pokrenutu verziju \"%1\" Tor softwarea."
-
-msgctxt "StatusEventWidget"
-msgid "The Tor Software is not Running"
-msgstr "Tor Software nije Pokrenut"
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Click \"Start Tor\" in the Vidalia Control Panel to restart the Tor "
-"software. If Tor exited unexpectedly, select the \"Advanced\" tab above for "
-"details about any errors encountered."
-msgstr "Kliknite \"Pokreni Tor\" u Vidalia Kontrolnoj Ploči za ponovno pokretanje Tor softwarea. Ako je Tor neočekivano izašao, odaberite tab \"Napredno\" za detalje o svim greškama na koje se naišlo."
-
-msgctxt "StatusEventWidget"
-msgid ""
-"You are currently running version \"%1\" of the Tor software, which is no "
-"longer recommended. Please upgrade to the most recent version of the "
-"software, which may contain important security, reliability and performance "
-"fixes."
-msgstr "Trenutno koristite inačicu \"%1\" Tor softwarea, koja se više ne preporuča. Molimo nadogradite na najnoviju inačicu softwarea, koja može sadržavate važne ispravke vezane uz pouzdanost, sigurnost i izvođenje."
-
-msgctxt "StatusEventWidget"
-msgid ""
-"You are currently running version \"%1\" of the Tor software, which may no "
-"longer work with the current Tor network. Please upgrade to the most recent "
-"version of the software, which may contain important security, reliability "
-"and performance fixes."
-msgstr "Trenutno koristite inačicu \"%1\" Tor softwarea, koja možda više ne radi sa trenutnom Tor mrežom. Molimo nadogradite na najnoviju inačicu softwarea, koja može sadržavate važne ispravke vezane uz pouzdanost, sigurnost i izvođenje."
-
-msgctxt "StatusEventWidget"
-msgid "Your Tor Software is Out-of-date"
-msgstr "Vaš Tor Software nije Ažuran"
-
-msgctxt "StatusEventWidget"
-msgid "Connected to the Tor Network"
-msgstr "Spojen na Tor Mrežu"
-
-msgctxt "StatusEventWidget"
-msgid ""
-"We were able to successfully establish a connection to the Tor network. You "
-"can now configure your applications to use the Internet anonymously."
-msgstr "Bili smo u mogućnosti uspješno uspostaviti vezu na Tor mrežu. Sada možete podesiti vaše aplikacije za anonimno korištenje Interneta."
-
-msgctxt "StatusEventWidget"
-msgid "Tor Software Error"
-msgstr "Tor Greška"
-
-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 software je naišao na unutarnju grešku. Molimo prijavite sljedeću grešku Tor developerima na 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 "Tor je uočio da bi sat vašeg računala mogao biti podešen %1 sekundi u prošlost u usporedbi sa izvorom %2. Ako vaš sat nije ispravno podešen, Tor neće moći funkcionirati. Molimo provjerite dali vaše računalo prikazuje ispravno vrijeme."
-
-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 "Tor je uočio da bi sat vašeg računala mogao biti podešen %1 sekundi u budućnost u usporedbi sa izvorom %2. Ako vaš sat nije ispravno podešen, Tor neće moći funkcionirati. Molimo provjerite dali vaše računalo prikazuje ispravno vrijeme."
-
-msgctxt "StatusEventWidget"
-msgid "Your Computer's Clock is Potentially Incorrect"
-msgstr "Vrijeme Vašeg Računala je Moguće Neispravno"
-
-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 "Moguće je da je jedna od aplikacija na vašem računalu pokušala uspostaviti nešifriranu vezu kroz Tor na port %1. Slanje nešifriranih informacija kroz Tor mrežu je opasno i nije preporučeno. Za vašu zaštitu, Tor je automatski zatvorio tu vezu."
-
-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 "Moguće je da je jedna od aplikacija na vašem računalu pokušala uspostaviti nešifriranu vezu kroz Tor na port %1. Slanje nešifriranih informacija kroz Tor mrežu je opasno i nije preporučeno."
-
-msgctxt "StatusEventWidget"
-msgid "Potentially Dangerous Connection!"
-msgstr "Potencijalno Opasna Veza!"
-
-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 "Jedna od aplikacija na vašem računalu uspostavila je vezu kroz Tor prema \"%1\" koristeći protokol koji može ispuštati informacije o vašem odredištu. Molimo uvjerite se da podešavate aplikacije za korištenje SOCKS4a ili SOCKS5 sa udaljenim razlučivanjem imena."
-
-msgctxt "StatusEventWidget"
-msgid "Unknown SOCKS Protocol"
-msgstr "Nepoznati SOCKS Protokol"
-
-msgctxt "StatusEventWidget"
-msgid ""
-"One of your applications tried to establish a connection through Tor using a"
-" protocol that Tor does not understand. Please ensure you configure your "
-"applications to use only SOCKS4a or SOCKS5 with remote hostname resolution."
-msgstr "Jedna od vaših aplikacija pokušala je uspostaviti vezu kroz Tor koristeći protokol koji Tor ne razumije. Molimo uvjerite se da podešavate aplikacije za korištenje SOCKS4a ili SOCKS5 sa udaljenim razlučivanjem imena."
-
-msgctxt "StatusEventWidget"
-msgid "Invalid Destination Hostname"
-msgstr "Neispravni Naziv Odredišnog Poslužitelja"
-
-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 "Jedna od vaših aplikacija pokušala je uspostaviti vezu kroz Tor prema \"%1\", što Tor ne raspoznaje kao ispravan naziv poslužitelja. Molimo provjerite postavke vaše aplikacije."
-
-msgctxt "StatusEventWidget"
-msgid "External IP Address Changed"
-msgstr "Vanjska IP Adresa Promjenjena"
-
-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 je razlučio da je trenutna javna adresa vašeg releja %1%2. Ako to nije ispravno, molimo razmislite o postavljanju opcije 'Adresa' u konfiguraciji vašeg releja."
-
-msgctxt "StatusEventWidget"
-msgid "DNS Hijacking Detected"
-msgstr "Detektirano DNS Otimanje"
-
-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 je detektirao da vaš davatelj DNS usluga daje lažne odgovore za domene koje ne postoje. Neki ISP i drugi davatelji DNS usluga, poput OpenDNS-a, su poznati da to rade kako bi prikazivali svoje vlastite pretraživačke ili reklamne stranice."
-
-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 je detektirao da vaš davatelj DNS usluga daje lažne odgovore za dobro poznate domene. Pošto klijenti ovise o tome da releji daju ispravne DNS odgovore, vaš relej neće biti postavljen kao izlazni relej."
-
-msgctxt "StatusEventWidget"
-msgid "Checking Server Port Reachability"
-msgstr "Provjeravam Dostupnost Porta Poslužitelja"
-
-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 pokušava utvrditi dali je port poslužitelja vašeg releja dostupan kroz Tor mrežu tako da se spaja sam na sebe na %1:%2. Ovaj test bi mogao potrajati nekoliko minuta."
-
-msgctxt "StatusEventWidget"
-msgid "Server Port Reachability Test Successful!"
-msgstr "Test Dostupnosti Porta Poslužitelja Uspješan!"
-
-msgctxt "StatusEventWidget"
-msgid "Your relay's server port is reachable from the Tor network!"
-msgstr "Port poslužitelja vašeg releja je dostupan kroz Tor mrežu!"
-
-msgctxt "StatusEventWidget"
-msgid "Server Port Reachability Test Failed"
-msgstr "Test Dostupnosti Porta Poslužitelja Neuspješan"
-
-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 "Port poslužitelja vašeg releja nije dostupan drugim Tor klijentima. To se može dogoditi ukoliko ste iza rutera ili vatrozida koji zahtjeva podešavanje preusmjeravanja portova. Ako %1:%2 nije vaša ispravna IP adresa i port poslužitelja, molimo provjerite postavke svog releja."
-
-msgctxt "StatusEventWidget"
-msgid "Checking Directory Port Reachability"
-msgstr "Provjeravam Dostupnost Porta Imenika"
-
-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 pokušava utvrditi ako je port imenika vašeg releja dostupan iz Tor mreže spajanjem na samoga sebe na %1:%2. Ovaj test bi mogao potrajati nekoliko minuta."
-
-msgctxt "StatusEventWidget"
-msgid "Directory Port Reachability Test Successful!"
-msgstr "Test Dostupnosti Porta Imenika Uspješan!"
-
-msgctxt "StatusEventWidget"
-msgid "Your relay's directory port is reachable from the Tor network!"
-msgstr "Port imenika vašeg releja je dostupan iz Tor mreže!"
-
-msgctxt "StatusEventWidget"
-msgid "Directory Port Reachability Test Failed"
-msgstr "Test Dostupnosti Porta Imenika Neuspješan"
-
-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 "Port imenika vašeg releja nije dostupan drugim Tor klijentima. To se može dogoditi ukoliko ste iza rutera ili vatrozida koji zahtjeva da postavite preusmjeravanje portova. Ako %1:%2 nije vaša ispravna IP adresa i port imenika, molimo provjerite postavke svog releja."
-
-msgctxt "StatusEventWidget"
-msgid "Relay Descriptor Rejected"
-msgstr "Opis Releja Odbijen"
-
-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 "Opis vašeg releja, koji omogućava klijentima spajanje na vaš relej, je odbijen od strane poslužitelja imenika na %1:%2. Dani razlog je: %3"
-
-msgctxt "StatusEventWidget"
-msgid "Your Relay is Online"
-msgstr "Vaš Relej je Online"
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Your relay is now online and available for Tor clients to use. You should "
-"see an increase in network traffic shown by the Bandwidth Graph within a few"
-" hours as more clients learn about your relay. Thank you for contributing to"
-" the Tor network!"
-msgstr "Vaš relej je sada online i dostupan za korištenje Tor klijentima. Trebali biste vidjeti povećanje mrežnog prometa prikazan Grafom Propusnosti kroz nekoliko sati kako više klijenata sazna za vaš relej. Hvala vam za doprinos Tor mreži!"
-
-msgctxt "Stream"
-msgid "New"
-msgstr "Novo"
-
-msgctxt "Stream"
-msgid "Resolving"
-msgstr "Razlučujem"
-
-msgctxt "Stream"
-msgid "Connecting"
-msgstr "Spajanje"
-
-msgctxt "Stream"
-msgid "Open"
-msgstr "Otvori"
-
-msgctxt "Stream"
-msgid "Failed"
-msgstr "Neuspješno"
-
-msgctxt "Stream"
-msgid "Closed"
-msgstr "Zatvoreno"
-
-msgctxt "Stream"
-msgid "Retrying"
-msgstr "Pokušavam ponovno"
-
-msgctxt "Stream"
-msgid "Remapped"
-msgstr "Premapiran"
-
-msgctxt "Stream"
-msgid "Unknown"
-msgstr "Nepoznato"
-
-msgctxt "TorProcess"
-msgid "Process %1 failed to stop. [%2]"
-msgstr "Proces %1 nije uspješno zaustavljen. [%2]"
-
-msgctxt "TorService"
-msgid "The Tor service is not installed."
-msgstr "Tor usloga nije instalirana."
-
-msgctxt "TorService"
-msgid "Unable to start the Tor service."
-msgstr "Nije bilo moguće pokrenuti Tor uslugu."
-
-msgctxt "TorSettings"
-msgid "Failed to hash the control password."
-msgstr "Neuspješno hashanje kontrolne lozinke."
-
-msgctxt "TorrcDialog"
-msgid "Editing torrc"
-msgstr "Izmjenjivanje torrc"
-
-msgctxt "TorrcDialog"
-msgid ""
-"Save settings. If unchecked it will only apply settings to the current Tor "
-"instance."
-msgstr "Spremi postavke. Ako nije odabrano, primjeniti će postavke samo na trentnu instancu Tora."
-
-msgctxt "TorrcDialog"
-msgid "Cut"
-msgstr "Izreži"
-
-msgctxt "TorrcDialog"
-msgid "Copy"
-msgstr "Kopiraj"
-
-msgctxt "TorrcDialog"
-msgid "Paste"
-msgstr "Zalijepi"
-
-msgctxt "TorrcDialog"
-msgid "Undo"
-msgstr "Poništi"
-
-msgctxt "TorrcDialog"
-msgid "Redo"
-msgstr "Ponovi"
-
-msgctxt "TorrcDialog"
-msgid "Select All"
-msgstr "Odaberi Sve"
-
-msgctxt "TorrcDialog"
-msgid "Apply all"
-msgstr "Primjeni Sve"
-
-msgctxt "TorrcDialog"
-msgid "Apply selection only"
-msgstr "Primjeni samo odabrano"
-
-msgctxt "TorrcDialog"
-msgid "Error connecting to Tor"
-msgstr "Greška pri spajanju na Tor"
-
-msgctxt "TorrcDialog"
-msgid "Selection is empty. Please select some text, or check \"Apply all\""
-msgstr "Selekcija je prazna. Molimo odaberite neki tekst, ili označite \"Primjeni sve\""
-
-msgctxt "TorrcDialog"
-msgid "Error at line %1: \"%2\""
-msgstr "Greška u liniji %1: \"%2\""
-
-msgctxt "TorrcDialog"
-msgid "Error"
-msgstr "Greška"
-
-msgctxt "TorrcDialog"
-msgid "An error ocurred while opening torrc file"
-msgstr "Greška se pojavila pri otvaranju torrc datoteke"
-
-msgctxt "UPNPControl"
-msgid "Success"
-msgstr "Uspjeh"
-
-msgctxt "UPNPControl"
-msgid "No UPnP-enabled devices found"
-msgstr "Nije pronađen niti jedan UPnP-omogućen uređaj"
-
-msgctxt "UPNPControl"
-msgid "No valid UPnP-enabled Internet gateway devices found"
-msgstr "Nije pronađen niti jedan UPnP-omogućen gateway uređaj"
-
-msgctxt "UPNPControl"
-msgid "WSAStartup failed"
-msgstr "WSAStartup neuspješan"
-
-msgctxt "UPNPControl"
-msgid "Failed to add a port mapping"
-msgstr "Neuspješno dodavanje port mape"
-
-msgctxt "UPNPControl"
-msgid "Failed to retrieve a port mapping"
-msgstr "Neuspješno dohvaćanje port mape"
-
-msgctxt "UPNPControl"
-msgid "Failed to remove a port mapping"
-msgstr "Neuspješno uklanjanje port mape"
-
-msgctxt "UPNPControl"
-msgid "Unknown error"
-msgstr "Nepoznata greška"
-
-msgctxt "UPNPTestDialog"
-msgid "Discovering UPnP-enabled devices"
-msgstr "Otkrivam UPnP-omogućene uređaje"
-
-msgctxt "UPNPTestDialog"
-msgid "Updating directory port mapping"
-msgstr "Ažuriram port mapu imenika"
-
-msgctxt "UPNPTestDialog"
-msgid "Updating relay port mapping"
-msgstr "Ažuriram port mapu releja"
-
-msgctxt "UPNPTestDialog"
-msgid "Test completed successfully!"
-msgstr "Test je uspješno završen!"
-
-msgctxt "UPNPTestDialog"
-msgid "Testing UPnP Support"
-msgstr "Testiranje UPnP Podrške"
-
-msgctxt "UPNPTestDialog"
-msgid "Testing Universal Plug & Play Support"
-msgstr "Testiram Universal Plug & Play Podršku"
-
-msgctxt "UpdateProcess"
-msgid ""
-"Vidalia was unable to check for available software updates because it could "
-"not find '%1'."
-msgstr "Vidalia nije bila u mogućnosti provjeriti za dostupna ažuriranja softwarea jer nije mogla pronaći '%1'."
-
-msgctxt "UpdateProcess"
-msgid ""
-"Vidalia was unable to check for available software updates because Tor's "
-"update process exited unexpectedly."
-msgstr "Vidalia nije bila u mogućnosti provjeriti za dostupna ažuriranja softwarea jer je Torov proces za ažuriranje neočekivano završio."
-
-msgctxt "UpdateProgressDialog"
-msgid "Checking for available updates..."
-msgstr "Provjeravam za dostupna ažuriranja..."
-
-msgctxt "UpdateProgressDialog"
-msgid "Hide"
-msgstr "Sakrij"
-
-msgctxt "UpdateProgressDialog"
-msgid "Downloading updates..."
-msgstr "Preuzimam ažuriranja..."
-
-msgctxt "UpdateProgressDialog"
-msgid "Installing updated software..."
-msgstr "Instaliram ažurirani software..."
-
-msgctxt "UpdateProgressDialog"
-msgid "Done! Your software is now up to date."
-msgstr "Gotovo! Vaš software je sada ažuran."
-
-msgctxt "UpdateProgressDialog"
-msgid "OK"
-msgstr "U redu"
-
-msgctxt "UpdateProgressDialog"
-msgid "Software Updates"
-msgstr "Ažuriranje Softwarea"
-
-msgctxt "UpdateProgressDialog"
-msgid "Checking for updates..."
-msgstr "Provjeravam za ažuriranja..."
-
-msgctxt "UpdateProgressDialog"
-msgid "Cancel"
-msgstr "Odustani"
-
-msgctxt "UpdatesAvailableDialog"
-msgid "Software Updates Available"
-msgstr "Ažuriranja Softwarea Dostupna"
-
-msgctxt "UpdatesAvailableDialog"
-msgid "Remind Me Later"
-msgstr "Podsjeti Me Kasnije"
-
-msgctxt "UpdatesAvailableDialog"
-msgid "Install"
-msgstr "Instaliraj"
-
-msgctxt "UpdatesAvailableDialog"
-msgid "The following updated software packages are ready for installation:"
-msgstr "Sljedeći ažurirani softwareski paketi su spremni za instalaciju:"
-
-msgctxt "UpdatesAvailableDialog"
-msgid "Package"
-msgstr "Paket"
-
-msgctxt "UpdatesAvailableDialog"
-msgid "Version"
-msgstr "Inačica"
-
-msgctxt "VMessageBox"
-msgid "OK"
-msgstr "U redu"
-
-msgctxt "VMessageBox"
-msgid "Cancel"
-msgstr "Odustani"
-
-msgctxt "VMessageBox"
-msgid "Yes"
-msgstr "Da"
-
-msgctxt "VMessageBox"
-msgid "No"
-msgstr "Ne"
-
-msgctxt "VMessageBox"
-msgid "Help"
-msgstr "Pomoć"
-
-msgctxt "VMessageBox"
-msgid "Retry"
-msgstr "Ponovni pokušaj"
-
-msgctxt "VMessageBox"
-msgid "Show Log"
-msgstr "Prikaži Dnevnik"
-
-msgctxt "VMessageBox"
-msgid "Show Settings"
-msgstr "Prikaži Postavke"
-
-msgctxt "VMessageBox"
-msgid "Continue"
-msgstr "Nastavi"
-
-msgctxt "VMessageBox"
-msgid "Quit"
-msgstr "Napusti"
-
-msgctxt "VMessageBox"
-msgid "Browse"
-msgstr "Pretraži"
-
-msgctxt "Vidalia"
-msgid "Invalid Argument"
-msgstr "Neispravan Argument"
-
-msgctxt "Vidalia"
-msgid "Vidalia is already running"
-msgstr "Vidalia je već pokrenuta"
-
-msgctxt "Vidalia"
-msgid "Displays this usage message and exits."
-msgstr "Prikazuje ovu poruku korištenja i izlazi."
-
-msgctxt "Vidalia"
-msgid "Resets ALL stored Vidalia settings."
-msgstr "Resetira SVE spremljene postavke Vidalie."
-
-msgctxt "Vidalia"
-msgid "Sets the directory Vidalia uses for data files."
-msgstr "Postavlja mapu koju Vidalia koristi za podatkovne datoteke."
-
-msgctxt "Vidalia"
-msgid "Sets the name and location of Vidalia's pidfile."
-msgstr "Postavlja naziv i lokaciju pid datoteke Vidalie."
-
-msgctxt "Vidalia"
-msgid "Sets the name and location of Vidalia's logfile."
-msgstr "Postavlja naziv i lokaciju datoteke dnevnika Vidalie."
-
-msgctxt "Vidalia"
-msgid "Sets the verbosity of Vidalia's logging."
-msgstr "Postavlja detaljnost imenika Vidalie."
-
-msgctxt "Vidalia"
-msgid "Sets Vidalia's interface style."
-msgstr "Postavlja stil sučelja Vidalie."
-
-msgctxt "Vidalia"
-msgid "Sets Vidalia's language."
-msgstr "Postavlja jezik Vidalie."
-
-msgctxt "Vidalia"
-msgid "Vidalia Usage Information"
-msgstr "Informacije Korištenja Vidalie"
-
-msgctxt "Vidalia"
-msgid "Unable to open log file '%1': %2"
-msgstr "Nije bilo moguće otvoriti datoteku dnevnika '%1': %2"
-
-msgctxt "Vidalia"
-msgid "Value required for parameter :"
-msgstr "Vrijednost potrebna za parametar :"
-
-msgctxt "Vidalia"
-msgid "Invalid language code specified:"
-msgstr "Specificiran neispravan kod jezika:"
-
-msgctxt "Vidalia"
-msgid "Invalid GUI style specified:"
-msgstr "Specificiran neispravan stil GUIa:"
-
-msgctxt "Vidalia"
-msgid "Invalid log level specified:"
-msgstr "Specificiran neispravan nivo zapisa dnevnika:"
-
-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 "Moguće je da je drugi proces Vidalie već pokrenut. Ako stvarno postoji drugi proces Vidalie koji je pokrenut, možete odabrati svejedno nastaviti.\n\nŽelite li nastaviti s pokretanjem Vidalie?"
-
-msgctxt "stringutil.h"
-msgid "%1 secs"
-msgstr "%1 sekundi"
-
-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 dana"
-
-msgctxt "stringutil.h"
-msgid "%1 hours"
-msgstr "%1 sati"
-
-msgctxt "stringutil.h"
-msgid "%1 mins"
-msgstr "%1 minuta"
diff --git a/src/vidalia/i18n/po/ht/qt_ht.po b/src/vidalia/i18n/po/ht/qt_ht.po
index 3dc8064..6de105d 100644
--- a/src/vidalia/i18n/po/ht/qt_ht.po
+++ b/src/vidalia/i18n/po/ht/qt_ht.po
@@ -1,11 +1,10 @@
#
-# Translators:
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-08-20 03:25+0000\n"
-"PO-Revision-Date: 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"
@@ -431,5 +430,3 @@ msgstr ""
msgctxt "QFileSystemModel"
msgid "%1 bytes"
msgstr ""
-
-
diff --git a/src/vidalia/i18n/po/ht/vidalia_ht.po b/src/vidalia/i18n/po/ht/vidalia_ht.po
index 741370e..d42081d 100644
--- a/src/vidalia/i18n/po/ht/vidalia_ht.po
+++ b/src/vidalia/i18n/po/ht/vidalia_ht.po
@@ -1,11 +1,10 @@
#
-# Translators:
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-09-07 14:40+0000\n"
-"PO-Revision-Date: 2010-12-05 20:03+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"
@@ -193,10 +192,6 @@ 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"
@@ -236,10 +231,6 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr ""
-
-msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -279,6 +270,10 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr ""
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -432,17 +427,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"
@@ -1266,44 +1270,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"
@@ -1331,10 +1342,6 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr ""
-
-msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1362,6 +1369,10 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr ""
+
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1644,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 ""
@@ -1680,10 +1663,6 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1796,10 +1775,6 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1882,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 ""
@@ -1934,82 +1897,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 ""
@@ -2057,19 +1949,39 @@ 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)"
+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"
@@ -2091,17 +2003,35 @@ msgid ""
msgstr ""
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"
@@ -2357,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"
@@ -2412,10 +2334,6 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2515,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 ""
@@ -2840,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 ""
@@ -3088,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 ""
@@ -3132,10 +3070,6 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
-msgid "Form"
-msgstr ""
-
-msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3424,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 ""
@@ -3460,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 ""
@@ -3538,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 ""
@@ -3666,6 +3646,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 ""
@@ -3759,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 ""
@@ -3812,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 2c5d775..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:
-# 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: 2012-02-14 09: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"
@@ -202,7 +199,7 @@ msgctxt "QFileDialog"
msgid ""
"%1 already exists.\n"
"Do you want to replace it?"
-msgstr "%1 már létezik.\nSzeretné felülírni?"
+msgstr ""
#: qfiledialog.cpp:1690
msgctxt "QFileDialog"
@@ -210,7 +207,7 @@ msgid ""
"%1\n"
"File not found.\n"
"Please verify the correct file name was given."
-msgstr "%1\nFájl nem található.\nKérjük ellenőrizze, hogy helyes fájlnevet adott-e meg."
+msgstr ""
#: qdirmodel.cpp:833
msgctxt "QFileDialog"
@@ -268,14 +265,14 @@ msgid ""
"%1\n"
"Directory not found.\n"
"Please verify the correct directory name was given."
-msgstr "%1\nKönyvtár nem található.\nKérjük ellenőrizze, hogy helyes könyvtárnevet adott-e meg."
+msgstr ""
#: qfiledialog.cpp:2281
msgctxt "QFileDialog"
msgid ""
"'%1' is write protected.\n"
"Do you want to delete it anyway?"
-msgstr "'%1' írásvédett.\nBiztos hogy ennek ellenére törölni akarja?"
+msgstr ""
#: qfiledialog.cpp:2286
msgctxt "QFileDialog"
@@ -325,7 +322,7 @@ msgstr "Mutasd"
#: ui_qfiledialog.h:269
msgctxt "QFileDialog"
msgid "Forward"
-msgstr "Előre"
+msgstr "Elõre"
#: qfiledialog.cpp:2137
msgctxt "QFileDialog"
@@ -372,7 +369,9 @@ msgctxt "QFileSystemModel"
msgid ""
"<b>The name \"%1\" can not be used.</b><p>Try using another name, with fewer"
" characters or no punctuations marks."
-msgstr "<b>A \"%1\" név nem használható.</b><p>Próbálja kevesebb karakterrel, vagy speciális karakterek nélkül."
+msgstr ""
+"<b>A \"%1\" név nem használható.</b><p>Próbálja kevesebb karakterrel, vagy "
+"speciális karakterek nélkül."
#: qfilesystemmodel.cpp:832
msgctxt "QFileSystemModel"
diff --git a/src/vidalia/i18n/po/hu/vidalia_hu.po b/src/vidalia/i18n/po/hu/vidalia_hu.po
index d6de25d..1493527 100644
--- a/src/vidalia/i18n/po/hu/vidalia_hu.po
+++ b/src/vidalia/i18n/po/hu/vidalia_hu.po
@@ -1,13 +1,13 @@
#
# Translators:
# runasand <runa.sandvik at gmail.com>, 2011.
-# <viktor.varga at gmail.com>, 2011, 2012.
+# <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: 2012-03-21 17:52+0000\n"
-"PO-Revision-Date: 2012-04-06 09:28+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"
@@ -195,17 +195,6 @@ 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 ""
-"You've checked the autoconfiguration option for the ControlPort, but "
-"provided no Data Directory. Please add one, or uncheck the \"Configure "
-"ControlPort automatically\" option."
-msgstr "Bekapcsolta az automatikus beállítását a Vezérlőportnak, de nem adott meg Adat könyvtárat.Kérem adjon meg egyet, vagy kapcsolja ki a \"A vezérlőport automatikus beállítása\" opciót."
-
-msgctxt "AdvancedPage"
msgid ""
"Vidalia was unable to remove the Tor service.\n"
"\n"
@@ -232,23 +221,6 @@ msgctxt "AppearancePage"
msgid "Vidalia was unable to load the selected language translation."
msgstr "Nem sikerült a választott nyelvi fordítás betöltése."
-msgctxt "AppearancePage"
-msgid ""
-"System Icon Preferences (changes will take effect when you restart Vidalia)"
-msgstr "Rendszer ikon beállítások (a Vidalia újraindításával változnak)"
-
-msgctxt "AppearancePage"
-msgid "Show the Tray Icon and Dock Icon (default)"
-msgstr "A Tálca és Dokkoló ikonok megjelenítése (alapértelmezett)"
-
-msgctxt "AppearancePage"
-msgid "Hide the Tray Icon"
-msgstr "Tálca ikon elrejtése"
-
-msgctxt "AppearancePage"
-msgid "Hide the Dock Icon"
-msgstr "Dokkoló ikon elrejtése"
-
msgctxt "BandwidthGraph"
msgid "Since:"
msgstr "Ekkortól:"
@@ -262,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"
@@ -305,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..."
@@ -458,18 +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 ""
+"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 "Remember my password"
-msgstr "Emlékezzen a jelszavamra"
+msgid ""
+"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 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:"
+"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."
@@ -1292,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"
@@ -1309,28 +1308,17 @@ msgid ""
"manually."
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)"
@@ -1346,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"
@@ -1357,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"
@@ -1388,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"
@@ -1670,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"
@@ -1706,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"
@@ -1774,6 +1730,10 @@ msgid "Connected to the Tor network!"
msgstr "Kapcsolódva a Tor hálózathoz! "
msgctxt "MainWindow"
+msgid "Unrecognized startup status"
+msgstr "Felismerhetetlen indítási státusz"
+
+msgctxt "MainWindow"
msgid "miscellaneous"
msgstr "egyebek"
@@ -1818,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"
@@ -1901,19 +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"
@@ -1956,79 +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 ""
@@ -2063,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"
@@ -2079,53 +1952,44 @@ 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."
msgctxt "MainWindow"
-msgid "Bootstrapping torrc from %1 to %2"
-msgstr "Rendszertőltő torrc a %1 -től %2 -ig"
+msgid "toolBar"
+msgstr "eszköztár"
msgctxt "MainWindow"
-msgid "(probably Telnet)"
-msgstr "(valószínűleg Telnet)"
+msgid "Start"
+msgstr "Indítás"
msgctxt "MainWindow"
-msgid "(probably an email client)"
-msgstr "(valószínűleg egy email kliens)"
+msgid "Stop"
+msgstr "Leállítás"
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."
+msgid "Restart"
+msgstr "Újraindítás"
msgctxt "MainWindow"
-msgid "failed (%1)"
-msgstr "sikertelen (%1)"
+msgid "Reload Tor's config"
+msgstr "A Tor konfiguráció újratöltése"
msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
-msgstr "Az Elosztó leáll.\nKattintson újra 'Stop'-ra az azonnali leállításhoz."
+msgid "Actions"
+msgstr "Események"
msgctxt "MainWindow"
-msgid ""
-"Vidalia can't find out how to talk to Tor because it can't access this file: %1\n"
-"\n"
-"Here's the last error message:\n"
-"%2"
-msgstr "A Vidalia nem tudja kideríteni, hogyan kommunikáljon a Tor-ral, mert nem fér hozzá ehhez a fájlhoz: %1\n\nAz utolsó hibaüzenet:\n%2"
-
-msgctxt "MainWindow"
-msgid ""
-"It seems Tor has stopped running since Vidalia started it.\n"
-"\n"
-"See the Advanced Message Log for more information."
-msgstr "Úgy tűnik, a Tor leállt, mióta a Vidalia el lett indítva.\n\nTekintse meg a Részletes rendszernaplót a további információkért."
+msgid "Bootstrapping torrc from %1 to %2"
+msgstr "Rendszertőltő torrc a %1 -től %2 -ig"
msgctxt "MainWindow"
msgid ""
@@ -2141,6 +2005,38 @@ msgid ""
"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\nKérjük tekintse meg a log üzeneteket az aktuális hibaüzenetekért."
+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 "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 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 ""
+"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"
msgstr "Hiba a szűrő beállításakor"
@@ -2394,22 +2290,14 @@ 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."
@@ -2449,10 +2337,6 @@ msgid ""
msgstr "Nem írható az állomány: %1\n\n%2."
msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr "Tor hálózati térkép"
-
-msgctxt "NetViewer"
msgid "Refresh"
msgstr "Frissítés"
@@ -2552,6 +2436,30 @@ 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"
+
+msgctxt "NetworkPage"
+msgid "The specified bridge identifier is not valid."
+msgstr "A megadott Hídkapcsolat azonosító érvénytelen."
+
msgctxt "NetworkPage"
msgid "Copy (Ctrl+C)"
msgstr "Másolás (Ctrl+C)"
@@ -2578,7 +2486,7 @@ msgstr "Tegye be a pipát, ha a helyi hálózata proxy-t igényel az Internethez
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"
@@ -2685,12 +2593,12 @@ msgid "SOCKS 5"
msgstr "SOCKS 5"
msgctxt "NetworkPage"
-msgid "HTTP / HTTPS"
-msgstr "HTTP / HTTPS"
+msgid "HTTP"
+msgstr "HTTP"
msgctxt "NetworkPage"
-msgid "You must specify one or more bridges."
-msgstr "Meg kell adnia egy vagy több hidat."
+msgid "HTTP / HTTPS"
+msgstr "HTTP / HTTPS"
msgctxt "Policy"
msgid "accept"
@@ -2978,7 +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"
@@ -3110,15 +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 for the Tor network (exit relay)"
-msgstr "A forgalom Tor hálózathoz történő elosztása (kilépő-elosztó)"
+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 inside the Tor network (non-exit relay)"
-msgstr "A forgalom Tor hálózaton belüli elosztása (nem kilépő-elosztó)"
+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"
@@ -3165,10 +3073,6 @@ 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"
@@ -3273,7 +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 ""
@@ -3455,7 +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"
@@ -3493,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]"
@@ -3571,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"
@@ -3699,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"
@@ -3792,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:"
diff --git a/src/vidalia/i18n/po/hy/qt_hy.po b/src/vidalia/i18n/po/hy/qt_hy.po
index 7231c6f..6de81fe 100644
--- a/src/vidalia/i18n/po/hy/qt_hy.po
+++ b/src/vidalia/i18n/po/hy/qt_hy.po
@@ -1,11 +1,10 @@
#
-# Translators:
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-08-20 03:25+0000\n"
-"PO-Revision-Date: 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"
@@ -431,5 +430,3 @@ msgstr ""
msgctxt "QFileSystemModel"
msgid "%1 bytes"
msgstr ""
-
-
diff --git a/src/vidalia/i18n/po/hy/vidalia_hy.po b/src/vidalia/i18n/po/hy/vidalia_hy.po
index 57a8cf1..22b0f4e 100644
--- a/src/vidalia/i18n/po/hy/vidalia_hy.po
+++ b/src/vidalia/i18n/po/hy/vidalia_hy.po
@@ -1,18 +1,15 @@
-#
-# Translators:
+#, fuzzy
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: 2010-12-05 20:03+0000\n"
-"Last-Translator: \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: 2009-05-19 23:56+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
+"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: hy\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
"X-Generator: Vidalia ts2po 0.2\n"
msgctxt "AboutDialog"
@@ -35,13 +32,28 @@ msgctxt "AboutDialog"
msgid "Qt 4.4.2"
msgstr ""
+msgctxt "AboutDialog"
+msgid "Vidalia"
+msgstr ""
+
+msgctxt "AboutDialog"
+msgid "Tor"
+msgstr ""
+
+msgctxt "AboutDialog"
+msgid "Qt"
+msgstr ""
+
+msgctxt "AboutDialog"
+msgid "version"
+msgstr ""
+
msgctxt "AdvancedPage"
msgid "'%1' is not a valid IP address."
msgstr ""
msgctxt "AdvancedPage"
-msgid ""
-"You selected 'Password' authentication, but did not specify a password."
+msgid "You selected 'Password' authentication, but did not specify a password."
msgstr ""
msgctxt "AdvancedPage"
@@ -81,6 +93,10 @@ msgid "Vidalia was unable to install the Tor service."
msgstr ""
msgctxt "AdvancedPage"
+msgid "Control Port"
+msgstr ""
+
+msgctxt "AdvancedPage"
msgid "Authentication:"
msgstr ""
@@ -137,68 +153,7 @@ msgid "Select the directory used to store data for the Tor software"
msgstr ""
msgctxt "AdvancedPage"
-msgid "Tor Control"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "Use TCP connection (ControlPort)"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "Path:"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "Use Unix domain socket (ControlSocket)"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "Edit current torrc"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "NOTE: this will edit the currently loaded torrc"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "ControlSocket path doesn't exist."
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid ""
-"The specified Tor configuration file location contains characters that "
-"cannot be represented in your system's current 8-bit character encoding."
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid ""
-"The specified Tor data directory location contains characters that cannot be"
-" represented in your system's current 8-bit character encoding."
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "Warning"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "You changed torrc path, would you like to restart Tor?"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "Tor Configuration File (torrc);;All Files (*)"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "Select a file to use for Tor socket path"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "Configure ControlPort automatically"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid ""
-"Vidalia was unable to remove the Tor service.\n"
+msgid "Vidalia was unable to remove the Tor service.\n"
"\n"
"You may need to remove it manually."
msgstr ""
@@ -440,9 +395,7 @@ msgid "Remember my password"
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid ""
-"Vidalia has connected to a running Tor process that requires a password. "
-"Please enter your control password:"
+msgid "Vidalia has connected to a running Tor process that requires a password. Please enter your control password:"
msgstr ""
msgctxt "ControlSocket"
@@ -1158,10 +1111,6 @@ msgid "Zimbabwe"
msgstr ""
msgctxt "CountryInfo"
-msgid "Zaire"
-msgstr ""
-
-msgctxt "CountryInfo"
msgid "Albania"
msgstr ""
@@ -1257,55 +1206,6 @@ msgctxt "CountryInfo"
msgid "Taiwan"
msgstr ""
-msgctxt "CrashReportDialog"
-msgid "Submit a Crash Report"
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid "Vidalia encountered an error and needed to close"
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid "Restart Vidalia"
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid "Don't Restart"
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid "Unable to restart Vidalia"
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid ""
-"We were unable to automatically restart Vidalia. Please restart Vidalia "
-"manually."
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid "Please fill a ticket in:"
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid ""
-"<a "
-"href=\"https://trac.torproject.org/projects/tor/newticket\">https://trac.torproject.org/projects/tor/newticket</a>"
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid ""
-"A crash report has been created that you can send to the Vidalia developers "
-"to help identify and fix the problem. The submitted report does not contain "
-"any personally identifying information."
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid ""
-"with a description of what you were doing before the application crashed, "
-"along with the following files corresponding to the crash report:"
-msgstr ""
-
msgctxt "GeneralPage"
msgid "Executables (*.exe)"
msgstr ""
@@ -1323,6 +1223,10 @@ msgid "You must specify the name of your Tor executable."
msgstr ""
msgctxt "GeneralPage"
+msgid "The proxy arguments specified are not properly formatted."
+msgstr ""
+
+msgctxt "GeneralPage"
msgid "Start Vidalia when my system starts"
msgstr ""
@@ -1519,10 +1423,7 @@ msgid "Opening External Link"
msgstr ""
msgctxt "HelpTextBrowser"
-msgid ""
-"Vidalia can open the link you selected in your default Web browser. If your "
-"browser is not currently configured to use Tor then the request will not be "
-"anonymous."
+msgid "Vidalia can open the link you selected in your default Web browser. If your browser is not currently configured to use Tor then the request will not be anonymous."
msgstr ""
msgctxt "HelpTextBrowser"
@@ -1534,9 +1435,7 @@ msgid "Unable to Open Link"
msgstr ""
msgctxt "HelpTextBrowser"
-msgid ""
-"Vidalia was unable to open the selected link in your Web browser. You can "
-"still copy the URL and paste it into your browser."
+msgid "Vidalia was unable to open the selected link in your Web browser. You can still copy the URL and paste it into your browser."
msgstr ""
msgctxt "HelpTextBrowser"
@@ -1579,30 +1478,6 @@ msgctxt "LogEvent"
msgid "Unknown"
msgstr ""
-msgctxt "LogTreeItem"
-msgid "Debug"
-msgstr ""
-
-msgctxt "LogTreeItem"
-msgid "Info"
-msgstr ""
-
-msgctxt "LogTreeItem"
-msgid "Notice"
-msgstr ""
-
-msgctxt "LogTreeItem"
-msgid "Warning"
-msgstr ""
-
-msgctxt "LogTreeItem"
-msgid "Error"
-msgstr ""
-
-msgctxt "LogTreeItem"
-msgid "Unknown"
-msgstr ""
-
msgctxt "MainWindow"
msgid "Start Tor"
msgstr ""
@@ -1816,9 +1691,7 @@ msgid "Error Starting Tor"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Vidalia was unable to start Tor. Check your settings to ensure the correct "
-"name and location of your Tor executable is specified."
+msgid "Vidalia was unable to start Tor. Check your settings to ensure the correct name and location of your Tor executable is specified."
msgstr ""
msgctxt "MainWindow"
@@ -1854,9 +1727,7 @@ msgid "Cookie Authentication Required"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"The Tor software requires Vidalia to send the contents of an authentication "
-"cookie, but Vidalia was unable to find one."
+msgid "The Tor software requires Vidalia to send the contents of an authentication cookie, but Vidalia was unable to find one."
msgstr ""
msgctxt "MainWindow"
@@ -1876,9 +1747,7 @@ msgid "Error Registering for Events"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Vidalia was unable to register for some events. Many of Vidalia's features "
-"may be unavailable."
+msgid "Vidalia was unable to register for some events. Many of Vidalia's features may be unavailable."
msgstr ""
msgctxt "MainWindow"
@@ -1898,9 +1767,7 @@ msgid "Tor Update Available"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended. Please visit the Tor website to download the latest version."
+msgid "The currently installed version of Tor is out of date or no longer recommended. Please visit the Tor website to download the latest version."
msgstr ""
msgctxt "MainWindow"
@@ -1908,9 +1775,7 @@ msgid "Tor website: %1"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"All subsequent connections will appear to be different than your old "
-"connections."
+msgid "All subsequent connections will appear to be different than your old connections."
msgstr ""
msgctxt "MainWindow"
@@ -2002,21 +1867,15 @@ msgid "Password Reset Failed"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Vidalia tried to reset Tor's control password, but was not able to restart "
-"the Tor software. Please check your Task Manager to ensure there are no "
-"other Tor processes running."
+msgid "Vidalia tried to reset Tor's control password, but was not able to restart the Tor software. Please check your Task Manager to ensure there are no other Tor processes running."
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended."
+msgid "The currently installed version of Tor is out of date or no longer recommended."
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Would you like to check if a newer package is available for installation?"
+msgid "Would you like to check if a newer package is available for installation?"
msgstr ""
msgctxt "MainWindow"
@@ -2024,9 +1883,11 @@ msgid "Potentially Unsafe Connection"
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 ""
msgctxt "MainWindow"
@@ -2038,9 +1899,7 @@ msgid "Your software is up to date"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"There are no new Tor software packages available for your computer at this "
-"time."
+msgid "There are no new Tor software packages available for your computer at this time."
msgstr ""
msgctxt "MainWindow"
@@ -2056,52 +1915,52 @@ msgid "The following error occurred:"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Anything sent over this connection could be monitored. Please check your "
-"application's configuration and use only encrypted protocols, such as SSL, "
-"if possible."
-msgstr ""
-
-msgctxt "MainWindow"
msgid "failed (%1)"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
+msgid "Your relay is shutting down.\n"
"Click 'Stop' again to stop your relay now."
msgstr ""
msgctxt "MainWindow"
-msgid "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 ""
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 ""
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 ""
+
+msgctxt "MainWindow"
+msgid "File"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "About Vidalia"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Home"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Check For Updates"
msgstr ""
msgctxt "MessageLog"
@@ -2345,68 +2204,50 @@ 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"
+msgid "Always Save New Log Messages"
msgstr ""
msgctxt "MessageLog"
-msgid "Tor Status"
+msgid "Browse"
msgstr ""
msgctxt "MessageLog"
-msgid "Advanced"
+msgid "Enable automatically saving all new log messages to a file"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
+msgid "Automatically save new log messages to a file"
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 ""
msgctxt "MessageLog"
-msgid ""
-"Messages that only appear when \n"
+msgid "Messages that only appear when \n"
"something has gone wrong with Tor."
msgstr ""
msgctxt "MessageLog"
-msgid ""
-"Messages that appear infrequently \n"
+msgid "Messages that appear infrequently \n"
"during normal Tor operation and are \n"
"not considered errors, but you may \n"
"care about."
msgstr ""
msgctxt "MessageLog"
-msgid ""
-"Messages that appear frequently \n"
+msgid "Messages that appear frequently \n"
"during normal Tor operation."
msgstr ""
msgctxt "MessageLog"
-msgid ""
-"Hyper-verbose messages primarily of \n"
+msgid "Hyper-verbose messages primarily of \n"
"interest to Tor developers."
msgstr ""
msgctxt "MessageLog"
-msgid ""
-"Cannot write file %1\n"
+msgid "Cannot write file %1\n"
"\n"
"%2."
msgstr ""
@@ -2528,15 +2369,11 @@ msgid "Copy (Ctrl+C)"
msgstr ""
msgctxt "NetworkPage"
-msgid ""
-"You must specify both an IP address or hostname and a port number to "
-"configure Tor to use a proxy to access the Internet."
+msgid "You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet."
msgstr ""
msgctxt "NetworkPage"
-msgid ""
-"You must specify one or more ports to which your firewall allows you to "
-"connect."
+msgid "You must specify one or more ports to which your firewall allows you to connect."
msgstr ""
msgctxt "NetworkPage"
@@ -2556,10 +2393,18 @@ msgid "Proxy Settings"
msgstr ""
msgctxt "NetworkPage"
+msgid "HTTP Proxy:"
+msgstr ""
+
+msgctxt "NetworkPage"
msgid "Username:"
msgstr ""
msgctxt "NetworkPage"
+msgid "Use this proxy for HTTPS also"
+msgstr ""
+
+msgctxt "NetworkPage"
msgid "Password:"
msgstr ""
@@ -2588,9 +2433,7 @@ msgid "80, 443"
msgstr ""
msgctxt "NetworkPage"
-msgid ""
-"Check to encrypt directory requests and, optionally, use bridge relays to "
-"access the Tor network"
+msgid "Check to encrypt directory requests and, optionally, use bridge relays to access the Tor network"
msgstr ""
msgctxt "NetworkPage"
@@ -2602,10 +2445,18 @@ msgid "Bridge Settings"
msgstr ""
msgctxt "NetworkPage"
+msgid "The Tor software you are currently running does not support bridges. <br>Directory connections will still be encrypted."
+msgstr ""
+
+msgctxt "NetworkPage"
msgid "Add a Bridge:"
msgstr ""
msgctxt "NetworkPage"
+msgid "<a href=\"bridges.finding\">How do I find a bridge?</a>"
+msgstr ""
+
+msgctxt "NetworkPage"
msgid "Remove the selected bridges from the list"
msgstr ""
@@ -2626,43 +2477,13 @@ msgid "<a href=\"bridges.finding\">How can I find bridges?</a>"
msgstr ""
msgctxt "NetworkPage"
-msgid ""
-"No new bridges are currently available. You can either wait a while and try "
-"again, or try another method of finding new bridges."
+msgid "No new bridges are currently available. You can either wait a while and try again, or try another method of finding new bridges."
msgstr ""
msgctxt "NetworkPage"
msgid "Click Help to see other methods of finding new bridges."
msgstr ""
-msgctxt "NetworkPage"
-msgid "Address:"
-msgstr ""
-
-msgctxt "NetworkPage"
-msgid "Type:"
-msgstr ""
-
-msgctxt "NetworkPage"
-msgid "You must select the proxy type."
-msgstr ""
-
-msgctxt "NetworkPage"
-msgid "SOCKS 4"
-msgstr ""
-
-msgctxt "NetworkPage"
-msgid "SOCKS 5"
-msgstr ""
-
-msgctxt "NetworkPage"
-msgid "HTTP"
-msgstr ""
-
-msgctxt "NetworkPage"
-msgid "HTTP / HTTPS"
-msgstr ""
-
msgctxt "Policy"
msgid "accept"
msgstr ""
@@ -2816,15 +2637,11 @@ msgid "Bridge Support Unavailable"
msgstr ""
msgctxt "ServerPage"
-msgid ""
-"You have configured Tor to act as a bridge relay for censored users, but "
-"your version of Tor does not support bridges."
+msgid "You have configured Tor to act as a bridge relay for censored users, but your version of Tor does not support bridges."
msgstr ""
msgctxt "ServerPage"
-msgid ""
-"Please upgrade your Tor software or configure Tor to act as a normal Tor "
-"relay."
+msgid "Please upgrade your Tor software or configure Tor to act as a normal Tor relay."
msgstr ""
msgctxt "ServerPage"
@@ -2892,9 +2709,7 @@ msgid "Basic Settings"
msgstr ""
msgctxt "ServerPage"
-msgid ""
-"For Internet connections with fast download speed but slow upload, please "
-"list your upload speed here."
+msgid "For Internet connections with fast download speed but slow upload, please list your upload speed here."
msgstr ""
msgctxt "ServerPage"
@@ -2950,9 +2765,7 @@ msgid "Peak bandwidth rate limit"
msgstr ""
msgctxt "ServerPage"
-msgid ""
-"Your maximum bandwidth rate must be greater than or equal to your average "
-"bandwidth rate. Both values must be at least 20 KB/s."
+msgid "Your maximum bandwidth rate must be greater than or equal to your average bandwidth rate. Both values must be at least 20 KB/s."
msgstr ""
msgctxt "ServerPage"
@@ -3012,14 +2825,11 @@ msgid "Show help topic on exit policies"
msgstr ""
msgctxt "ServerPage"
-msgid ""
-"What Internet resources should users be able to access from your relay?"
+msgid "What Internet resources should users be able to access from your relay?"
msgstr ""
msgctxt "ServerPage"
-msgid ""
-"Tor will still block some outgoing mail and file sharing applications by "
-"default to reduce spam and other abuse."
+msgid "Tor will still block some outgoing mail and file sharing applications by default to reduce spam and other abuse."
msgstr ""
msgctxt "ServerPage"
@@ -3031,8 +2841,7 @@ msgid "Let others access your bridge by giving them this line:"
msgstr ""
msgctxt "ServerPage"
-msgid ""
-"This is the identity of your bridge relay that you can give to other people"
+msgid "This is the identity of your bridge relay that you can give to other people"
msgstr ""
msgctxt "ServerPage"
@@ -3048,9 +2857,7 @@ msgid "No clients have used your relay recently."
msgstr ""
msgctxt "ServerPage"
-msgid ""
-"Leave your relay running so clients have a better chance of finding and "
-"using it."
+msgid "Leave your relay running so clients have a better chance of finding and using it."
msgstr ""
msgctxt "ServerPage"
@@ -3062,9 +2869,7 @@ msgid "Vidalia was unable to retrieve your bridge's usage history."
msgstr ""
msgctxt "ServerPage"
-msgid ""
-"Tor returned an improperly formatted response when Vidalia requested your "
-"bridge's usage history."
+msgid "Tor returned an improperly formatted response when Vidalia requested your bridge's usage history."
msgstr ""
msgctxt "ServerPage"
@@ -3080,20 +2885,11 @@ msgid "<a href=\"#bridgeUsage\">Who has used my bridge?</a>"
msgstr ""
msgctxt "ServerPage"
-msgid "<a href=\"#bridgeHelp\">What's this?</a>"
-msgstr ""
-
-msgctxt "ServerPage"
-msgid "Automatically distribute my bridge address"
-msgstr ""
-
-msgctxt "ServerPage"
msgid "Mirror the Relay Directory"
msgstr ""
msgctxt "ServerPage"
-msgid ""
-"Email address at which you may be reached if there is a\n"
+msgid "Email address at which you may be reached if there is a\n"
"problem with your relay. You might also include your PGP or GPG fingerprint."
msgstr ""
@@ -3102,9 +2898,7 @@ msgid "Error while trying to unpublish all services"
msgstr ""
msgctxt "ServicePage"
-msgid ""
-"Please configure at least a service directory and a virtual port for each "
-"service you want to save. Remove the other ones."
+msgid "Please configure at least a service directory and a virtual port for each service you want to save. Remove the other ones."
msgstr ""
msgctxt "ServicePage"
@@ -3179,251 +2973,6 @@ msgctxt "ServicePage"
msgid "Created by Tor"
msgstr ""
-msgctxt "StatusEventWidget"
-msgid "Copy to Clipboard"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "The Tor Software is Running"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "You are currently running version \"%1\" of the Tor software."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "The Tor Software is not Running"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Click \"Start Tor\" in the Vidalia Control Panel to restart the Tor "
-"software. If Tor exited unexpectedly, select the \"Advanced\" tab above for "
-"details about any errors encountered."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"You are currently running version \"%1\" of the Tor software, which is no "
-"longer recommended. Please upgrade to the most recent version of the "
-"software, which may contain important security, reliability and performance "
-"fixes."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"You are currently running version \"%1\" of the Tor software, which may no "
-"longer work with the current Tor network. Please upgrade to the most recent "
-"version of the software, which may contain important security, reliability "
-"and performance fixes."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Your Tor Software is Out-of-date"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Connected to the Tor Network"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"We were able to successfully establish a connection to the Tor network. You "
-"can now configure your applications to use the Internet anonymously."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Tor Software Error"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"The Tor software encountered an internal bug. Please report the following "
-"error message to the Tor developers at bugs.torproject.org: \"%1\""
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Tor has determined that your computer's clock may be set to %1 seconds in "
-"the past compared to the source \"%2\". If your clock is not correct, Tor "
-"will not be able to function. Please verify your computer displays the "
-"correct time."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Tor has determined that your computer's clock may be set to %1 seconds in "
-"the future compared to the source \"%2\". If your clock is not correct, Tor "
-"will not be able to function. Please verify your computer displays the "
-"correct time."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Your Computer's Clock is Potentially Incorrect"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"One of the applications on your computer may have attempted to make an "
-"unencrypted connection through Tor to port %1. Sending unencrypted "
-"information over the Tor network is dangerous and not recommended. For your "
-"protection, Tor has automatically closed this connection."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"One of the applications on your computer may have attempted to make an "
-"unencrypted connection through Tor to port %1. Sending unencrypted "
-"information over the Tor network is dangerous and not recommended."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Potentially Dangerous Connection!"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"One of your applications established a connection through Tor to \"%1\" "
-"using a protocol that may leak information about your destination. Please "
-"ensure you configure your applications to use only SOCKS4a or SOCKS5 with "
-"remote hostname resolution."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Unknown SOCKS Protocol"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"One of your applications tried to establish a connection through Tor using a"
-" protocol that Tor does not understand. Please ensure you configure your "
-"applications to use only SOCKS4a or SOCKS5 with remote hostname resolution."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Invalid Destination Hostname"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"One of your applications tried to establish a connection through Tor to "
-"\"%1\", which Tor does not recognize as a valid hostname. Please check your "
-"application's configuration."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "External IP Address Changed"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Tor has determined your relay's public IP address is currently %1%2. If that"
-" is not correct, please consider setting the 'Address' option in your "
-"relay's configuration."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "DNS Hijacking Detected"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Tor detected that your DNS provider is providing false responses for domains"
-" that do not exist. Some ISPs and other DNS providers, such as OpenDNS, are "
-"known to do this in order to display their own search or advertising pages."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Tor detected that your DNS provider is providing false responses for well "
-"known domains. Since clients rely on Tor network relays to provide accurate "
-"DNS repsonses, your relay will not be configured as an exit relay."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Checking Server Port Reachability"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Tor is trying to determine if your relay's server port is reachable from the"
-" Tor network by connecting to itself at %1:%2. This test could take several "
-"minutes."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Server Port Reachability Test Successful!"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Your relay's server port is reachable from the Tor network!"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Server Port Reachability Test Failed"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Your relay's server port is not reachable by other Tor clients. This can "
-"happen if you are behind a router or firewall that requires you to set up "
-"port forwarding. If %1:%2 is not your correct IP address and server port, "
-"please check your relay's configuration."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Checking Directory Port Reachability"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Tor is trying to determine if your relay's directory port is reachable from "
-"the Tor network by connecting to itself at %1:%2. This test could take "
-"several minutes."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Directory Port Reachability Test Successful!"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Your relay's directory port is reachable from the Tor network!"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Directory Port Reachability Test Failed"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Your relay's directory port is not reachable by other Tor clients. This can "
-"happen if you are behind a router or firewall that requires you to set up "
-"port forwarding. If %1:%2 is not your correct IP address and directory port,"
-" please check your relay's configuration."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Relay Descriptor Rejected"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Your relay's descriptor, which enables clients to connect to your relay, was"
-" rejected by the directory server at %1:%2. The reason given was: %3"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Your Relay is Online"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Your relay is now online and available for Tor clients to use. You should "
-"see an increase in network traffic shown by the Bandwidth Graph within a few"
-" hours as more clients learn about your relay. Thank you for contributing to"
-" the Tor network!"
-msgstr ""
-
msgctxt "Stream"
msgid "New"
msgstr ""
@@ -3476,68 +3025,6 @@ msgctxt "TorSettings"
msgid "Failed to hash the control password."
msgstr ""
-msgctxt "TorrcDialog"
-msgid "Editing torrc"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid ""
-"Save settings. If unchecked it will only apply settings to the current Tor "
-"instance."
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Cut"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Copy"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Paste"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Undo"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Redo"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Select All"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Apply all"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Apply selection only"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Error connecting to Tor"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Selection is empty. Please select some text, or check \"Apply all\""
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Error at line %1: \"%2\""
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Error"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "An error ocurred while opening torrc file"
-msgstr ""
-
msgctxt "UPNPControl"
msgid "Success"
msgstr ""
@@ -3595,15 +3082,11 @@ msgid "Testing Universal Plug & Play Support"
msgstr ""
msgctxt "UpdateProcess"
-msgid ""
-"Vidalia was unable to check for available software updates because it could "
-"not find '%1'."
+msgid "Vidalia was unable to check for available software updates because it could not find '%1'."
msgstr ""
msgctxt "UpdateProcess"
-msgid ""
-"Vidalia was unable to check for available software updates because Tor's "
-"update process exited unexpectedly."
+msgid "Vidalia was unable to check for available software updates because Tor's update process exited unexpectedly."
msgstr ""
msgctxt "UpdateProgressDialog"
@@ -3759,10 +3242,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 ""
@@ -3775,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 ""
@@ -3812,5 +3290,3 @@ msgstr ""
msgctxt "stringutil.h"
msgid "%1 mins"
msgstr ""
-
-
diff --git a/src/vidalia/i18n/po/id/qt_id.po b/src/vidalia/i18n/po/id/qt_id.po
index 70fc514..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:
-# 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"
@@ -201,7 +199,9 @@ msgctxt "QFileDialog"
msgid ""
"%1 already exists.\n"
"Do you want to replace it?"
-msgstr "%1 telah ada.\nAnda ingin menggantinya?"
+msgstr ""
+"%1 telah ada.\n"
+"Anda ingin menggantinya?"
#: qfiledialog.cpp:1690
msgctxt "QFileDialog"
@@ -209,7 +209,10 @@ msgid ""
"%1\n"
"File not found.\n"
"Please verify the correct file name was given."
-msgstr "%1\nFile tidak ditemukan.\nMohon verifikasi nama file yang diberikan."
+msgstr ""
+"%1\n"
+"File tidak ditemukan.\n"
+"Mohon verifikasi nama file yang diberikan."
#: qdirmodel.cpp:833
msgctxt "QFileDialog"
@@ -267,14 +270,19 @@ msgid ""
"%1\n"
"Directory not found.\n"
"Please verify the correct directory name was given."
-msgstr "51\nDirektori tidak ditemukan.\nMohon verifikasi nama direktori."
+msgstr ""
+"51\n"
+"Direktori tidak ditemukan.\n"
+"Mohon verifikasi nama direktori."
#: qfiledialog.cpp:2281
msgctxt "QFileDialog"
msgid ""
"'%1' is write protected.\n"
"Do you want to delete it anyway?"
-msgstr "'%1' diproteksi.\nAnda ingin menghapusnya?"
+msgstr ""
+"'%1' diproteksi.\n"
+"Anda ingin menghapusnya?"
#: qfiledialog.cpp:2286
msgctxt "QFileDialog"
@@ -371,7 +379,9 @@ msgctxt "QFileSystemModel"
msgid ""
"<b>The name \"%1\" can not be used.</b><p>Try using another name, with fewer"
" characters or no punctuations marks."
-msgstr "<b> nama \"%1\" tidak dapat digunakan.</b><p>Coba gunakan nama lain, dengan karakter yang lebih sedikit atau tanpa tanda baca.</p>"
+msgstr ""
+"<b> nama \"%1\" tidak dapat digunakan.</b><p>Coba gunakan nama lain, dengan "
+"karakter yang lebih sedikit atau tanpa tanda baca.</p>"
#: qfilesystemmodel.cpp:832
msgctxt "QFileSystemModel"
diff --git a/src/vidalia/i18n/po/id/vidalia_id.po b/src/vidalia/i18n/po/id/vidalia_id.po
index def376e..9725f5a 100755
--- a/src/vidalia/i18n/po/id/vidalia_id.po
+++ b/src/vidalia/i18n/po/id/vidalia_id.po
@@ -1,16 +1,13 @@
#
# Translators:
-# daweng <thedaweng at yahoo.com>, 2011.
-# <deni.komputer at gmail.com>, 2012.
# runasand <runa.sandvik at gmail.com>, 2011.
-# <thedaweng at yahoo.com>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2012-03-21 17:52+0000\n"
-"PO-Revision-Date: 2012-03-23 07:03+0000\n"
-"Last-Translator: lukman <deni.komputer at gmail.com>\n"
+"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"
@@ -29,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."
@@ -142,69 +139,58 @@ 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."
+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 "Lokasi direktori data Tor yang ditentukan berisi karakter yang tidak dapat diwakili dalam pengkodean karakter saat sistem anda 8-bit."
+msgstr ""
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 "Konfigurasi otomatis Port Kendali"
-
-msgctxt "AdvancedPage"
-msgid ""
-"You've checked the autoconfiguration option for the ControlPort, but "
-"provided no Data Directory. Please add one, or uncheck the \"Configure "
-"ControlPort automatically\" option."
msgstr ""
msgctxt "AdvancedPage"
@@ -212,7 +198,7 @@ msgid ""
"Vidalia was unable to remove the Tor service.\n"
"\n"
"You may need to remove it manually."
-msgstr "Vidalia tidak dapat menghapus layanan Tor. Anda mungkin perlu menghapus secara manual."
+msgstr ""
msgctxt "AppearancePage"
msgid "Language"
@@ -234,23 +220,6 @@ msgctxt "AppearancePage"
msgid "Vidalia was unable to load the selected language translation."
msgstr "Vidalia tidak bisa memuat bahasa yang dipilih."
-msgctxt "AppearancePage"
-msgid ""
-"System Icon Preferences (changes will take effect when you restart Vidalia)"
-msgstr ""
-
-msgctxt "AppearancePage"
-msgid "Show the Tray Icon and Dock Icon (default)"
-msgstr ""
-
-msgctxt "AppearancePage"
-msgid "Hide the Tray Icon"
-msgstr ""
-
-msgctxt "AppearancePage"
-msgid "Hide the Dock Icon"
-msgstr ""
-
msgctxt "BandwidthGraph"
msgid "Since:"
msgstr "Sejak:"
@@ -264,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"
@@ -307,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"
@@ -365,7 +334,7 @@ msgstr "Buka"
msgctxt "Circuit"
msgid "Building"
-msgstr "Bangunan"
+msgstr "Building"
msgctxt "Circuit"
msgid "Failed"
@@ -460,18 +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:"
-msgstr "Vidalia telah tersambung ke Tor proses berjalan yang membutuhkan password. Silakan masukkan sandi kendali Anda:"
+"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."
@@ -491,848 +469,855 @@ 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"
+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 "Restart Vidalia"
+msgstr ""
msgctxt "CrashReportDialog"
msgid "Don't Restart"
-msgstr "Jangan Restart"
+msgstr ""
msgctxt "CrashReportDialog"
msgid "Unable to restart Vidalia"
-msgstr "Tidak dapat me-restart Vidalia"
+msgstr ""
msgctxt "CrashReportDialog"
msgid ""
"We were unable to automatically restart Vidalia. Please restart Vidalia "
"manually."
-msgstr "Kami tidak dapat secara otomatis restart Vidalia. Silahkan restart Vidalia secara manual."
-
-msgctxt "CrashReportDialog"
-msgid "Please fill a ticket in:"
-msgstr "Mohon isi tiket masuk:"
+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 "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."
-msgstr "Laporan error telah dibuat yang dapat anda kirimkan ke developer Vidalia untuk membantu mengidentifikasi dan memperbaiki permasalahan. Laporan yang dikirim tidak berisi informasi dan biodata pribadi."
+msgctxt "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:"
-msgstr "dengan deskripsi dari apa yang sedang anda lakukan sebelum aplikasi error, bersama dengan file yang terkait dengan laporan error:"
+msgctxt "CrashReportUploader"
+msgid "Receiving response..."
+msgstr ""
msgctxt "GeneralPage"
msgid "Executables (*.exe)"
@@ -1356,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"
@@ -1380,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"
@@ -1408,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."
@@ -1540,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"
@@ -1569,7 +1554,7 @@ msgstr "Vidalia tidak bisa membuka tautan yang dipilih pada browser Anda. Anda d
msgctxt "HelpTextBrowser"
msgid "Error opening help file:"
-msgstr "Error membuka file bantuan:"
+msgstr ""
msgctxt "LicenseDialog"
msgid "License Information"
@@ -1609,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"
@@ -1672,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"
@@ -1708,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"
@@ -1776,6 +1729,10 @@ msgid "Connected to the Tor network!"
msgstr "Telah terhubung ke jaringan Tor"
msgctxt "MainWindow"
+msgid "Unrecognized startup status"
+msgstr "Status startup tidak dikenal"
+
+msgctxt "MainWindow"
msgid "miscellaneous"
msgstr "aneka"
@@ -1820,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"
@@ -1859,274 +1812,182 @@ 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."
+msgstr ""
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."
+msgstr ""
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."
+msgstr ""
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."
+msgstr ""
msgctxt "MainWindow"
msgid ""
"The currently installed version of Tor is out of date or no longer "
"recommended."
-msgstr "Versi saat ini terinstal Tor ketinggalan zaman atau tidak lagi dianjurkan."
+msgstr ""
msgctxt "MainWindow"
msgid ""
"Would you like to check if a newer package is available for installation?"
-msgstr "Apakah Anda ingin memeriksa apakah paket baru tersedia untuk instalasi?"
+msgstr ""
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."
+msgstr ""
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 ""
"Anything sent over this connection could be monitored. Please check your "
"application's configuration and use only encrypted protocols, such as SSL, "
"if possible."
-msgstr "Segala yang dikirim melalui koneksi ini bisa dipantau. Mohon periksa konfigurasi aplikasi Anda dan hanya menggunakan protokol terenkripsi, seperti SSL, jika memungkinkan."
-
-msgctxt "MainWindow"
-msgid "Bootstrapping torrc from %1 to %2"
-msgstr "Bootstrapping torrc from %1 to %2"
+msgstr ""
msgctxt "MainWindow"
-msgid "(probably Telnet)"
-msgstr "(kemungkinan Telnet)"
+msgid "toolBar"
+msgstr ""
msgctxt "MainWindow"
-msgid "(probably an email client)"
-msgstr "(kemungkinan email client)"
+msgid "Start"
+msgstr ""
msgctxt "MainWindow"
-msgid ""
-"One of your applications %1 appears to be making a potentially unencrypted "
-"and unsafe connection to port %2."
-msgstr "Salah satu dari aplikasi anda %1 tampaknya tidak ter-enskripsi dan menggunakan koneksi yang tidak aman ke port %2"
+msgid "Stop"
+msgstr ""
msgctxt "MainWindow"
-msgid "failed (%1)"
-msgstr "gagal (%1)"
+msgid "Restart"
+msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
-msgstr "relay Anda munutup. Klik 'Stop' lagi untuk menghentikan relay Anda sekarang."
+msgid "Reload Tor's config"
+msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Vidalia can't find out how to talk to Tor because it can't access this file: %1\n"
-"\n"
-"Here's the last error message:\n"
-"%2"
+msgid "Actions"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"It seems Tor has stopped running since Vidalia started it.\n"
-"\n"
-"See the Advanced Message Log for more information."
+msgid "Bootstrapping torrc from %1 to %2"
msgstr ""
msgctxt "MainWindow"
@@ -2134,294 +1995,318 @@ msgid ""
"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
"\n"
"Would you like to shutdown gracefully and give clients time to find a new relay?"
-msgstr "Anda sedang menjalankan relay. Mengakhiri relay Anda akan mengganggu koneksi buka dari klien. Apakah Anda ingin matikan secara sopan dan memberikan klien waktu untuk mencari relay baru?"
+msgstr ""
msgctxt "MainWindow"
msgid ""
"Vidalia detected that the Tor software exited unexpectedly.\n"
"\n"
"Please check the message log for recent warning or error messages."
-msgstr "Vidalia mendeteksi bahwa perangkat lunak Tor keluar tak terduga. Silakan memeriksa log pesan untuk peringatan terbaru atau pesan kesalahan."
+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 ""
+
+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 "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."
+msgstr ""
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."
+msgstr ""
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 ""
@@ -2429,813 +2314,829 @@ msgid ""
"during normal Tor operation and are \n"
"not considered errors, but you may \n"
"care about."
-msgstr "Pesan yang muncul jarang selama operasi Tor normal dan tidak dianggap sebagai kesalahan, tetapi Anda mungkin peduli."
+msgstr ""
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 ""
"Cannot write file %1\n"
"\n"
"%2."
-msgstr "Tidak dapat menulis file %1\n\n%2."
-
-msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr "Tor Peta Jaringan"
+msgstr ""
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 ""
+
+msgctxt "NetworkPage"
+msgid "The specified bridge identifier is not 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."
+msgstr ""
msgctxt "NetworkPage"
msgid ""
"You must specify one or more ports to which your firewall allows you to "
"connect."
-msgstr "Anda harus menentukan satu atau lebih port yang diizinkan firewall Anda untuk terhubung."
+msgstr ""
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"
+msgstr ""
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"
+msgstr ""
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"
+msgstr ""
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>"
+msgstr ""
msgctxt "NetworkPage"
msgid "<a href=\"bridges.finding\">How can I find bridges?</a>"
-msgstr "<a href=\"bridges.finding\">Bagaimana saya dapat menemukan penghubung?</a>"
+msgstr ""
msgctxt "NetworkPage"
msgid ""
"No new bridges are currently available. You can either wait a while and try "
"again, or try another method of finding new bridges."
-msgstr "Tidak ada penghubung baru yang saat ini tersedia. Anda dapat menunggu beberapa saat lalu coba lagi, atau mencoba metode lain untuk menemukan penghubung baru."
+msgstr ""
msgctxt "NetworkPage"
msgid "Click Help to see other methods of finding new bridges."
-msgstr "Klik Bantuan untuk melihat metode lain untuk menemukan penghubung baru."
+msgstr ""
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 / HTTPS"
-msgstr "HTTP / HTTPS"
+msgid "HTTP"
+msgstr ""
msgctxt "NetworkPage"
-msgid "You must specify one or more bridges."
+msgid "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."
+msgstr ""
msgctxt "ServerPage"
msgid ""
"Please upgrade your Tor software or configure Tor to act as a normal Tor "
"relay."
-msgstr "Silakan meng-upgrade perangkat lunak atau mengkonfigurasi Tor untuk bertindak sebagai relay Tor normal."
+msgstr ""
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"
+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"
+msgstr ""
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."
+msgstr ""
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."
+msgstr ""
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?"
+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 masih akan memblokir beberapa surat keluar dan file berbagi aplikasi secara default untuk mengurangi spam dan penyalahgunaan lainnya."
+msgstr ""
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:"
+msgstr ""
msgctxt "ServerPage"
msgid ""
"This is the identity of your bridge relay that you can give to other people"
-msgstr "Ini adalah identitas relay penghubung yang dapat Anda berikan kepada orang lain"
+msgstr ""
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."
+msgstr ""
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."
+msgstr ""
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>"
+msgstr ""
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 for the Tor network (exit relay)"
+msgid "Relay traffic inside the Tor network (non-exit relay)"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic inside the Tor network (non-exit relay)"
+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."
+msgstr ""
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."
+msgstr ""
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"
+msgstr ""
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 ""
"Click \"Start Tor\" in the Vidalia Control Panel to restart the Tor "
"software. If Tor exited unexpectedly, select the \"Advanced\" tab above for "
"details about any errors encountered."
-msgstr "Klik \"Start Tor\" di Vidalia Control Panel untuk me-restart perangkat lunak Tor. Jika Tor keluar tak terduga, pilih \"Advanced\" tab di atas untuk rincian tentang kesalahan apapun yang dihadapi."
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
@@ -3243,7 +3144,7 @@ msgid ""
"longer recommended. Please upgrade to the most recent version of the "
"software, which may contain important security, reliability and performance "
"fixes."
-msgstr "Anda sedang menjalankan versi \"%1\" dari perangkat lunak Tor, yang tidak lagi dianjurkan. Silakan upgrade ke versi terbaru yang mungkin berisi keamanan, kehandalan dan perbaikan kinerja yang lebih baik."
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
@@ -3251,31 +3152,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 "Anda sedang menjalankan versi \"%1\" dari perangkat lunak Tor, yang mungkin tidak lagi bekerja dengan jaringan Tor saat ini. Silakan upgrade ke versi terbaru dari perangkat lunak, yang mungkin berisi keamanan , kehandalan dan perbaikan kinerja yang lebih baik."
+msgstr ""
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."
+msgstr ""
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"
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
@@ -3283,7 +3184,7 @@ msgid ""
"the past compared to the source \"%2\". If your clock is not correct, Tor "
"will not be able to function. Please verify your computer displays the "
"correct time."
-msgstr "Tor telah menetapkan bahwa jam komputer Anda mungkin diatur ke %1 detik di masa lalu dibandingkan dengan sumber \"%2\". Jika jam Anda tidak benar, Tor tidak akan dapat berfungsi. Harap verifikasi komputer Anda menampilkan waktu yang tepat."
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
@@ -3291,11 +3192,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 telah menetapkan bahwa jam komputer Anda mungkin diatur ke %1 detik di masa depan dibandingkan dengan sumber \"%2\". Jika jam Anda tidak benar, Tor tidak akan dapat berfungsi. Harap verifikasi komputer Anda menampilkan waktu yang tepat."
+msgstr ""
msgctxt "StatusEventWidget"
msgid "Your Computer's Clock is Potentially Incorrect"
-msgstr "Jam Komputer Anda adalah Berpotensi Salah"
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
@@ -3303,18 +3204,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 "Salah satu aplikasi pada komputer Anda mungkin telah berusaha untuk membuat koneksi tidak terenkripsi melalui port Tor ke %1. Mengirim informasi enkripsi melalui jaringan Tor yang berbahaya dan tidak dianjurkan. Untuk perlindungan anda, Tor secara otomatis menutup koneksi ini."
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
"One of the applications on your computer may have attempted to make an "
"unencrypted connection through Tor to port %1. Sending unencrypted "
"information over the Tor network is dangerous and not recommended."
-msgstr "Salah satu aplikasi pada komputer Anda mungkin telah berusaha untuk membuat koneksi tidak terenkripsi melalui port Tor ke %1. Mengirim informasi enkripsi melalui jaringan Tor yang berbahaya dan tidak dianjurkan."
+msgstr ""
msgctxt "StatusEventWidget"
msgid "Potentially Dangerous Connection!"
-msgstr "Berpotensi Koneksi Berbahaya !"
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
@@ -3322,81 +3223,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 "Salah satu aplikasi Anda membentuk koneksi melalui Tor untuk \"%1\" menggunakan sebuah protokol yang dapat bocor informasi tentang tujuan Anda. Pastikan Anda mengkonfigurasi aplikasi Anda untuk menggunakan hanya SOCKS4a atau SOCKS5 dengan resolusi hostname remote."
+msgstr ""
msgctxt "StatusEventWidget"
msgid "Unknown SOCKS Protocol"
-msgstr "Unknown SOCKS Protokol"
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
"One of your applications tried to establish a connection through Tor using a"
" protocol that Tor does not understand. Please ensure you configure your "
"applications to use only SOCKS4a or SOCKS5 with remote hostname resolution."
-msgstr "Salah satu aplikasi Anda mencoba untuk membuat sambungan melalui Tor menggunakan protokol yang Tor tidak mengerti. Pastikan Anda mengkonfigurasi aplikasi Anda untuk menggunakan hanya SOCKS4a atau SOCKS5 dengan resolusi hostname remote."
+msgstr ""
msgctxt "StatusEventWidget"
msgid "Invalid Destination Hostname"
-msgstr "Hostname Tujuan tidak valid "
+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 "Salah satu aplikasi Anda mencoba untuk membuat koneksi melalui Tor untuk \"%1\", yang Tor tidak mengakui sebagai nama host yang valid. Silakan periksa konfigurasi aplikasi Anda."
+msgstr ""
msgctxt "StatusEventWidget"
msgid "External IP Address Changed"
-msgstr "Eksternal IP Address Berubah"
+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 telah menetapkan alamat publik IP relay anda saat ini %1%2. Jika itu tidak benar, silakan mempertimbangkan pengaturan opsi 'Alamat' pada konfigurasi relay Anda."
+msgstr ""
msgctxt "StatusEventWidget"
msgid "DNS Hijacking Detected"
-msgstr "Pembajakan DNS Terdeteksi"
+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 "Tor mendeteksi bahwa Anda penyedia DNS adalah memberikan tanggapan palsu untuk domain yang tidak ada. Beberapa ISP dan lainnya DNS penyedia, seperti OpenDNS, diketahui untuk melakukan ini dalam rangka untuk menampilkan pencarian mereka sendiri atau halaman iklan."
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
"Tor detected that your DNS provider is providing false responses for well "
"known domains. Since clients rely on Tor network relays to provide accurate "
"DNS repsonses, your relay will not be configured as an exit relay."
-msgstr "Tor mendeteksi bahwa Anda penyedia DNS adalah memberikan tanggapan palsu untuk domain terkenal. Karena klien mengandalkan jaringan Tor relay untuk memberikan repsonses akurat DNS, relay Anda tidak akan dikonfigurasi sebagai relay keluar."
+msgstr ""
msgctxt "StatusEventWidget"
msgid "Checking Server Port Reachability"
-msgstr "Memeriksa jangkauan Port Server"
+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 sedang mencoba untuk menentukan apakah port server relay anda dapat dicapai dari jaringan Tor dengan menghubungkan ke dirinya sendiri di %1:%2. Tes ini bisa memakan waktu beberapa menit."
+msgstr ""
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 ""
@@ -3404,30 +3305,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 "port server relay Anda adalah tidak dapat dicapai oleh klien Tor lainnya. Hal ini dapat terjadi jika Anda berada di belakang router atau firewall yang mengharuskan Anda untuk mengatur port forwarding. Jika %1:%2 tidak benar alamat IP dan port server, periksa konfigurasi relay Anda."
+msgstr ""
msgctxt "StatusEventWidget"
msgid "Checking Directory Port Reachability"
-msgstr "Memeriksa jangkauan Port Direktori"
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
"Tor is trying to determine if your relay's directory port is reachable from "
"the Tor network by connecting to itself at %1:%2. This test could take "
"several minutes."
-msgstr "Tor sedang mencoba untuk menentukan apakah port direktori relay Anda dapat dicapai dari jaringan Tor dengan menghubungkan ke dirinya sendiri di %1:%2. Tes ini bisa memakan waktu beberapa menit."
+msgstr ""
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 ""
@@ -3435,21 +3336,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 "Direktori port relay Anda adalah tidak dapat dicapai oleh klien Tor lainnya. Hal ini dapat terjadi jika Anda berada di belakang router atau firewall yang mengharuskan Anda untuk mengatur port forwarding. Jika %1:%2 tidak benar alamat IP dan port direktori, periksa konfigurasi relay Anda."
+msgstr ""
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"
+msgstr ""
msgctxt "StatusEventWidget"
msgid "Your Relay is Online"
-msgstr "Relay Anda Online"
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
@@ -3457,393 +3358,443 @@ msgid ""
"see an increase in network traffic shown by the Bandwidth Graph within a few"
" hours as more clients learn about your relay. Thank you for contributing to"
" the Tor network!"
-msgstr "relay Anda sekarang online dan tersedia untuk Tor klien untuk digunakan. Anda akan melihat peningkatan lalu lintas jaringan yang ditampilkan oleh Grafik Bandwidth dalam beberapa jam sebagai klien lebih belajar tentang relay Anda. Terima kasih atas kontribusi ke jaringan Tor!"
+msgstr ""
+
+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."
+msgstr ""
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\""
+msgstr ""
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'."
+msgstr ""
msgctxt "UpdateProcess"
msgid ""
"Vidalia was unable to check for available software updates because Tor's "
"update process exited unexpectedly."
-msgstr "Vidalia tidak mampu untuk memeriksa pembaruan perangkat lunak yang tersedia karena proses update Tor tertutup secara tak terduga."
+msgstr ""
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 "Nilai yang dibutuhkan untuk 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 ""
"Another Vidalia process is possibly already running. If there really is not another Vidalia process running, you can choose to continue anyway.\n"
"\n"
"Would you like to continue starting Vidalia?"
-msgstr "Proses lain Vidalia ini mungkin sudah berjalan. Jika tidak benar ada proses lain Vidalia berjalan, Anda dapat memilih untuk melanjutkan pula. Apakah Anda ingin melanjutkan mulai Vidalia?"
+msgstr ""
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/qt_is.po b/src/vidalia/i18n/po/is/qt_is.po
index 40f520f..9a8b15a 100644
--- a/src/vidalia/i18n/po/is/qt_is.po
+++ b/src/vidalia/i18n/po/is/qt_is.po
@@ -1,11 +1,10 @@
#
-# Translators:
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-08-20 03:25+0000\n"
-"PO-Revision-Date: 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"
@@ -431,5 +430,3 @@ msgstr ""
msgctxt "QFileSystemModel"
msgid "%1 bytes"
msgstr ""
-
-
diff --git a/src/vidalia/i18n/po/is/vidalia_is.po b/src/vidalia/i18n/po/is/vidalia_is.po
index 6e13a97..fbef7a8 100755
--- a/src/vidalia/i18n/po/is/vidalia_is.po
+++ b/src/vidalia/i18n/po/is/vidalia_is.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: 2012-03-21 17:52+0000\n"
-"PO-Revision-Date: 2012-03-22 08:51+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"
@@ -194,17 +194,6 @@ msgid "Select a file to use for Tor socket path"
msgstr ""
msgctxt "AdvancedPage"
-msgid "Configure ControlPort automatically"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid ""
-"You've checked the autoconfiguration option for the ControlPort, but "
-"provided no Data Directory. Please add one, or uncheck the \"Configure "
-"ControlPort automatically\" option."
-msgstr ""
-
-msgctxt "AdvancedPage"
msgid ""
"Vidalia was unable to remove the Tor service.\n"
"\n"
@@ -231,23 +220,6 @@ msgctxt "AppearancePage"
msgid "Vidalia was unable to load the selected language translation."
msgstr "Vidalia tókst ekki að hlaða inn valdri þýðingu."
-msgctxt "AppearancePage"
-msgid ""
-"System Icon Preferences (changes will take effect when you restart Vidalia)"
-msgstr ""
-
-msgctxt "AppearancePage"
-msgid "Show the Tray Icon and Dock Icon (default)"
-msgstr ""
-
-msgctxt "AppearancePage"
-msgid "Hide the Tray Icon"
-msgstr ""
-
-msgctxt "AppearancePage"
-msgid "Hide the Dock Icon"
-msgstr ""
-
msgctxt "BandwidthGraph"
msgid "Since:"
msgstr "Síðan:"
@@ -261,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"
@@ -304,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 ""
@@ -457,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 "Remember my password"
-msgstr "Muna lykilorðið mitt"
+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"
@@ -1291,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"
@@ -1356,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"
@@ -1387,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"
@@ -1669,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"
@@ -1705,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"
@@ -1773,6 +1729,10 @@ msgid "Connected to the Tor network!"
msgstr ""
msgctxt "MainWindow"
+msgid "Unrecognized startup status"
+msgstr ""
+
+msgctxt "MainWindow"
msgid "miscellaneous"
msgstr ""
@@ -1817,10 +1777,6 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1903,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 ""
@@ -1955,82 +1899,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 ""
@@ -2078,66 +1951,89 @@ 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 "Bootstrapping torrc from %1 to %2"
+msgid "toolBar"
msgstr ""
msgctxt "MainWindow"
-msgid "(probably Telnet)"
+msgid "Start"
msgstr ""
msgctxt "MainWindow"
-msgid "(probably an email client)"
+msgid "Stop"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"One of your applications %1 appears to be making a potentially unencrypted "
-"and unsafe connection to port %2."
+msgid "Restart"
msgstr ""
msgctxt "MainWindow"
-msgid "failed (%1)"
+msgid "Reload Tor's config"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+msgid "Actions"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Bootstrapping torrc from %1 to %2"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia can't find out how to talk to Tor because it can't access this file: %1\n"
+"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
"\n"
-"Here's the last error message:\n"
-"%2"
+"Would you like to shutdown gracefully and give clients time to find a new relay?"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"It seems Tor has stopped running since Vidalia started it.\n"
+"Vidalia detected that the Tor software exited unexpectedly.\n"
"\n"
-"See the Advanced Message Log for more information."
+"Please check the message log for recent warning or error messages."
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?"
+"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 ""
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 "Error reloading configuration"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to reload Tor's configuration."
msgstr ""
msgctxt "MessageLog"
@@ -2393,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"
@@ -2448,10 +2336,6 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2551,6 +2435,30 @@ 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 ""
+
+msgctxt "NetworkPage"
+msgid "The specified bridge identifier is not valid."
+msgstr ""
+
msgctxt "NetworkPage"
msgid "Copy (Ctrl+C)"
msgstr ""
@@ -2684,11 +2592,11 @@ msgid "SOCKS 5"
msgstr ""
msgctxt "NetworkPage"
-msgid "HTTP / HTTPS"
+msgid "HTTP"
msgstr ""
msgctxt "NetworkPage"
-msgid "You must specify one or more bridges."
+msgid "HTTP / HTTPS"
msgstr ""
msgctxt "Policy"
@@ -3112,11 +3020,11 @@ msgid "Automatically distribute my bridge address"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network (exit relay)"
+msgid "Relay traffic inside the Tor network (non-exit relay)"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic inside the Tor network (non-exit relay)"
+msgid "Relay traffic for the Tor network (exit relay)"
msgstr ""
msgctxt "ServerPage"
@@ -3164,10 +3072,6 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
-msgid "Form"
-msgstr ""
-
-msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3456,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 ""
@@ -3492,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 ""
@@ -3570,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 ""
@@ -3698,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 ""
@@ -3791,10 +3749,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 ""
diff --git a/src/vidalia/i18n/po/it/qt_it.po b/src/vidalia/i18n/po/it/qt_it.po
index 8ae6cd5..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:
-# 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: 2012-02-14 09:47+0000\n"
-"Last-Translator: fetidyoo <tru74368 at yahoo.com>\n"
-"Language-Team: Italian (http://www.transifex.net/projects/p/torproject/language/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"
@@ -202,7 +199,9 @@ msgctxt "QFileDialog"
msgid ""
"%1 already exists.\n"
"Do you want to replace it?"
-msgstr "%1 esiste già.\nVuoi sostituirlo?"
+msgstr ""
+"%1 esiste già.\n"
+"Vuoi sostituirlo?"
#: qfiledialog.cpp:1690
msgctxt "QFileDialog"
@@ -210,7 +209,10 @@ msgid ""
"%1\n"
"File not found.\n"
"Please verify the correct file name was given."
-msgstr "%1\nFile non trovato.\n Verifica qual'è il nome corretto del file"
+msgstr ""
+"%\n"
+"File non trovato.\n"
+" Verifica qual'è il nome corretto del file"
#: qdirmodel.cpp:833
msgctxt "QFileDialog"
@@ -268,14 +270,19 @@ msgid ""
"%1\n"
"Directory not found.\n"
"Please verify the correct directory name was given."
-msgstr "%1\nCartella non trovata.\nControlla il nome corretto della cartella."
+msgstr ""
+"%1\n"
+"Cartella non trovata.\n"
+"Controlla il nome corretto della cartella"
#: qfiledialog.cpp:2281
msgctxt "QFileDialog"
msgid ""
"'%1' is write protected.\n"
"Do you want to delete it anyway?"
-msgstr "'%1' è di sola lettura.\nVuoi comunque cancellare?"
+msgstr ""
+"'%1' è protetto.\n"
+"Vuoi comunque cancellare?"
#: qfiledialog.cpp:2286
msgctxt "QFileDialog"
@@ -285,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"
@@ -365,14 +372,16 @@ 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"
msgid ""
"<b>The name \"%1\" can not be used.</b><p>Try using another name, with fewer"
" characters or no punctuations marks."
-msgstr "<b>Il nome \"%1\" non può essere utilizzato.</b><p>Prova a utilizzare un altro nome, con meno caratteri o senza segni di interpunzione."
+msgstr ""
+"<b>Il nome \"%1\" non può essere utilizzato.</b><p>Prova a utilizzare un "
+"altro nome, con meno caratteri o senza segni di interpunzione."
#: qfilesystemmodel.cpp:832
msgctxt "QFileSystemModel"
diff --git a/src/vidalia/i18n/po/it/vidalia_it.po b/src/vidalia/i18n/po/it/vidalia_it.po
index b0ba038..231bba9 100644
--- a/src/vidalia/i18n/po/it/vidalia_it.po
+++ b/src/vidalia/i18n/po/it/vidalia_it.po
@@ -1,15 +1,17 @@
#
# 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: 2012-03-21 17:52+0000\n"
-"PO-Revision-Date: 2012-03-22 08:51+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/language/it/)\n"
"MIME-Version: 1.0\n"
@@ -54,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?"
@@ -82,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:"
@@ -146,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:"
@@ -154,31 +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"
@@ -186,26 +188,15 @@ 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"
-
-msgctxt "AdvancedPage"
-msgid ""
-"You've checked the autoconfiguration option for the ControlPort, but "
-"provided no Data Directory. Please add one, or uncheck the \"Configure "
-"ControlPort automatically\" option."
-msgstr ""
+msgstr "Seleziona il percorso del file da usare come socket per Tor"
msgctxt "AdvancedPage"
msgid ""
@@ -234,23 +225,6 @@ msgctxt "AppearancePage"
msgid "Vidalia was unable to load the selected language translation."
msgstr "Vidalia non è in grado di caricare la traduzione della lingua prescelta"
-msgctxt "AppearancePage"
-msgid ""
-"System Icon Preferences (changes will take effect when you restart Vidalia)"
-msgstr ""
-
-msgctxt "AppearancePage"
-msgid "Show the Tray Icon and Dock Icon (default)"
-msgstr ""
-
-msgctxt "AppearancePage"
-msgid "Hide the Tray Icon"
-msgstr ""
-
-msgctxt "AppearancePage"
-msgid "Hide the Dock Icon"
-msgstr ""
-
msgctxt "BandwidthGraph"
msgid "Since:"
msgstr "Dal:"
@@ -264,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"
@@ -307,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..."
@@ -460,18 +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 ""
+"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 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:"
+"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."
@@ -1287,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"
@@ -1303,36 +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)"
@@ -1359,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"
@@ -1390,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"
@@ -1613,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"
@@ -1672,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"
@@ -1708,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"
@@ -1776,6 +1734,10 @@ msgid "Connected to the Tor network!"
msgstr "Connesso alla rete Tor!"
msgctxt "MainWindow"
+msgid "Unrecognized startup status"
+msgstr "Stato di avvio non riconosciuto"
+
+msgctxt "MainWindow"
msgid "miscellaneous"
msgstr "varie"
@@ -1820,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"
@@ -1906,18 +1864,6 @@ msgid ""
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."
-
-msgctxt "MainWindow"
msgid "Tor Update Available"
msgstr "È disponibile un aggiornamento di Tor"
@@ -1958,82 +1904,11 @@ 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."
@@ -2081,53 +1956,44 @@ 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 "Bootstrapping torrc from %1 to %2"
-msgstr "Bootstrapping torrc da %1 a %2"
+msgid "toolBar"
+msgstr "Barra degli strumenti"
msgctxt "MainWindow"
-msgid "(probably Telnet)"
-msgstr "(probabilmente Telnet)"
+msgid "Start"
+msgstr "Avvia"
msgctxt "MainWindow"
-msgid "(probably an email client)"
-msgstr "(probabilmente un programma per le email)"
+msgid "Stop"
+msgstr "Stop"
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. "
+msgid "Restart"
+msgstr "Riavvia"
msgctxt "MainWindow"
-msgid "failed (%1)"
-msgstr "fallito (%1)"
+msgid "Reload Tor's config"
+msgstr "Ricarica le configurazioni di Tor"
msgctxt "MainWindow"
-msgid ""
-"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 ""
-"Vidalia can't find out how to talk to Tor because it can't access this file: %1\n"
-"\n"
-"Here's the last error message:\n"
-"%2"
-msgstr ""
+msgid "Actions"
+msgstr "Azioni"
msgctxt "MainWindow"
-msgid ""
-"It seems Tor has stopped running since Vidalia started it.\n"
-"\n"
-"See the Advanced Message Log for more information."
-msgstr ""
+msgid "Bootstrapping torrc from %1 to %2"
+msgstr "Inizializzando torrc fa %1 a %2"
msgctxt "MainWindow"
msgid ""
@@ -2143,6 +2009,38 @@ msgid ""
"Please check the message log for recent warning or error messages."
msgstr "Vidalia ha rilevato che il software Tor si è chiuso inaspettatamente.\n\nControlla il log dei messaggi alla ricerca di avvisi o messaggi di errore recenti."
+msgctxt "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 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 Telnet,"
+msgstr ", probabilmente Telnet,"
+
+msgctxt "MainWindow"
+msgid ", probably an email client,"
+msgstr ", probabilmente un client email,"
+
+msgctxt "MainWindow"
+msgid ""
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
+msgstr "Il tuo relay si sta spegnendo.\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"
msgstr "Errore nell'impostazione del filtro"
@@ -2396,22 +2294,14 @@ 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."
@@ -2451,10 +2341,6 @@ msgid ""
msgstr "Non riesco a scrivere il file %1\n\n%2."
msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr "Mappa della rete Tor"
-
-msgctxt "NetViewer"
msgid "Refresh"
msgstr "Ricarica"
@@ -2554,6 +2440,30 @@ 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"
+
+msgctxt "NetworkPage"
+msgid "The specified bridge identifier is not valid."
+msgstr "L'identifier del bridge specificat non è valido."
+
msgctxt "NetworkPage"
msgid "Copy (Ctrl+C)"
msgstr "Copia (Ctrl+C)"
@@ -2676,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"
@@ -2687,12 +2597,12 @@ msgid "SOCKS 5"
msgstr "SOCKS 5"
msgctxt "NetworkPage"
-msgid "HTTP / HTTPS"
-msgstr "HTTP / HTTPS"
+msgid "HTTP"
+msgstr "HTTP"
msgctxt "NetworkPage"
-msgid "You must specify one or more bridges."
-msgstr ""
+msgid "HTTP / HTTPS"
+msgstr "HTTP / HTTPS"
msgctxt "Policy"
msgid "accept"
@@ -3108,19 +3018,19 @@ 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 for the Tor network (exit relay)"
-msgstr ""
+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 inside the Tor network (non-exit relay)"
-msgstr ""
+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"
@@ -3167,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"
@@ -3216,26 +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 ""
@@ -3243,7 +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 ""
@@ -3251,31 +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 ""
@@ -3283,7 +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 ""
@@ -3291,11 +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 ""
@@ -3303,18 +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 ""
@@ -3322,81 +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 ""
@@ -3404,26 +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"
@@ -3435,21 +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 ""
@@ -3457,7 +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"
@@ -3495,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]"
@@ -3513,13 +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"
@@ -3547,19 +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\""
@@ -3571,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"
@@ -3701,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"
@@ -3794,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:"
diff --git a/src/vidalia/i18n/po/ja/qt_ja.po b/src/vidalia/i18n/po/ja/qt_ja.po
index 7ec5561..bf95d21 100644
--- a/src/vidalia/i18n/po/ja/qt_ja.po
+++ b/src/vidalia/i18n/po/ja/qt_ja.po
@@ -1,16 +1,11 @@
-# Translators:
-# Translators:
-# 5人のアノニマス <>, 2012.
-# Chris Harris <praisebe4him at gmail.com>, 2012.
-# runasand <runa.sandvik at gmail.com>, 2011.
-# siomiz <>, 2012.
+#
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-08-20 03:25+0000\n"
-"PO-Revision-Date: 2012-02-21 07:11+0000\n"
-"Last-Translator: Chris Harris <praisebe4him 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"
@@ -204,7 +199,9 @@ msgctxt "QFileDialog"
msgid ""
"%1 already exists.\n"
"Do you want to replace it?"
-msgstr "%1はすでに存在します。\n置き換えますか?"
+msgstr ""
+"%1はすでに存在します。\n"
+"置き換えますか?"
#: qfiledialog.cpp:1690
msgctxt "QFileDialog"
@@ -212,7 +209,10 @@ msgid ""
"%1\n"
"File not found.\n"
"Please verify the correct file name was given."
-msgstr "%1\nファイルが見つかりません。\n正しいファイル名が入力されたかどうか確認してください。"
+msgstr ""
+"%1\n"
+"ファイルが見つかりません。\n"
+"正しいファイル名が入力されたかどうか確認してください。"
#: qdirmodel.cpp:833
msgctxt "QFileDialog"
@@ -270,14 +270,19 @@ msgid ""
"%1\n"
"Directory not found.\n"
"Please verify the correct directory name was given."
-msgstr "%1\nディレクトリが見つかりません。\n正しいディレクトリ名が入力されたかどうか確認してください。"
+msgstr ""
+"%1\n"
+"ディレクトリが見つかりません。\n"
+"正しいディレクトリ名が入力されたかどうか確認してください。"
#: qfiledialog.cpp:2281
msgctxt "QFileDialog"
msgid ""
"'%1' is write protected.\n"
"Do you want to delete it anyway?"
-msgstr "'%1' は書き込みが禁止されています。\n本当に削除しますか？"
+msgstr ""
+"'%1' は書き込みが禁止されています。\n"
+"本当に削除しますか？"
#: qfiledialog.cpp:2286
msgctxt "QFileDialog"
@@ -337,12 +342,12 @@ msgstr "新しいフォルダ"
#: qfiledialog.cpp:465
msgctxt "QFileDialog"
msgid "&New Folder"
-msgstr "新しいフォルダ(&F)"
+msgstr ""
#: qfiledialog.cpp:917
msgctxt "QFileDialog"
msgid "&Choose"
-msgstr "選択(&S)"
+msgstr ""
#: qsidebar.cpp:388
msgctxt "QFileDialog"
@@ -367,14 +372,14 @@ msgstr "新しいフォルダの作成"
#: qfilesystemmodel.cpp:761
msgctxt "QFileSystemModel"
msgid "Invalid filename"
-msgstr "不正なファイル名"
+msgstr ""
#: qfilesystemmodel.cpp:763
msgctxt "QFileSystemModel"
msgid ""
"<b>The name \"%1\" can not be used.</b><p>Try using another name, with fewer"
" characters or no punctuations marks."
-msgstr "<b>\"%1\" という名前は使えません。</b><p>名前を短くするか、記号を含まない別の名前で試してください。</p>"
+msgstr ""
#: qfilesystemmodel.cpp:832
msgctxt "QFileSystemModel"
@@ -409,29 +414,29 @@ 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 バイト"
+msgstr ""
diff --git a/src/vidalia/i18n/po/ja/vidalia_ja.po b/src/vidalia/i18n/po/ja/vidalia_ja.po
index f728394..6541a26 100644
--- a/src/vidalia/i18n/po/ja/vidalia_ja.po
+++ b/src/vidalia/i18n/po/ja/vidalia_ja.po
@@ -1,26 +1,16 @@
-#
-# Translators:
-# まつ <>, 2012.
-# Chris Harris <praisebe4him at gmail.com>, 2012.
-# Eshin Kunishima <kaoru at mikosu.ddo.jp>, 2012.
-# <kaoru at mikosu.ddo.jp>, 2012.
-# <pentive at gmail.com>, 2012.
-# runasand <runa.sandvik at gmail.com>, 2011.
-# siomiz <>, 2012.
msgid ""
msgstr ""
-"Project-Id-Version: The Tor Project\n"
-"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2012-03-21 17:52+0000\n"
-"PO-Revision-Date: 2012-04-08 09:44+0000\n"
-"Last-Translator: Eshin Kunishima <kaoru at mikosu.ddo.jp>\n"
+"Project-Id-Version: Vidalia\n"
+"Report-Msgid-Bugs-To: translations at vidalia-project.net\n"
+"POT-Creation-Date: 2009-05-19 23:56+0000\n"
+"PO-Revision-Date: 2010-04-10 02:06-0600\n"
+"Last-Translator: Shinji R. Yamane <s-yamane at computer.org>\n"
"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: ja\n"
-"Plural-Forms: nplurals=1; plural=0\n"
-"X-Generator: Vidalia ts2po 0.2\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Pootle 1.1.0\n"
msgctxt "AboutDialog"
msgid "About Vidalia"
@@ -42,13 +32,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 "version"
+
msgctxt "AdvancedPage"
msgid "'%1' is not a valid IP address."
msgstr "'%1' は有効な IP アドレスではありません。"
msgctxt "AdvancedPage"
-msgid ""
-"You selected 'Password' authentication, but did not specify a password."
+msgid "You selected 'Password' authentication, but did not specify a password."
msgstr "'パスワード' 認証を選択しましたが、パスワードを指定しませんでした。"
msgctxt "AdvancedPage"
@@ -88,6 +93,10 @@ msgid "Vidalia was unable to install the Tor service."
msgstr "Vidalia は Tor サービスをインストールすることができませんでした。"
msgctxt "AdvancedPage"
+msgid "Control Port"
+msgstr "制御ポート"
+
+msgctxt "AdvancedPage"
msgid "Authentication:"
msgstr "認証:"
@@ -137,85 +146,17 @@ msgstr "データディレクトリ"
msgctxt "AdvancedPage"
msgid "Store data for the Tor software in the following directory"
-msgstr "Torクライアントに関するデータを保存するディレクトリ"
-
-msgctxt "AdvancedPage"
-msgid "Select the directory used to store data for the Tor software"
-msgstr "Torクライアントに関するデータを保存するディレクトリを選ぶ"
-
-msgctxt "AdvancedPage"
-msgid "Tor Control"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "Use TCP connection (ControlPort)"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "Path:"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "Use Unix domain socket (ControlSocket)"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "Edit current torrc"
-msgstr "現在のtorrcを編集します"
-
-msgctxt "AdvancedPage"
-msgid "NOTE: this will edit the currently loaded torrc"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "ControlSocket path doesn't exist."
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid ""
-"The specified Tor configuration file location contains characters that "
-"cannot be represented in your system's current 8-bit character encoding."
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid ""
-"The specified Tor data directory location contains characters that cannot be"
-" represented in your system's current 8-bit character encoding."
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "Warning"
-msgstr "警告"
-
-msgctxt "AdvancedPage"
-msgid "You changed torrc path, would you like to restart Tor?"
msgstr ""
msgctxt "AdvancedPage"
-msgid "Tor Configuration File (torrc);;All Files (*)"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "Select a file to use for Tor socket path"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "Configure ControlPort automatically"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid ""
-"You've checked the autoconfiguration option for the ControlPort, but "
-"provided no Data Directory. Please add one, or uncheck the \"Configure "
-"ControlPort automatically\" option."
+msgid "Select the directory used to store data for the Tor software"
msgstr ""
msgctxt "AdvancedPage"
-msgid ""
-"Vidalia was unable to remove the Tor service.\n"
+msgid "Vidalia was unable to remove the Tor service.\n"
"\n"
"You may need to remove it manually."
-msgstr "VidaliaはTorサービスを削除できませんでした。\n\n手動で削除する必要があります。"
+msgstr ""
msgctxt "AppearancePage"
msgid "Language"
@@ -235,23 +176,6 @@ msgstr "Vidalia のインターフェイス スタイルを選択します"
msgctxt "AppearancePage"
msgid "Vidalia was unable to load the selected language translation."
-msgstr "Vidaliaは選択された言語データをロードできませんでした。"
-
-msgctxt "AppearancePage"
-msgid ""
-"System Icon Preferences (changes will take effect when you restart Vidalia)"
-msgstr ""
-
-msgctxt "AppearancePage"
-msgid "Show the Tray Icon and Dock Icon (default)"
-msgstr ""
-
-msgctxt "AppearancePage"
-msgid "Hide the Tray Icon"
-msgstr ""
-
-msgctxt "AppearancePage"
-msgid "Hide the Dock Icon"
msgstr ""
msgctxt "BandwidthGraph"
@@ -312,15 +236,15 @@ 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..."
@@ -328,15 +252,15 @@ 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"
@@ -344,19 +268,19 @@ 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"
@@ -420,7 +344,7 @@ msgstr "共有"
msgctxt "ConfigDialog"
msgid "Services"
-msgstr "サービス"
+msgstr ""
msgctxt "ConfigDialog"
msgid "Appearance"
@@ -464,17 +388,15 @@ msgstr "コントロール ソケットは接続されていません。"
msgctxt "ControlPasswordInputDialog"
msgid "Password Required"
-msgstr "要パスワード"
+msgstr ""
msgctxt "ControlPasswordInputDialog"
msgid "Remember my password"
-msgstr "パスワードを記憶"
+msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid ""
-"Vidalia has connected to a running Tor process that requires a password. "
-"Please enter your control password:"
-msgstr "Vidaliaは、パスワードが必要なTorプロセスに接続しました。管理パスワードを入力してください:"
+msgid "Vidalia has connected to a running Tor process that requires a password. Please enter your control password:"
+msgstr ""
msgctxt "ControlSocket"
msgid "Control socket is not connected."
@@ -494,275 +416,275 @@ msgstr "不正なコントロール返信です。[%1]"
msgctxt "CountryInfo"
msgid "Afghanistan"
-msgstr "アフガニスタン"
+msgstr ""
msgctxt "CountryInfo"
msgid "Andorra"
-msgstr "アンドラ"
+msgstr ""
msgctxt "CountryInfo"
msgid "Angola"
-msgstr "アンゴラ"
+msgstr ""
msgctxt "CountryInfo"
msgid "Antigua & Barbuda"
-msgstr "アンチグア & バーブーダ"
+msgstr ""
msgctxt "CountryInfo"
msgid "Argentina"
-msgstr "アルゼンチン"
+msgstr ""
msgctxt "CountryInfo"
msgid "Armenia"
-msgstr "アルマニア"
+msgstr ""
msgctxt "CountryInfo"
msgid "Australia"
-msgstr "オーストラリア"
+msgstr ""
msgctxt "CountryInfo"
msgid "Azerbaijan"
-msgstr "アゼルバイジャン"
+msgstr ""
msgctxt "CountryInfo"
msgid "Bahamas"
-msgstr "バハマ国"
+msgstr ""
msgctxt "CountryInfo"
msgid "Bangladesh"
-msgstr "バングラデシュ"
+msgstr ""
msgctxt "CountryInfo"
msgid "Barbados"
-msgstr "バルバドス"
+msgstr ""
msgctxt "CountryInfo"
msgid "Belarus"
-msgstr "ベラルーシ"
+msgstr ""
msgctxt "CountryInfo"
msgid "Belgium"
-msgstr "ベルギー"
+msgstr ""
msgctxt "CountryInfo"
msgid "Belize"
-msgstr "ベリーズ"
+msgstr ""
msgctxt "CountryInfo"
msgid "Bhutan"
-msgstr "ブータン"
+msgstr ""
msgctxt "CountryInfo"
msgid "Bolivia"
-msgstr "ボリビア"
+msgstr ""
msgctxt "CountryInfo"
msgid "Bosnia & Herzegovina"
-msgstr "ボスニア・ヘルツェゴビナ"
+msgstr ""
msgctxt "CountryInfo"
msgid "Botswana"
-msgstr "ボツワナ"
+msgstr ""
msgctxt "CountryInfo"
msgid "Brazil"
-msgstr "ブラジル"
+msgstr ""
msgctxt "CountryInfo"
msgid "Brunei Darussalam"
-msgstr "ブルネイ・ダルサラーム国"
+msgstr ""
msgctxt "CountryInfo"
msgid "Bulgaria"
-msgstr "ブルガリア"
+msgstr ""
msgctxt "CountryInfo"
msgid "Burkina Faso"
-msgstr "ブルキナファソ"
+msgstr ""
msgctxt "CountryInfo"
msgid "Burundi"
-msgstr "ブルンジ"
+msgstr ""
msgctxt "CountryInfo"
msgid "Cambodia"
-msgstr "カンボジア"
+msgstr ""
msgctxt "CountryInfo"
msgid "Cameroon"
-msgstr "カメルーン"
+msgstr ""
msgctxt "CountryInfo"
msgid "Canada"
-msgstr "カナダ"
+msgstr ""
msgctxt "CountryInfo"
msgid "Cape Verde"
-msgstr "カボベルデ"
+msgstr ""
msgctxt "CountryInfo"
msgid "Central African Republic"
-msgstr "中央アフリカ共和国"
+msgstr ""
msgctxt "CountryInfo"
msgid "Chad"
-msgstr "チャド"
+msgstr ""
msgctxt "CountryInfo"
msgid "Chile"
-msgstr "チリ"
+msgstr ""
msgctxt "CountryInfo"
msgid "China"
-msgstr "中国"
+msgstr ""
msgctxt "CountryInfo"
msgid "Colombia"
-msgstr "コロンビア"
+msgstr ""
msgctxt "CountryInfo"
msgid "Comoros"
-msgstr "コモロ"
+msgstr ""
msgctxt "CountryInfo"
msgid "Congo, The Democratic Republic of the"
-msgstr "コンゴ 民主共和国"
+msgstr ""
msgctxt "CountryInfo"
msgid "Congo"
-msgstr "コンゴ"
+msgstr ""
msgctxt "CountryInfo"
msgid "Costa Rica"
-msgstr "コスタリカ"
+msgstr ""
msgctxt "CountryInfo"
msgid "Cote d’Ivoire"
-msgstr "コートジボワール"
+msgstr ""
msgctxt "CountryInfo"
msgid "Croatia"
-msgstr "クロアチア"
+msgstr ""
msgctxt "CountryInfo"
msgid "Cuba"
-msgstr "キューバ"
+msgstr ""
msgctxt "CountryInfo"
msgid "Cyprus"
-msgstr "キプロス"
+msgstr ""
msgctxt "CountryInfo"
msgid "Czech Republic"
-msgstr "チェコ"
+msgstr ""
msgctxt "CountryInfo"
msgid "Denmark"
-msgstr "デンマーク"
+msgstr ""
msgctxt "CountryInfo"
msgid "Djibouti"
-msgstr "ジブチ"
+msgstr ""
msgctxt "CountryInfo"
msgid "Dominica"
-msgstr "ドミニカ"
+msgstr ""
msgctxt "CountryInfo"
msgid "Dominican Republic"
-msgstr "ドミニカ共和国"
+msgstr ""
msgctxt "CountryInfo"
msgid "Ecuador"
-msgstr "エクアドル"
+msgstr ""
msgctxt "CountryInfo"
msgid "Egypt"
-msgstr "エジプト"
+msgstr ""
msgctxt "CountryInfo"
msgid "El Salvador"
-msgstr "エルサルバドル"
+msgstr ""
msgctxt "CountryInfo"
msgid "Equatorial Guinea"
-msgstr "赤道ギニア"
+msgstr ""
msgctxt "CountryInfo"
msgid "Eritrea"
-msgstr "エリトリア"
+msgstr ""
msgctxt "CountryInfo"
msgid "Estonia"
-msgstr "エストニア"
+msgstr ""
msgctxt "CountryInfo"
msgid "France"
-msgstr "フランス"
+msgstr ""
msgctxt "CountryInfo"
msgid "Gabon"
-msgstr "ガボン"
+msgstr ""
msgctxt "CountryInfo"
msgid "Gambia"
-msgstr "ガンビア"
+msgstr ""
msgctxt "CountryInfo"
msgid "Georgia"
-msgstr "グルジア"
+msgstr ""
msgctxt "CountryInfo"
msgid "Germany"
-msgstr "ドイツ"
+msgstr ""
msgctxt "CountryInfo"
msgid "Ghana"
-msgstr "ガーナ"
+msgstr ""
msgctxt "CountryInfo"
msgid "Grenada"
-msgstr "グレナダ"
+msgstr ""
msgctxt "CountryInfo"
msgid "Guatemala"
-msgstr "グアテマラ"
+msgstr ""
msgctxt "CountryInfo"
msgid "Guinea"
-msgstr "ギニア"
+msgstr ""
msgctxt "CountryInfo"
msgid "Guinea-Bissau"
-msgstr "ギニアビサウ"
+msgstr ""
msgctxt "CountryInfo"
msgid "Guyana"
-msgstr "ガイアナ"
+msgstr ""
msgctxt "CountryInfo"
msgid "Hong Kong"
-msgstr "香港"
+msgstr ""
msgctxt "CountryInfo"
msgid "Haiti"
-msgstr "ハイチ"
+msgstr ""
msgctxt "CountryInfo"
msgid "Honduras"
-msgstr "ホンジュラス"
+msgstr ""
msgctxt "CountryInfo"
msgid "Israel"
-msgstr "イスラエル"
+msgstr ""
msgctxt "CountryInfo"
msgid "Italy"
-msgstr "イタリア"
+msgstr ""
msgctxt "CountryInfo"
msgid "Jamaica"
-msgstr "ジャマイカ"
+msgstr ""
msgctxt "CountryInfo"
msgid "Japan"
@@ -770,571 +692,518 @@ msgstr "日本"
msgctxt "CountryInfo"
msgid "Jordan"
-msgstr "ヨルダン"
+msgstr ""
msgctxt "CountryInfo"
msgid "Kazakhstan"
-msgstr "カザフスタン"
+msgstr ""
msgctxt "CountryInfo"
msgid "Kenya"
-msgstr "ケニア"
+msgstr ""
msgctxt "CountryInfo"
msgid "Kiribati"
-msgstr "キリバス"
+msgstr ""
msgctxt "CountryInfo"
msgid "Kuwait"
-msgstr "クウェート"
+msgstr ""
msgctxt "CountryInfo"
msgid "Kyrgyzstan"
-msgstr "キルギス"
+msgstr ""
msgctxt "CountryInfo"
msgid "Laos"
-msgstr "ラオス"
+msgstr ""
msgctxt "CountryInfo"
msgid "Latvia"
-msgstr "ラトビア"
+msgstr ""
msgctxt "CountryInfo"
msgid "Lebanon"
-msgstr "レバノン"
+msgstr ""
msgctxt "CountryInfo"
msgid "Lesotho"
-msgstr "レソト"
+msgstr ""
msgctxt "CountryInfo"
msgid "Liberia"
-msgstr "リベリア"
+msgstr ""
msgctxt "CountryInfo"
msgid "Liechtenstein"
-msgstr "リヒテンシュタイン"
+msgstr ""
msgctxt "CountryInfo"
msgid "Lithuania"
-msgstr "リトアニア"
+msgstr ""
msgctxt "CountryInfo"
msgid "Luxembourg"
-msgstr "ルクセンブルク"
+msgstr ""
msgctxt "CountryInfo"
msgid "Macedonia"
-msgstr "マケドニア"
+msgstr ""
msgctxt "CountryInfo"
msgid "Madagascar"
-msgstr "マダガスカル"
+msgstr ""
msgctxt "CountryInfo"
msgid "Malawi"
-msgstr "マラウイ"
+msgstr ""
msgctxt "CountryInfo"
msgid "Malaysia"
-msgstr "マレーシア"
+msgstr ""
msgctxt "CountryInfo"
msgid "Mali"
-msgstr "マリ"
+msgstr ""
msgctxt "CountryInfo"
msgid "Malta"
-msgstr "マルタ"
+msgstr ""
msgctxt "CountryInfo"
msgid "Marshall Islands"
-msgstr "マーシャル諸島"
+msgstr ""
msgctxt "CountryInfo"
msgid "Mauritania"
-msgstr "モーリタニア"
+msgstr ""
msgctxt "CountryInfo"
msgid "Mauritius"
-msgstr "モーリシャス"
+msgstr ""
msgctxt "CountryInfo"
msgid "Micronesia"
-msgstr "ミクロネシア"
+msgstr ""
msgctxt "CountryInfo"
msgid "Moldova"
-msgstr "モルドバ"
+msgstr ""
msgctxt "CountryInfo"
msgid "Monaco"
-msgstr "モナコ"
+msgstr ""
msgctxt "CountryInfo"
msgid "Mongolia"
-msgstr "モンゴル"
+msgstr ""
msgctxt "CountryInfo"
msgid "Montenegro"
-msgstr "モンテネグロ"
+msgstr ""
msgctxt "CountryInfo"
msgid "Morocco"
-msgstr "モロッコ"
+msgstr ""
msgctxt "CountryInfo"
msgid "Mozambique"
-msgstr "モザンビーク"
+msgstr ""
msgctxt "CountryInfo"
msgid "Namibia"
-msgstr "ナミビア"
+msgstr ""
msgctxt "CountryInfo"
msgid "Nauru"
-msgstr "ナウル"
+msgstr ""
msgctxt "CountryInfo"
msgid "Nepal"
-msgstr "ネパール"
+msgstr ""
msgctxt "CountryInfo"
msgid "Netherlands"
-msgstr "オランダ"
+msgstr ""
msgctxt "CountryInfo"
msgid "New Zealand"
-msgstr "ニュージーランド"
+msgstr ""
msgctxt "CountryInfo"
msgid "Nicaragua"
-msgstr "ニカラグア"
+msgstr ""
msgctxt "CountryInfo"
msgid "Niger"
-msgstr "ニジェール"
+msgstr ""
msgctxt "CountryInfo"
msgid "Nigeria"
-msgstr "ナイジェリア"
+msgstr ""
msgctxt "CountryInfo"
msgid "Norway"
-msgstr "ノルウェー"
+msgstr ""
msgctxt "CountryInfo"
msgid "Oman"
-msgstr "オマーン"
+msgstr ""
msgctxt "CountryInfo"
msgid "Pakistan"
-msgstr "パキスタン"
+msgstr ""
msgctxt "CountryInfo"
msgid "Palau"
-msgstr "パラオ"
+msgstr ""
msgctxt "CountryInfo"
msgid "Palestine"
-msgstr "パレスチナ"
+msgstr ""
msgctxt "CountryInfo"
msgid "Panama"
-msgstr "パナマ"
+msgstr ""
msgctxt "CountryInfo"
msgid "Papua New Guinea"
-msgstr "パプアニューギニア"
+msgstr ""
msgctxt "CountryInfo"
msgid "Paraguay"
-msgstr "パラグアイ"
+msgstr ""
msgctxt "CountryInfo"
msgid "Peru"
-msgstr "ペルー"
+msgstr ""
msgctxt "CountryInfo"
msgid "Philippines"
-msgstr "フィリピン"
+msgstr ""
msgctxt "CountryInfo"
msgid "Poland"
-msgstr "ポーランド"
+msgstr ""
msgctxt "CountryInfo"
msgid "Portugal"
-msgstr "ポルトガル"
+msgstr ""
msgctxt "CountryInfo"
msgid "Qatar"
-msgstr "カタール"
+msgstr ""
msgctxt "CountryInfo"
msgid "Romania"
-msgstr "ルーマニア"
+msgstr ""
msgctxt "CountryInfo"
msgid "Russia"
-msgstr "ロシア"
+msgstr ""
msgctxt "CountryInfo"
msgid "Rwanda"
-msgstr "ルワンダ"
+msgstr ""
msgctxt "CountryInfo"
msgid "Saint Kitts & Nevis"
-msgstr "セントクリストファー・ネイビス"
+msgstr ""
msgctxt "CountryInfo"
msgid "Saint Lucia"
-msgstr "セントルシア"
+msgstr ""
msgctxt "CountryInfo"
msgid "Saint Vincent & the Grenadines"
-msgstr "セントビンセント・グレナディーン"
+msgstr ""
msgctxt "CountryInfo"
msgid "Samoa"
-msgstr "サモア"
+msgstr ""
msgctxt "CountryInfo"
msgid "San Marino"
-msgstr "サンマリノ"
+msgstr ""
msgctxt "CountryInfo"
msgid "Sao Tome & Principe"
-msgstr "サントメ・プリンシペ"
+msgstr ""
msgctxt "CountryInfo"
msgid "Saudi Arabia"
-msgstr "サウジアラビア"
+msgstr ""
msgctxt "CountryInfo"
msgid "Senegal"
-msgstr "セネガル"
+msgstr ""
msgctxt "CountryInfo"
msgid "Serbia"
-msgstr "セルビア"
+msgstr ""
msgctxt "CountryInfo"
msgid "Seychelles"
-msgstr "セーシェル"
+msgstr ""
msgctxt "CountryInfo"
msgid "Sierra Leone"
-msgstr "シエラレオネ"
+msgstr ""
msgctxt "CountryInfo"
msgid "Singapore"
-msgstr "シンガポール"
+msgstr ""
msgctxt "CountryInfo"
msgid "Slovakia"
-msgstr "スロバキア"
+msgstr ""
msgctxt "CountryInfo"
msgid "Slovenia"
-msgstr "スロベニア"
+msgstr ""
msgctxt "CountryInfo"
msgid "Solomon Islands"
-msgstr "ソロモン諸島"
+msgstr ""
msgctxt "CountryInfo"
msgid "Somalia"
-msgstr "ソマリア"
+msgstr ""
msgctxt "CountryInfo"
msgid "South Africa"
-msgstr "南アフリカ"
+msgstr ""
msgctxt "CountryInfo"
msgid "Spain"
-msgstr "スペイン"
+msgstr ""
msgctxt "CountryInfo"
msgid "Sri Lanka"
-msgstr "スリランカ"
+msgstr ""
msgctxt "CountryInfo"
msgid "Sudan"
-msgstr "スーダン"
+msgstr ""
msgctxt "CountryInfo"
msgid "Suriname"
-msgstr "スリナム"
+msgstr ""
msgctxt "CountryInfo"
msgid "Swaziland"
-msgstr "スワジランド"
+msgstr ""
msgctxt "CountryInfo"
msgid "Sweden"
-msgstr "スウェーデン"
+msgstr ""
msgctxt "CountryInfo"
msgid "Switzerland"
-msgstr "スイス"
+msgstr ""
msgctxt "CountryInfo"
msgid "Syria"
-msgstr "シリア"
+msgstr ""
msgctxt "CountryInfo"
msgid "Tajikistan"
-msgstr "タジキスタン"
+msgstr ""
msgctxt "CountryInfo"
msgid "Tanzania"
-msgstr "タンザニア"
+msgstr ""
msgctxt "CountryInfo"
msgid "Thailand"
-msgstr "タイ王国"
+msgstr ""
msgctxt "CountryInfo"
msgid "Timor-Leste (East Timor)"
-msgstr "東ティモール"
+msgstr ""
msgctxt "CountryInfo"
msgid "Togo"
-msgstr "トーゴ"
+msgstr ""
msgctxt "CountryInfo"
msgid "Tonga"
-msgstr "トンガ"
+msgstr ""
msgctxt "CountryInfo"
msgid "Trinidad & Tobago"
-msgstr "トリニダード・トバゴ"
+msgstr ""
msgctxt "CountryInfo"
msgid "Tunisia"
-msgstr "チュニジア"
+msgstr ""
msgctxt "CountryInfo"
msgid "Turkey"
-msgstr "トルコ"
+msgstr ""
msgctxt "CountryInfo"
msgid "Turkmenistan"
-msgstr "トルクメニスタン"
+msgstr ""
msgctxt "CountryInfo"
msgid "Tuvalu"
-msgstr "ツバル"
+msgstr ""
msgctxt "CountryInfo"
msgid "Uganda"
-msgstr "ウガンダ"
+msgstr ""
msgctxt "CountryInfo"
msgid "Ukraine"
-msgstr "ウクライナ"
+msgstr ""
msgctxt "CountryInfo"
msgid "United Arab Emirates"
-msgstr "アラブ首長国連邦"
+msgstr ""
msgctxt "CountryInfo"
msgid "United Kingdom"
-msgstr "イギリス"
+msgstr ""
msgctxt "CountryInfo"
msgid "United States"
-msgstr "アメリカ合衆国"
+msgstr ""
msgctxt "CountryInfo"
msgid "Uruguay"
-msgstr "ウルグアイ"
+msgstr ""
msgctxt "CountryInfo"
msgid "Uzbekistan"
-msgstr "ウズベキスタン"
+msgstr ""
msgctxt "CountryInfo"
msgid "Vanuatu"
-msgstr "バヌアツ"
+msgstr ""
msgctxt "CountryInfo"
msgid "Vatican"
-msgstr "バチカン"
+msgstr ""
msgctxt "CountryInfo"
msgid "Venezuela"
-msgstr "ベネズエラ"
+msgstr ""
msgctxt "CountryInfo"
msgid "Vietnam"
-msgstr "ベトナム"
+msgstr ""
msgctxt "CountryInfo"
msgid "Western Sahara"
-msgstr "西サハラ"
+msgstr ""
msgctxt "CountryInfo"
msgid "Yemen"
-msgstr "イエメン"
+msgstr ""
msgctxt "CountryInfo"
msgid "Zambia"
-msgstr "ザンビア"
+msgstr ""
msgctxt "CountryInfo"
msgid "Zimbabwe"
-msgstr "ジンバブエ"
-
-msgctxt "CountryInfo"
-msgid "Zaire"
msgstr ""
msgctxt "CountryInfo"
msgid "Albania"
-msgstr "アルバニア"
+msgstr ""
msgctxt "CountryInfo"
msgid "Algeria"
-msgstr "アルジェリア"
+msgstr ""
msgctxt "CountryInfo"
msgid "Austria"
-msgstr "オーストリア"
+msgstr ""
msgctxt "CountryInfo"
msgid "Bahrain"
-msgstr "バーレーン"
+msgstr ""
msgctxt "CountryInfo"
msgid "Benin"
-msgstr "ベニン"
+msgstr ""
msgctxt "CountryInfo"
msgid "Ethiopia"
-msgstr "エチオピア"
+msgstr ""
msgctxt "CountryInfo"
msgid "Fiji"
-msgstr "フィジー"
+msgstr ""
msgctxt "CountryInfo"
msgid "Finland"
-msgstr "フィンランド"
+msgstr ""
msgctxt "CountryInfo"
msgid "Greece"
-msgstr "ギリシャ"
+msgstr ""
msgctxt "CountryInfo"
msgid "Guam"
-msgstr "グアム"
+msgstr ""
msgctxt "CountryInfo"
msgid "Hungary"
-msgstr "ハンガリー"
+msgstr ""
msgctxt "CountryInfo"
msgid "Iceland"
-msgstr "アイスランド"
+msgstr ""
msgctxt "CountryInfo"
msgid "India"
-msgstr "インド"
+msgstr ""
msgctxt "CountryInfo"
msgid "Indonesia"
-msgstr "インドネシア"
+msgstr ""
msgctxt "CountryInfo"
msgid "Iran"
-msgstr "イラン"
+msgstr ""
msgctxt "CountryInfo"
msgid "Iraq"
-msgstr "イラク"
+msgstr ""
msgctxt "CountryInfo"
msgid "Ireland"
-msgstr "アイルランド"
+msgstr ""
msgctxt "CountryInfo"
msgid "Korea, North"
-msgstr "北朝鮮"
+msgstr ""
msgctxt "CountryInfo"
msgid "Korea, South"
-msgstr "韓国"
+msgstr ""
msgctxt "CountryInfo"
msgid "Libya"
-msgstr "リビア"
+msgstr ""
msgctxt "CountryInfo"
msgid "Maldives"
-msgstr "モルディブ"
+msgstr ""
msgctxt "CountryInfo"
msgid "Mexico"
-msgstr "メキシコ"
+msgstr ""
msgctxt "CountryInfo"
msgid "Myanmar"
-msgstr "ミャンマー"
+msgstr ""
msgctxt "CountryInfo"
msgid "Taiwan"
-msgstr "台湾"
-
-msgctxt "CrashReportDialog"
-msgid "Submit a Crash Report"
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid "Vidalia encountered an error and needed to close"
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid "Restart Vidalia"
-msgstr "Vidaliaを再起動します"
-
-msgctxt "CrashReportDialog"
-msgid "Don't Restart"
-msgstr "再起動しません"
-
-msgctxt "CrashReportDialog"
-msgid "Unable to restart Vidalia"
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid ""
-"We were unable to automatically restart Vidalia. Please restart Vidalia "
-"manually."
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid "Please fill a ticket in:"
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid ""
-"<a "
-"href=\"https://trac.torproject.org/projects/tor/newticket\">https://trac.torproject.org/projects/tor/newticket</a>"
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid ""
-"A crash report has been created that you can send to the Vidalia developers "
-"to help identify and fix the problem. The submitted report does not contain "
-"any personally identifying information."
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid ""
-"with a description of what you were doing before the application crashed, "
-"along with the following files corresponding to the crash report:"
msgstr ""
msgctxt "GeneralPage"
@@ -1347,13 +1216,17 @@ msgstr "Tor へのパスの選択"
msgctxt "GeneralPage"
msgid "Select Proxy Executable"
-msgstr "プロキシの実行可能ファイルを選択"
+msgstr ""
msgctxt "GeneralPage"
msgid "You must specify the name of your Tor executable."
msgstr "Tor の実行ファイルの名前を指定する必要があります。"
msgctxt "GeneralPage"
+msgid "The proxy arguments specified are not properly formatted."
+msgstr ""
+
+msgctxt "GeneralPage"
msgid "Start Vidalia when my system starts"
msgstr "システムの起動時にVidaliaを起動する"
@@ -1371,27 +1244,27 @@ 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 "GraphFrame"
msgid "%1 KB/s"
@@ -1411,11 +1284,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."
@@ -1543,17 +1416,14 @@ msgstr "見つかったドキュメント"
msgctxt "HelpBrowser"
msgid "Error Loading Help Contents:"
-msgstr "ヘルプコンテンツの読み込みエラー:"
+msgstr ""
msgctxt "HelpTextBrowser"
msgid "Opening External Link"
-msgstr "外部リンクを開く"
+msgstr ""
msgctxt "HelpTextBrowser"
-msgid ""
-"Vidalia can open the link you selected in your default Web browser. If your "
-"browser is not currently configured to use Tor then the request will not be "
-"anonymous."
+msgid "Vidalia can open the link you selected in your default Web browser. If your browser is not currently configured to use Tor then the request will not be anonymous."
msgstr ""
msgctxt "HelpTextBrowser"
@@ -1562,21 +1432,19 @@ msgstr ""
msgctxt "HelpTextBrowser"
msgid "Unable to Open Link"
-msgstr "リンクを開くことができません"
+msgstr ""
msgctxt "HelpTextBrowser"
-msgid ""
-"Vidalia was unable to open the selected link in your Web browser. You can "
-"still copy the URL and paste it into your browser."
+msgid "Vidalia was unable to open the selected link in your Web browser. You can still copy the URL and paste it into your browser."
msgstr ""
msgctxt "HelpTextBrowser"
msgid "Error opening help file:"
-msgstr "ヘルプファイルの表示エラー:"
+msgstr ""
msgctxt "LicenseDialog"
msgid "License Information"
-msgstr "ライセンス情報"
+msgstr ""
msgctxt "LicenseDialog"
msgid "License"
@@ -1584,7 +1452,7 @@ msgstr "ライセンス"
msgctxt "LicenseDialog"
msgid "Credits"
-msgstr "クレジット"
+msgstr ""
msgctxt "LogEvent"
msgid "Debug"
@@ -1610,33 +1478,9 @@ msgctxt "LogEvent"
msgid "Unknown"
msgstr "不明"
-msgctxt "LogTreeItem"
-msgid "Debug"
-msgstr ""
-
-msgctxt "LogTreeItem"
-msgid "Info"
-msgstr "情報"
-
-msgctxt "LogTreeItem"
-msgid "Notice"
-msgstr "通知"
-
-msgctxt "LogTreeItem"
-msgid "Warning"
-msgstr "警告"
-
-msgctxt "LogTreeItem"
-msgid "Error"
-msgstr "エラー"
-
-msgctxt "LogTreeItem"
-msgid "Unknown"
-msgstr "不明"
-
msgctxt "MainWindow"
msgid "Start Tor"
-msgstr "Torを実行する"
+msgstr ""
msgctxt "MainWindow"
msgid "Exit"
@@ -1724,7 +1568,7 @@ msgstr "Vidalia は構成されたウェブ ブラウザを起動することが
msgctxt "MainWindow"
msgid "Error starting IM client"
-msgstr "IMクライアントの起動エラー"
+msgstr ""
msgctxt "MainWindow"
msgid "Vidalia was unable to start the configured IM client"
@@ -1740,45 +1584,49 @@ msgstr "Vidalia は構成されたプロキシ サーバーを起動すること
msgctxt "MainWindow"
msgid "Connecting to a relay directory"
-msgstr "リレーディレクトリへ接続"
+msgstr ""
msgctxt "MainWindow"
msgid "Establishing an encrypted directory connection"
-msgstr "暗号化されたディレクトリとの接続を確立"
+msgstr ""
msgctxt "MainWindow"
msgid "Retrieving network status"
-msgstr "ネットワークを検索中"
+msgstr ""
msgctxt "MainWindow"
msgid "Loading network status"
-msgstr "ネットワークを読込中"
+msgstr ""
msgctxt "MainWindow"
msgid "Loading authority certificates"
-msgstr "認証局の署名を読込中"
+msgstr ""
msgctxt "MainWindow"
msgid "Requesting relay information"
-msgstr "リレー情報を要求中"
+msgstr ""
msgctxt "MainWindow"
msgid "Loading relay information"
-msgstr "リレー情報を読込中"
+msgstr ""
msgctxt "MainWindow"
msgid "Connecting to the Tor network"
-msgstr "Torネットワックに接続しています"
+msgstr ""
msgctxt "MainWindow"
msgid "Establishing a Tor circuit"
-msgstr "Tor回線を設置しています"
+msgstr ""
msgctxt "MainWindow"
msgid "Connected to the Tor network!"
msgstr "Torネットワークに接続しました!"
msgctxt "MainWindow"
+msgid "Unrecognized startup status"
+msgstr ""
+
+msgctxt "MainWindow"
msgid "miscellaneous"
msgstr ""
@@ -1792,27 +1640,27 @@ msgstr "完了"
msgctxt "MainWindow"
msgid "connection refused"
-msgstr "接続に失敗"
+msgstr ""
msgctxt "MainWindow"
msgid "connection timeout"
-msgstr "接続タイムアウト"
+msgstr ""
msgctxt "MainWindow"
msgid "read/write error"
-msgstr "読み書きエラー"
+msgstr ""
msgctxt "MainWindow"
msgid "no route to host"
-msgstr "ホストへの経路が見つかりません"
+msgstr ""
msgctxt "MainWindow"
msgid "insufficient resources"
-msgstr "資源不足"
+msgstr ""
msgctxt "MainWindow"
msgid "unknown"
-msgstr "不明"
+msgstr ""
msgctxt "MainWindow"
msgid "Tor is not running"
@@ -1824,37 +1672,35 @@ msgstr "Tor はシャットダウンしています"
msgctxt "MainWindow"
msgid "Stop Tor Now"
-msgstr "Torを今すぐに停止"
+msgstr ""
msgctxt "MainWindow"
msgid "Stop Tor"
-msgstr "Torを停止"
+msgstr ""
msgctxt "MainWindow"
msgid "Starting the Tor software"
-msgstr "Torソフトウェアを開始中"
+msgstr ""
msgctxt "MainWindow"
msgid "Starting Tor"
-msgstr "Torを開始しています"
+msgstr ""
msgctxt "MainWindow"
msgid "Error Starting Tor"
msgstr "Tor の開始エラー"
msgctxt "MainWindow"
-msgid ""
-"Vidalia was unable to start Tor. Check your settings to ensure the correct "
-"name and location of your Tor executable is specified."
+msgid "Vidalia was unable to start Tor. Check your settings to ensure the correct name and location of your Tor executable is specified."
msgstr "Vidalia は Tor を開始することができませんでした。Tor の実行ファイルの正しい名前と場所が指定されていることを確実にするには設定をチェックします。"
msgctxt "MainWindow"
msgid "Connecting to Tor"
-msgstr "Torに接続しています"
+msgstr ""
msgctxt "MainWindow"
msgid "Connection Error"
-msgstr "接続エラー"
+msgstr ""
msgctxt "MainWindow"
msgid "Relaying is Enabled"
@@ -1862,28 +1708,26 @@ 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"
msgstr "Cookie 認証が必要です"
msgctxt "MainWindow"
-msgid ""
-"The Tor software requires Vidalia to send the contents of an authentication "
-"cookie, but Vidalia was unable to find one."
+msgid "The Tor software requires Vidalia to send the contents of an authentication cookie, but Vidalia was unable to find one."
msgstr ""
msgctxt "MainWindow"
@@ -1896,21 +1740,19 @@ msgstr "データディレクトリ"
msgctxt "MainWindow"
msgid "Control Cookie (control_auth_cookie)"
-msgstr "コントロールCookie (control_auth_cookie)"
+msgstr ""
msgctxt "MainWindow"
msgid "Error Registering for Events"
msgstr "イベントの登録エラー"
msgctxt "MainWindow"
-msgid ""
-"Vidalia was unable to register for some events. Many of Vidalia's features "
-"may be unavailable."
+msgid "Vidalia was unable to register for some events. Many of Vidalia's features may be unavailable."
msgstr ""
msgctxt "MainWindow"
msgid "Authentication Error"
-msgstr "認証エラー"
+msgstr ""
msgctxt "MainWindow"
msgid "Vidalia was unable to authenticate to the Tor software. (%1)"
@@ -1925,9 +1767,7 @@ msgid "Tor Update Available"
msgstr "Tor の更新が利用可能です"
msgctxt "MainWindow"
-msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended. Please visit the Tor website to download the latest version."
+msgid "The currently installed version of Tor is out of date or no longer recommended. Please visit the Tor website to download the latest version."
msgstr "Tor の現在インストールされているバージョンは期限切れであるかもう推奨されない可能性があります。最新のバージョンをダウンロードするには Tor のウェブサイトを訪問してください。"
msgctxt "MainWindow"
@@ -1935,9 +1775,7 @@ msgid "Tor website: %1"
msgstr "Tor のウェブサイト: %1"
msgctxt "MainWindow"
-msgid ""
-"All subsequent connections will appear to be different than your old "
-"connections."
+msgid "All subsequent connections will appear to be different than your old connections."
msgstr "すべて順次接続は古い接続と異なっているようにみえます。"
msgctxt "MainWindow"
@@ -1946,7 +1784,7 @@ msgstr "新しい識別の作成に失敗しました"
msgctxt "MainWindow"
msgid "Port Forwarding Failed"
-msgstr "ポート転送に失敗しました"
+msgstr ""
msgctxt "MainWindow"
msgid "Vidalia was unable to configure automatic port forwarding."
@@ -1966,7 +1804,7 @@ msgstr "Vidalia のショートカット"
msgctxt "MainWindow"
msgid "Setup Relaying"
-msgstr "リレーのセットアップ\n"
+msgstr "リレーのセットアップ"
msgctxt "MainWindow"
msgid "Set up a relay and help the network grow"
@@ -1990,11 +1828,11 @@ msgstr "順次接続を新しくみせる"
msgctxt "MainWindow"
msgid "View recent bandwidth usage"
-msgstr "最近の帯域幅の使用状況を閲覧"
+msgstr ""
msgctxt "MainWindow"
msgid "View log message history"
-msgstr "ログメッセージの履歴を閲覧"
+msgstr ""
msgctxt "MainWindow"
msgid "View help documentation"
@@ -2002,7 +1840,7 @@ msgstr "ヘルプ資料を表示します"
msgctxt "MainWindow"
msgid "Configure Vidalia"
-msgstr "Vidaliaを設定します"
+msgstr ""
msgctxt "MainWindow"
msgid "View version and license information"
@@ -2029,21 +1867,15 @@ msgid "Password Reset Failed"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Vidalia tried to reset Tor's control password, but was not able to restart "
-"the Tor software. Please check your Task Manager to ensure there are no "
-"other Tor processes running."
+msgid "Vidalia tried to reset Tor's control password, but was not able to restart the Tor software. Please check your Task Manager to ensure there are no other Tor processes running."
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended."
+msgid "The currently installed version of Tor is out of date or no longer recommended."
msgstr "Tor の現在インストールされているバージョンは期限切れであるかもう推奨されない可能性があります。最新のバージョンをダウンロードするには Tor のウェブサイトを訪問してください。"
msgctxt "MainWindow"
-msgid ""
-"Would you like to check if a newer package is available for installation?"
+msgid "Would you like to check if a newer package is available for installation?"
msgstr ""
msgctxt "MainWindow"
@@ -2051,9 +1883,11 @@ msgid "Potentially Unsafe Connection"
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 ""
msgctxt "MainWindow"
@@ -2065,9 +1899,7 @@ msgid "Your software is up to date"
msgstr "ソフトウェアは最新版です"
msgctxt "MainWindow"
-msgid ""
-"There are no new Tor software packages available for your computer at this "
-"time."
+msgid "There are no new Tor software packages available for your computer at this time."
msgstr ""
msgctxt "MainWindow"
@@ -2083,67 +1915,52 @@ 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 "failed (%1)"
msgstr ""
msgctxt "MainWindow"
-msgid "Bootstrapping torrc from %1 to %2"
+msgid "Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
msgstr ""
msgctxt "MainWindow"
-msgid "(probably Telnet)"
+msgid "You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"\n"
+"Would you like to shutdown gracefully and give clients time to find a new relay?"
msgstr ""
msgctxt "MainWindow"
-msgid "(probably an email client)"
+msgid "Vidalia detected that the Tor software exited unexpectedly.\n"
+"\n"
+"Please check the message log for recent warning or error messages."
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"One of your applications %1 appears to be making a potentially unencrypted "
-"and unsafe connection to port %2."
+msgid ", probably Telnet,"
msgstr ""
msgctxt "MainWindow"
-msgid "failed (%1)"
+msgid ", probably an email client,"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
-msgstr ""
+msgid "Vidalia"
+msgstr "Vidalia"
msgctxt "MainWindow"
-msgid ""
-"Vidalia can't find out how to talk to Tor because it can't access this file: %1\n"
-"\n"
-"Here's the last error message:\n"
-"%2"
+msgid "File"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"It seems Tor has stopped running since Vidalia started it.\n"
-"\n"
-"See the Advanced Message Log for more information."
-msgstr ""
+msgid "About Vidalia"
+msgstr "Vidalia について"
msgctxt "MainWindow"
-msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
-"\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
-msgstr ""
+msgid "Home"
+msgstr "ホーム"
msgctxt "MainWindow"
-msgid ""
-"Vidalia detected that the Tor software exited unexpectedly.\n"
-"\n"
-"Please check the message log for recent warning or error messages."
+msgid "Check For Updates"
msgstr ""
msgctxt "MessageLog"
@@ -2387,6 +2204,10 @@ msgid "messages"
msgstr "件のメッセージ"
msgctxt "MessageLog"
+msgid "Always Save New Log Messages"
+msgstr "常に新しいログ メッセージを保存"
+
+msgctxt "MessageLog"
msgid "Browse"
msgstr "参照"
@@ -2399,56 +2220,34 @@ 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 ""
-"Messages that appear when something has \n"
+msgid "Messages that appear when something has \n"
"gone very wrong and Tor cannot proceed."
msgstr ""
msgctxt "MessageLog"
-msgid ""
-"Messages that only appear when \n"
+msgid "Messages that only appear when \n"
"something has gone wrong with Tor."
msgstr ""
msgctxt "MessageLog"
-msgid ""
-"Messages that appear infrequently \n"
+msgid "Messages that appear infrequently \n"
"during normal Tor operation and are \n"
"not considered errors, but you may \n"
"care about."
msgstr ""
msgctxt "MessageLog"
-msgid ""
-"Messages that appear frequently \n"
+msgid "Messages that appear frequently \n"
"during normal Tor operation."
msgstr ""
msgctxt "MessageLog"
-msgid ""
-"Hyper-verbose messages primarily of \n"
+msgid "Hyper-verbose messages primarily of \n"
"interest to Tor developers."
msgstr ""
msgctxt "MessageLog"
-msgid ""
-"Cannot write file %1\n"
+msgid "Cannot write file %1\n"
"\n"
"%2."
msgstr ""
@@ -2558,19 +2357,23 @@ msgid "Ctrl+F"
msgstr "Ctrl+F"
msgctxt "NetworkPage"
+msgid "Invalid Bridge"
+msgstr "不正なブリッジ"
+
+msgctxt "NetworkPage"
+msgid "The specified bridge identifier is not valid."
+msgstr "指定されたブリッジ識別子は有効ではありません。"
+
+msgctxt "NetworkPage"
msgid "Copy (Ctrl+C)"
msgstr "コピー (Ctrl+C)"
msgctxt "NetworkPage"
-msgid ""
-"You must specify both an IP address or hostname and a port number to "
-"configure Tor to use a proxy to access the Internet."
+msgid "You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet."
msgstr "インターネットのアクセスにプロキシを使用するには Tor の構成へ IP アドレスまたはホスト名とポート番号を両方指定する必要があります。"
msgctxt "NetworkPage"
-msgid ""
-"You must specify one or more ports to which your firewall allows you to "
-"connect."
+msgid "You must specify one or more ports to which your firewall allows you to connect."
msgstr "ファイアウォールが接続を許可する 1 つより多くのポートを指定する必要があります。"
msgctxt "NetworkPage"
@@ -2590,10 +2393,18 @@ msgid "Proxy Settings"
msgstr "プロキシの設定"
msgctxt "NetworkPage"
+msgid "HTTP Proxy:"
+msgstr "HTTP プロキシ:"
+
+msgctxt "NetworkPage"
msgid "Username:"
msgstr "ユーザー名:"
msgctxt "NetworkPage"
+msgid "Use this proxy for HTTPS also"
+msgstr "HTTPS にもこのプロキシを使用する"
+
+msgctxt "NetworkPage"
msgid "Password:"
msgstr "パスワード:"
@@ -2622,9 +2433,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 ""
msgctxt "NetworkPage"
@@ -2633,13 +2442,21 @@ msgstr "ISP は Tor ネットワークへの接続をブロックする"
msgctxt "NetworkPage"
msgid "Bridge Settings"
-msgstr "ブリッジの設定"
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "The Tor software you are currently running does not support bridges. <br>Directory connections will still be encrypted."
+msgstr ""
msgctxt "NetworkPage"
msgid "Add a Bridge:"
msgstr "ブリッジの追加:"
msgctxt "NetworkPage"
+msgid "<a href=\"bridges.finding\">How do I find a bridge?</a>"
+msgstr "<a href=\"bridges.finding\">ブリッジを見つけるには?</a>"
+
+msgctxt "NetworkPage"
msgid "Remove the selected bridges from the list"
msgstr "一覧から選択されたブリッジを削除します"
@@ -2649,7 +2466,7 @@ msgstr "クリップボードへ選択されたブリッジをコピーします
msgctxt "NetworkPage"
msgid "Find Bridges Now"
-msgstr "ブリッジを検索します"
+msgstr ""
msgctxt "NetworkPage"
msgid "<a href=\"bridges.finding\">How else can I find bridges?</a>"
@@ -2657,44 +2474,14 @@ msgstr ""
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 ""
-
-msgctxt "NetworkPage"
-msgid "You must select the proxy type."
-msgstr ""
-
-msgctxt "NetworkPage"
-msgid "SOCKS 4"
-msgstr ""
-
-msgctxt "NetworkPage"
-msgid "SOCKS 5"
msgstr ""
msgctxt "NetworkPage"
-msgid "HTTP / HTTPS"
+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 "You must specify one or more bridges."
+msgid "Click Help to see other methods of finding new bridges."
msgstr ""
msgctxt "Policy"
@@ -2763,11 +2550,11 @@ msgstr "不明"
msgctxt "RouterInfoDialog"
msgid "Relay Details"
-msgstr "リレー詳細"
+msgstr ""
msgctxt "RouterInfoDialog"
msgid "Summary"
-msgstr "概要"
+msgstr ""
msgctxt "RouterInfoDialog"
msgid "Name:"
@@ -2850,15 +2637,11 @@ msgid "Bridge Support Unavailable"
msgstr "ブリッジ サポートが利用できません"
msgctxt "ServerPage"
-msgid ""
-"You have configured Tor to act as a bridge relay for censored users, but "
-"your version of Tor does not support bridges."
+msgid "You have configured Tor to act as a bridge relay for censored users, but your version of Tor does not support bridges."
msgstr "検閲されたユーザーのブリッジ リレーとなるよう Tor を構成していますが、Tor のバージョンがブリッジをサポートしません。"
msgctxt "ServerPage"
-msgid ""
-"Please upgrade your Tor software or configure Tor to act as a normal Tor "
-"relay."
+msgid "Please upgrade your Tor software or configure Tor to act as a normal Tor relay."
msgstr "Tor ソフトウェアをアップグレードするか通常の Tor リレーとなるよう Tor を構成してください。"
msgctxt "ServerPage"
@@ -2874,6 +2657,10 @@ msgid "Run as a client only"
msgstr ""
msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network"
+msgstr "Tor ネットワークのトラフィックをリレーする"
+
+msgctxt "ServerPage"
msgid "Relay Port:"
msgstr "リレーのポート:"
@@ -2922,9 +2709,7 @@ msgid "Basic Settings"
msgstr "基本設定"
msgctxt "ServerPage"
-msgid ""
-"For Internet connections with fast download speed but slow upload, please "
-"list your upload speed here."
+msgid "For Internet connections with fast download speed but slow upload, please list your upload speed here."
msgstr "高速なダウンロードの速度だが低速なアップロードのインターネット接続は、ここでアップロードの速度を記載してください。"
msgctxt "ServerPage"
@@ -2980,9 +2765,7 @@ msgid "Peak bandwidth rate limit"
msgstr "ピーク帯域幅レートの制限です"
msgctxt "ServerPage"
-msgid ""
-"Your maximum bandwidth rate must be greater than or equal to your average "
-"bandwidth rate. Both values must be at least 20 KB/s."
+msgid "Your maximum bandwidth rate must be greater than or equal to your average bandwidth rate. Both values must be at least 20 KB/s."
msgstr "帯域幅の最大レートは帯域幅の平均レート以上である必要があります。両方の値は少なくとも 20 KB/s である必要があります。"
msgctxt "ServerPage"
@@ -3042,14 +2825,11 @@ msgid "Show help topic on exit policies"
msgstr "終了ポリシーのヘルプ トピックを表示します"
msgctxt "ServerPage"
-msgid ""
-"What Internet resources should users be able to access from your relay?"
+msgid "What Internet resources should users be able to access from your relay?"
msgstr ""
msgctxt "ServerPage"
-msgid ""
-"Tor will still block some outgoing mail and file sharing applications by "
-"default to reduce spam and other abuse."
+msgid "Tor will still block some outgoing mail and file sharing applications by default to reduce spam and other abuse."
msgstr ""
msgctxt "ServerPage"
@@ -3061,8 +2841,7 @@ msgid "Let others access your bridge by giving them this line:"
msgstr "その他をこの行で与えてブリッジをアクセスさせる:"
msgctxt "ServerPage"
-msgid ""
-"This is the identity of your bridge relay that you can give to other people"
+msgid "This is the identity of your bridge relay that you can give to other people"
msgstr "これはその他の人々へ与えられるブリッジ リレーの識別です"
msgctxt "ServerPage"
@@ -3078,9 +2857,7 @@ msgid "No clients have used your relay recently."
msgstr ""
msgctxt "ServerPage"
-msgid ""
-"Leave your relay running so clients have a better chance of finding and "
-"using it."
+msgid "Leave your relay running so clients have a better chance of finding and using it."
msgstr ""
msgctxt "ServerPage"
@@ -3092,9 +2869,7 @@ msgid "Vidalia was unable to retrieve your bridge's usage history."
msgstr "Vidalia は %1 の設定を保存することができませんでした。"
msgctxt "ServerPage"
-msgid ""
-"Tor returned an improperly formatted response when Vidalia requested your "
-"bridge's usage history."
+msgid "Tor returned an improperly formatted response when Vidalia requested your bridge's usage history."
msgstr ""
msgctxt "ServerPage"
@@ -3110,28 +2885,11 @@ msgid "<a href=\"#bridgeUsage\">Who has used my bridge?</a>"
msgstr "<a href=\"bridges.finding\">ブリッジを見つけるには?</a>"
msgctxt "ServerPage"
-msgid "<a href=\"#bridgeHelp\">What's this?</a>"
-msgstr ""
-
-msgctxt "ServerPage"
-msgid "Automatically distribute my bridge address"
-msgstr ""
-
-msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network (exit relay)"
-msgstr ""
-
-msgctxt "ServerPage"
-msgid "Relay traffic inside the Tor network (non-exit relay)"
-msgstr ""
-
-msgctxt "ServerPage"
msgid "Mirror the Relay Directory"
msgstr ""
msgctxt "ServerPage"
-msgid ""
-"Email address at which you may be reached if there is a\n"
+msgid "Email address at which you may be reached if there is a\n"
"problem with your relay. You might also include your PGP or GPG fingerprint."
msgstr ""
@@ -3140,9 +2898,7 @@ msgid "Error while trying to unpublish all services"
msgstr ""
msgctxt "ServicePage"
-msgid ""
-"Please configure at least a service directory and a virtual port for each "
-"service you want to save. Remove the other ones."
+msgid "Please configure at least a service directory and a virtual port for each service you want to save. Remove the other ones."
msgstr ""
msgctxt "ServicePage"
@@ -3171,7 +2927,7 @@ msgstr ""
msgctxt "ServicePage"
msgid "Form"
-msgstr "フォーム"
+msgstr ""
msgctxt "ServicePage"
msgid "Provided Hidden Services"
@@ -3217,251 +2973,6 @@ msgctxt "ServicePage"
msgid "Created by Tor"
msgstr ""
-msgctxt "StatusEventWidget"
-msgid "Copy to Clipboard"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "The Tor Software is Running"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "You are currently running version \"%1\" of the Tor software."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "The Tor Software is not Running"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Click \"Start Tor\" in the Vidalia Control Panel to restart the Tor "
-"software. If Tor exited unexpectedly, select the \"Advanced\" tab above for "
-"details about any errors encountered."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"You are currently running version \"%1\" of the Tor software, which is no "
-"longer recommended. Please upgrade to the most recent version of the "
-"software, which may contain important security, reliability and performance "
-"fixes."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"You are currently running version \"%1\" of the Tor software, which may no "
-"longer work with the current Tor network. Please upgrade to the most recent "
-"version of the software, which may contain important security, reliability "
-"and performance fixes."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Your Tor Software is Out-of-date"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Connected to the Tor Network"
-msgstr "Tor ネットワークに接続"
-
-msgctxt "StatusEventWidget"
-msgid ""
-"We were able to successfully establish a connection to the Tor network. You "
-"can now configure your applications to use the Internet anonymously."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Tor Software Error"
-msgstr "Tor ソフトウエアのエラー"
-
-msgctxt "StatusEventWidget"
-msgid ""
-"The Tor software encountered an internal bug. Please report the following "
-"error message to the Tor developers at bugs.torproject.org: \"%1\""
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Tor has determined that your computer's clock may be set to %1 seconds in "
-"the past compared to the source \"%2\". If your clock is not correct, Tor "
-"will not be able to function. Please verify your computer displays the "
-"correct time."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Tor has determined that your computer's clock may be set to %1 seconds in "
-"the future compared to the source \"%2\". If your clock is not correct, Tor "
-"will not be able to function. Please verify your computer displays the "
-"correct time."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Your Computer's Clock is Potentially Incorrect"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"One of the applications on your computer may have attempted to make an "
-"unencrypted connection through Tor to port %1. Sending unencrypted "
-"information over the Tor network is dangerous and not recommended. For your "
-"protection, Tor has automatically closed this connection."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"One of the applications on your computer may have attempted to make an "
-"unencrypted connection through Tor to port %1. Sending unencrypted "
-"information over the Tor network is dangerous and not recommended."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Potentially Dangerous Connection!"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"One of your applications established a connection through Tor to \"%1\" "
-"using a protocol that may leak information about your destination. Please "
-"ensure you configure your applications to use only SOCKS4a or SOCKS5 with "
-"remote hostname resolution."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Unknown SOCKS Protocol"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"One of your applications tried to establish a connection through Tor using a"
-" protocol that Tor does not understand. Please ensure you configure your "
-"applications to use only SOCKS4a or SOCKS5 with remote hostname resolution."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Invalid Destination Hostname"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"One of your applications tried to establish a connection through Tor to "
-"\"%1\", which Tor does not recognize as a valid hostname. Please check your "
-"application's configuration."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "External IP Address Changed"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Tor has determined your relay's public IP address is currently %1%2. If that"
-" is not correct, please consider setting the 'Address' option in your "
-"relay's configuration."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "DNS Hijacking Detected"
-msgstr "DNSハイジャックを検出"
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Tor detected that your DNS provider is providing false responses for domains"
-" that do not exist. Some ISPs and other DNS providers, such as OpenDNS, are "
-"known to do this in order to display their own search or advertising pages."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Tor detected that your DNS provider is providing false responses for well "
-"known domains. Since clients rely on Tor network relays to provide accurate "
-"DNS repsonses, your relay will not be configured as an exit relay."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Checking Server Port Reachability"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Tor is trying to determine if your relay's server port is reachable from the"
-" Tor network by connecting to itself at %1:%2. This test could take several "
-"minutes."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Server Port Reachability Test Successful!"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Your relay's server port is reachable from the Tor network!"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Server Port Reachability Test Failed"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Your relay's server port is not reachable by other Tor clients. This can "
-"happen if you are behind a router or firewall that requires you to set up "
-"port forwarding. If %1:%2 is not your correct IP address and server port, "
-"please check your relay's configuration."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Checking Directory Port Reachability"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Tor is trying to determine if your relay's directory port is reachable from "
-"the Tor network by connecting to itself at %1:%2. This test could take "
-"several minutes."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Directory Port Reachability Test Successful!"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Your relay's directory port is reachable from the Tor network!"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Directory Port Reachability Test Failed"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Your relay's directory port is not reachable by other Tor clients. This can "
-"happen if you are behind a router or firewall that requires you to set up "
-"port forwarding. If %1:%2 is not your correct IP address and directory port,"
-" please check your relay's configuration."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Relay Descriptor Rejected"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Your relay's descriptor, which enables clients to connect to your relay, was"
-" rejected by the directory server at %1:%2. The reason given was: %3"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Your Relay is Online"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Your relay is now online and available for Tor clients to use. You should "
-"see an increase in network traffic shown by the Bandwidth Graph within a few"
-" hours as more clients learn about your relay. Thank you for contributing to"
-" the Tor network!"
-msgstr ""
-
msgctxt "Stream"
msgid "New"
msgstr "新規"
@@ -3514,71 +3025,9 @@ msgctxt "TorSettings"
msgid "Failed to hash the control password."
msgstr "コントロール パスワードのハッシュに失敗しました。"
-msgctxt "TorrcDialog"
-msgid "Editing torrc"
-msgstr "Torrcの編集"
-
-msgctxt "TorrcDialog"
-msgid ""
-"Save settings. If unchecked it will only apply settings to the current Tor "
-"instance."
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Cut"
-msgstr "切り取り"
-
-msgctxt "TorrcDialog"
-msgid "Copy"
-msgstr "コピー"
-
-msgctxt "TorrcDialog"
-msgid "Paste"
-msgstr "貼り付け"
-
-msgctxt "TorrcDialog"
-msgid "Undo"
-msgstr "戻す"
-
-msgctxt "TorrcDialog"
-msgid "Redo"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Select All"
-msgstr "全て選択"
-
-msgctxt "TorrcDialog"
-msgid "Apply all"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Apply selection only"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Error connecting to Tor"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Selection is empty. Please select some text, or check \"Apply all\""
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Error at line %1: \"%2\""
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Error"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "An error ocurred while opening torrc file"
-msgstr ""
-
msgctxt "UPNPControl"
msgid "Success"
-msgstr "成功"
+msgstr ""
msgctxt "UPNPControl"
msgid "No UPnP-enabled devices found"
@@ -3606,7 +3055,7 @@ msgstr ""
msgctxt "UPNPControl"
msgid "Unknown error"
-msgstr "不明なエラー"
+msgstr ""
msgctxt "UPNPTestDialog"
msgid "Discovering UPnP-enabled devices"
@@ -3633,15 +3082,11 @@ msgid "Testing Universal Plug & Play Support"
msgstr ""
msgctxt "UpdateProcess"
-msgid ""
-"Vidalia was unable to check for available software updates because it could "
-"not find '%1'."
+msgid "Vidalia was unable to check for available software updates because it could not find '%1'."
msgstr ""
msgctxt "UpdateProcess"
-msgid ""
-"Vidalia was unable to check for available software updates because Tor's "
-"update process exited unexpectedly."
+msgid "Vidalia was unable to check for available software updates because Tor's update process exited unexpectedly."
msgstr ""
msgctxt "UpdateProgressDialog"
@@ -3654,7 +3099,7 @@ msgstr "非表示にする"
msgctxt "UpdateProgressDialog"
msgid "Downloading updates..."
-msgstr "更新をダウンロードしています..."
+msgstr ""
msgctxt "UpdateProgressDialog"
msgid "Installing updated software..."
@@ -3690,7 +3135,7 @@ msgstr ""
msgctxt "UpdatesAvailableDialog"
msgid "Install"
-msgstr "インストール"
+msgstr ""
msgctxt "UpdatesAvailableDialog"
msgid "The following updated software packages are ready for installation:"
@@ -3797,10 +3242,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 ""
@@ -3813,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 ""
diff --git a/src/vidalia/i18n/po/jv/qt_jv.po b/src/vidalia/i18n/po/jv/qt_jv.po
index 581ea6a..625a6e3 100644
--- a/src/vidalia/i18n/po/jv/qt_jv.po
+++ b/src/vidalia/i18n/po/jv/qt_jv.po
@@ -1,11 +1,10 @@
#
-# Translators:
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-08-20 03:25+0000\n"
-"PO-Revision-Date: 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"
@@ -431,5 +430,3 @@ msgstr ""
msgctxt "QFileSystemModel"
msgid "%1 bytes"
msgstr ""
-
-
diff --git a/src/vidalia/i18n/po/jv/vidalia_jv.po b/src/vidalia/i18n/po/jv/vidalia_jv.po
index c1faf19..22b0f4e 100644
--- a/src/vidalia/i18n/po/jv/vidalia_jv.po
+++ b/src/vidalia/i18n/po/jv/vidalia_jv.po
@@ -1,18 +1,15 @@
-#
-# Translators:
+#, fuzzy
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: 2010-12-05 20:03+0000\n"
-"Last-Translator: \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: 2009-05-19 23:56+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
+"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: jv\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
"X-Generator: Vidalia ts2po 0.2\n"
msgctxt "AboutDialog"
@@ -35,13 +32,28 @@ msgctxt "AboutDialog"
msgid "Qt 4.4.2"
msgstr ""
+msgctxt "AboutDialog"
+msgid "Vidalia"
+msgstr ""
+
+msgctxt "AboutDialog"
+msgid "Tor"
+msgstr ""
+
+msgctxt "AboutDialog"
+msgid "Qt"
+msgstr ""
+
+msgctxt "AboutDialog"
+msgid "version"
+msgstr ""
+
msgctxt "AdvancedPage"
msgid "'%1' is not a valid IP address."
msgstr ""
msgctxt "AdvancedPage"
-msgid ""
-"You selected 'Password' authentication, but did not specify a password."
+msgid "You selected 'Password' authentication, but did not specify a password."
msgstr ""
msgctxt "AdvancedPage"
@@ -81,6 +93,10 @@ msgid "Vidalia was unable to install the Tor service."
msgstr ""
msgctxt "AdvancedPage"
+msgid "Control Port"
+msgstr ""
+
+msgctxt "AdvancedPage"
msgid "Authentication:"
msgstr ""
@@ -137,68 +153,7 @@ msgid "Select the directory used to store data for the Tor software"
msgstr ""
msgctxt "AdvancedPage"
-msgid "Tor Control"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "Use TCP connection (ControlPort)"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "Path:"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "Use Unix domain socket (ControlSocket)"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "Edit current torrc"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "NOTE: this will edit the currently loaded torrc"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "ControlSocket path doesn't exist."
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid ""
-"The specified Tor configuration file location contains characters that "
-"cannot be represented in your system's current 8-bit character encoding."
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid ""
-"The specified Tor data directory location contains characters that cannot be"
-" represented in your system's current 8-bit character encoding."
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "Warning"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "You changed torrc path, would you like to restart Tor?"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "Tor Configuration File (torrc);;All Files (*)"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "Select a file to use for Tor socket path"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "Configure ControlPort automatically"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid ""
-"Vidalia was unable to remove the Tor service.\n"
+msgid "Vidalia was unable to remove the Tor service.\n"
"\n"
"You may need to remove it manually."
msgstr ""
@@ -440,9 +395,7 @@ msgid "Remember my password"
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid ""
-"Vidalia has connected to a running Tor process that requires a password. "
-"Please enter your control password:"
+msgid "Vidalia has connected to a running Tor process that requires a password. Please enter your control password:"
msgstr ""
msgctxt "ControlSocket"
@@ -1158,10 +1111,6 @@ msgid "Zimbabwe"
msgstr ""
msgctxt "CountryInfo"
-msgid "Zaire"
-msgstr ""
-
-msgctxt "CountryInfo"
msgid "Albania"
msgstr ""
@@ -1257,55 +1206,6 @@ msgctxt "CountryInfo"
msgid "Taiwan"
msgstr ""
-msgctxt "CrashReportDialog"
-msgid "Submit a Crash Report"
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid "Vidalia encountered an error and needed to close"
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid "Restart Vidalia"
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid "Don't Restart"
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid "Unable to restart Vidalia"
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid ""
-"We were unable to automatically restart Vidalia. Please restart Vidalia "
-"manually."
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid "Please fill a ticket in:"
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid ""
-"<a "
-"href=\"https://trac.torproject.org/projects/tor/newticket\">https://trac.torproject.org/projects/tor/newticket</a>"
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid ""
-"A crash report has been created that you can send to the Vidalia developers "
-"to help identify and fix the problem. The submitted report does not contain "
-"any personally identifying information."
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid ""
-"with a description of what you were doing before the application crashed, "
-"along with the following files corresponding to the crash report:"
-msgstr ""
-
msgctxt "GeneralPage"
msgid "Executables (*.exe)"
msgstr ""
@@ -1323,6 +1223,10 @@ msgid "You must specify the name of your Tor executable."
msgstr ""
msgctxt "GeneralPage"
+msgid "The proxy arguments specified are not properly formatted."
+msgstr ""
+
+msgctxt "GeneralPage"
msgid "Start Vidalia when my system starts"
msgstr ""
@@ -1519,10 +1423,7 @@ msgid "Opening External Link"
msgstr ""
msgctxt "HelpTextBrowser"
-msgid ""
-"Vidalia can open the link you selected in your default Web browser. If your "
-"browser is not currently configured to use Tor then the request will not be "
-"anonymous."
+msgid "Vidalia can open the link you selected in your default Web browser. If your browser is not currently configured to use Tor then the request will not be anonymous."
msgstr ""
msgctxt "HelpTextBrowser"
@@ -1534,9 +1435,7 @@ msgid "Unable to Open Link"
msgstr ""
msgctxt "HelpTextBrowser"
-msgid ""
-"Vidalia was unable to open the selected link in your Web browser. You can "
-"still copy the URL and paste it into your browser."
+msgid "Vidalia was unable to open the selected link in your Web browser. You can still copy the URL and paste it into your browser."
msgstr ""
msgctxt "HelpTextBrowser"
@@ -1579,30 +1478,6 @@ msgctxt "LogEvent"
msgid "Unknown"
msgstr ""
-msgctxt "LogTreeItem"
-msgid "Debug"
-msgstr ""
-
-msgctxt "LogTreeItem"
-msgid "Info"
-msgstr ""
-
-msgctxt "LogTreeItem"
-msgid "Notice"
-msgstr ""
-
-msgctxt "LogTreeItem"
-msgid "Warning"
-msgstr ""
-
-msgctxt "LogTreeItem"
-msgid "Error"
-msgstr ""
-
-msgctxt "LogTreeItem"
-msgid "Unknown"
-msgstr ""
-
msgctxt "MainWindow"
msgid "Start Tor"
msgstr ""
@@ -1816,9 +1691,7 @@ msgid "Error Starting Tor"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Vidalia was unable to start Tor. Check your settings to ensure the correct "
-"name and location of your Tor executable is specified."
+msgid "Vidalia was unable to start Tor. Check your settings to ensure the correct name and location of your Tor executable is specified."
msgstr ""
msgctxt "MainWindow"
@@ -1854,9 +1727,7 @@ msgid "Cookie Authentication Required"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"The Tor software requires Vidalia to send the contents of an authentication "
-"cookie, but Vidalia was unable to find one."
+msgid "The Tor software requires Vidalia to send the contents of an authentication cookie, but Vidalia was unable to find one."
msgstr ""
msgctxt "MainWindow"
@@ -1876,9 +1747,7 @@ msgid "Error Registering for Events"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Vidalia was unable to register for some events. Many of Vidalia's features "
-"may be unavailable."
+msgid "Vidalia was unable to register for some events. Many of Vidalia's features may be unavailable."
msgstr ""
msgctxt "MainWindow"
@@ -1898,9 +1767,7 @@ msgid "Tor Update Available"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended. Please visit the Tor website to download the latest version."
+msgid "The currently installed version of Tor is out of date or no longer recommended. Please visit the Tor website to download the latest version."
msgstr ""
msgctxt "MainWindow"
@@ -1908,9 +1775,7 @@ msgid "Tor website: %1"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"All subsequent connections will appear to be different than your old "
-"connections."
+msgid "All subsequent connections will appear to be different than your old connections."
msgstr ""
msgctxt "MainWindow"
@@ -2002,21 +1867,15 @@ msgid "Password Reset Failed"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Vidalia tried to reset Tor's control password, but was not able to restart "
-"the Tor software. Please check your Task Manager to ensure there are no "
-"other Tor processes running."
+msgid "Vidalia tried to reset Tor's control password, but was not able to restart the Tor software. Please check your Task Manager to ensure there are no other Tor processes running."
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended."
+msgid "The currently installed version of Tor is out of date or no longer recommended."
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Would you like to check if a newer package is available for installation?"
+msgid "Would you like to check if a newer package is available for installation?"
msgstr ""
msgctxt "MainWindow"
@@ -2024,9 +1883,11 @@ msgid "Potentially Unsafe Connection"
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 ""
msgctxt "MainWindow"
@@ -2038,9 +1899,7 @@ msgid "Your software is up to date"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"There are no new Tor software packages available for your computer at this "
-"time."
+msgid "There are no new Tor software packages available for your computer at this time."
msgstr ""
msgctxt "MainWindow"
@@ -2056,52 +1915,52 @@ msgid "The following error occurred:"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Anything sent over this connection could be monitored. Please check your "
-"application's configuration and use only encrypted protocols, such as SSL, "
-"if possible."
-msgstr ""
-
-msgctxt "MainWindow"
msgid "failed (%1)"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
+msgid "Your relay is shutting down.\n"
"Click 'Stop' again to stop your relay now."
msgstr ""
msgctxt "MainWindow"
-msgid "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 ""
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 ""
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 ""
+
+msgctxt "MainWindow"
+msgid "File"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "About Vidalia"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Home"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Check For Updates"
msgstr ""
msgctxt "MessageLog"
@@ -2345,68 +2204,50 @@ 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"
+msgid "Always Save New Log Messages"
msgstr ""
msgctxt "MessageLog"
-msgid "Tor Status"
+msgid "Browse"
msgstr ""
msgctxt "MessageLog"
-msgid "Advanced"
+msgid "Enable automatically saving all new log messages to a file"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
+msgid "Automatically save new log messages to a file"
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 ""
msgctxt "MessageLog"
-msgid ""
-"Messages that only appear when \n"
+msgid "Messages that only appear when \n"
"something has gone wrong with Tor."
msgstr ""
msgctxt "MessageLog"
-msgid ""
-"Messages that appear infrequently \n"
+msgid "Messages that appear infrequently \n"
"during normal Tor operation and are \n"
"not considered errors, but you may \n"
"care about."
msgstr ""
msgctxt "MessageLog"
-msgid ""
-"Messages that appear frequently \n"
+msgid "Messages that appear frequently \n"
"during normal Tor operation."
msgstr ""
msgctxt "MessageLog"
-msgid ""
-"Hyper-verbose messages primarily of \n"
+msgid "Hyper-verbose messages primarily of \n"
"interest to Tor developers."
msgstr ""
msgctxt "MessageLog"
-msgid ""
-"Cannot write file %1\n"
+msgid "Cannot write file %1\n"
"\n"
"%2."
msgstr ""
@@ -2528,15 +2369,11 @@ msgid "Copy (Ctrl+C)"
msgstr ""
msgctxt "NetworkPage"
-msgid ""
-"You must specify both an IP address or hostname and a port number to "
-"configure Tor to use a proxy to access the Internet."
+msgid "You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet."
msgstr ""
msgctxt "NetworkPage"
-msgid ""
-"You must specify one or more ports to which your firewall allows you to "
-"connect."
+msgid "You must specify one or more ports to which your firewall allows you to connect."
msgstr ""
msgctxt "NetworkPage"
@@ -2556,10 +2393,18 @@ msgid "Proxy Settings"
msgstr ""
msgctxt "NetworkPage"
+msgid "HTTP Proxy:"
+msgstr ""
+
+msgctxt "NetworkPage"
msgid "Username:"
msgstr ""
msgctxt "NetworkPage"
+msgid "Use this proxy for HTTPS also"
+msgstr ""
+
+msgctxt "NetworkPage"
msgid "Password:"
msgstr ""
@@ -2588,9 +2433,7 @@ msgid "80, 443"
msgstr ""
msgctxt "NetworkPage"
-msgid ""
-"Check to encrypt directory requests and, optionally, use bridge relays to "
-"access the Tor network"
+msgid "Check to encrypt directory requests and, optionally, use bridge relays to access the Tor network"
msgstr ""
msgctxt "NetworkPage"
@@ -2602,10 +2445,18 @@ msgid "Bridge Settings"
msgstr ""
msgctxt "NetworkPage"
+msgid "The Tor software you are currently running does not support bridges. <br>Directory connections will still be encrypted."
+msgstr ""
+
+msgctxt "NetworkPage"
msgid "Add a Bridge:"
msgstr ""
msgctxt "NetworkPage"
+msgid "<a href=\"bridges.finding\">How do I find a bridge?</a>"
+msgstr ""
+
+msgctxt "NetworkPage"
msgid "Remove the selected bridges from the list"
msgstr ""
@@ -2626,43 +2477,13 @@ msgid "<a href=\"bridges.finding\">How can I find bridges?</a>"
msgstr ""
msgctxt "NetworkPage"
-msgid ""
-"No new bridges are currently available. You can either wait a while and try "
-"again, or try another method of finding new bridges."
+msgid "No new bridges are currently available. You can either wait a while and try again, or try another method of finding new bridges."
msgstr ""
msgctxt "NetworkPage"
msgid "Click Help to see other methods of finding new bridges."
msgstr ""
-msgctxt "NetworkPage"
-msgid "Address:"
-msgstr ""
-
-msgctxt "NetworkPage"
-msgid "Type:"
-msgstr ""
-
-msgctxt "NetworkPage"
-msgid "You must select the proxy type."
-msgstr ""
-
-msgctxt "NetworkPage"
-msgid "SOCKS 4"
-msgstr ""
-
-msgctxt "NetworkPage"
-msgid "SOCKS 5"
-msgstr ""
-
-msgctxt "NetworkPage"
-msgid "HTTP"
-msgstr ""
-
-msgctxt "NetworkPage"
-msgid "HTTP / HTTPS"
-msgstr ""
-
msgctxt "Policy"
msgid "accept"
msgstr ""
@@ -2816,15 +2637,11 @@ msgid "Bridge Support Unavailable"
msgstr ""
msgctxt "ServerPage"
-msgid ""
-"You have configured Tor to act as a bridge relay for censored users, but "
-"your version of Tor does not support bridges."
+msgid "You have configured Tor to act as a bridge relay for censored users, but your version of Tor does not support bridges."
msgstr ""
msgctxt "ServerPage"
-msgid ""
-"Please upgrade your Tor software or configure Tor to act as a normal Tor "
-"relay."
+msgid "Please upgrade your Tor software or configure Tor to act as a normal Tor relay."
msgstr ""
msgctxt "ServerPage"
@@ -2892,9 +2709,7 @@ msgid "Basic Settings"
msgstr ""
msgctxt "ServerPage"
-msgid ""
-"For Internet connections with fast download speed but slow upload, please "
-"list your upload speed here."
+msgid "For Internet connections with fast download speed but slow upload, please list your upload speed here."
msgstr ""
msgctxt "ServerPage"
@@ -2950,9 +2765,7 @@ msgid "Peak bandwidth rate limit"
msgstr ""
msgctxt "ServerPage"
-msgid ""
-"Your maximum bandwidth rate must be greater than or equal to your average "
-"bandwidth rate. Both values must be at least 20 KB/s."
+msgid "Your maximum bandwidth rate must be greater than or equal to your average bandwidth rate. Both values must be at least 20 KB/s."
msgstr ""
msgctxt "ServerPage"
@@ -3012,14 +2825,11 @@ msgid "Show help topic on exit policies"
msgstr ""
msgctxt "ServerPage"
-msgid ""
-"What Internet resources should users be able to access from your relay?"
+msgid "What Internet resources should users be able to access from your relay?"
msgstr ""
msgctxt "ServerPage"
-msgid ""
-"Tor will still block some outgoing mail and file sharing applications by "
-"default to reduce spam and other abuse."
+msgid "Tor will still block some outgoing mail and file sharing applications by default to reduce spam and other abuse."
msgstr ""
msgctxt "ServerPage"
@@ -3031,8 +2841,7 @@ msgid "Let others access your bridge by giving them this line:"
msgstr ""
msgctxt "ServerPage"
-msgid ""
-"This is the identity of your bridge relay that you can give to other people"
+msgid "This is the identity of your bridge relay that you can give to other people"
msgstr ""
msgctxt "ServerPage"
@@ -3048,9 +2857,7 @@ msgid "No clients have used your relay recently."
msgstr ""
msgctxt "ServerPage"
-msgid ""
-"Leave your relay running so clients have a better chance of finding and "
-"using it."
+msgid "Leave your relay running so clients have a better chance of finding and using it."
msgstr ""
msgctxt "ServerPage"
@@ -3062,9 +2869,7 @@ msgid "Vidalia was unable to retrieve your bridge's usage history."
msgstr ""
msgctxt "ServerPage"
-msgid ""
-"Tor returned an improperly formatted response when Vidalia requested your "
-"bridge's usage history."
+msgid "Tor returned an improperly formatted response when Vidalia requested your bridge's usage history."
msgstr ""
msgctxt "ServerPage"
@@ -3080,20 +2885,11 @@ msgid "<a href=\"#bridgeUsage\">Who has used my bridge?</a>"
msgstr ""
msgctxt "ServerPage"
-msgid "<a href=\"#bridgeHelp\">What's this?</a>"
-msgstr ""
-
-msgctxt "ServerPage"
-msgid "Automatically distribute my bridge address"
-msgstr ""
-
-msgctxt "ServerPage"
msgid "Mirror the Relay Directory"
msgstr ""
msgctxt "ServerPage"
-msgid ""
-"Email address at which you may be reached if there is a\n"
+msgid "Email address at which you may be reached if there is a\n"
"problem with your relay. You might also include your PGP or GPG fingerprint."
msgstr ""
@@ -3102,9 +2898,7 @@ msgid "Error while trying to unpublish all services"
msgstr ""
msgctxt "ServicePage"
-msgid ""
-"Please configure at least a service directory and a virtual port for each "
-"service you want to save. Remove the other ones."
+msgid "Please configure at least a service directory and a virtual port for each service you want to save. Remove the other ones."
msgstr ""
msgctxt "ServicePage"
@@ -3179,251 +2973,6 @@ msgctxt "ServicePage"
msgid "Created by Tor"
msgstr ""
-msgctxt "StatusEventWidget"
-msgid "Copy to Clipboard"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "The Tor Software is Running"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "You are currently running version \"%1\" of the Tor software."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "The Tor Software is not Running"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Click \"Start Tor\" in the Vidalia Control Panel to restart the Tor "
-"software. If Tor exited unexpectedly, select the \"Advanced\" tab above for "
-"details about any errors encountered."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"You are currently running version \"%1\" of the Tor software, which is no "
-"longer recommended. Please upgrade to the most recent version of the "
-"software, which may contain important security, reliability and performance "
-"fixes."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"You are currently running version \"%1\" of the Tor software, which may no "
-"longer work with the current Tor network. Please upgrade to the most recent "
-"version of the software, which may contain important security, reliability "
-"and performance fixes."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Your Tor Software is Out-of-date"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Connected to the Tor Network"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"We were able to successfully establish a connection to the Tor network. You "
-"can now configure your applications to use the Internet anonymously."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Tor Software Error"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"The Tor software encountered an internal bug. Please report the following "
-"error message to the Tor developers at bugs.torproject.org: \"%1\""
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Tor has determined that your computer's clock may be set to %1 seconds in "
-"the past compared to the source \"%2\". If your clock is not correct, Tor "
-"will not be able to function. Please verify your computer displays the "
-"correct time."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Tor has determined that your computer's clock may be set to %1 seconds in "
-"the future compared to the source \"%2\". If your clock is not correct, Tor "
-"will not be able to function. Please verify your computer displays the "
-"correct time."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Your Computer's Clock is Potentially Incorrect"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"One of the applications on your computer may have attempted to make an "
-"unencrypted connection through Tor to port %1. Sending unencrypted "
-"information over the Tor network is dangerous and not recommended. For your "
-"protection, Tor has automatically closed this connection."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"One of the applications on your computer may have attempted to make an "
-"unencrypted connection through Tor to port %1. Sending unencrypted "
-"information over the Tor network is dangerous and not recommended."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Potentially Dangerous Connection!"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"One of your applications established a connection through Tor to \"%1\" "
-"using a protocol that may leak information about your destination. Please "
-"ensure you configure your applications to use only SOCKS4a or SOCKS5 with "
-"remote hostname resolution."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Unknown SOCKS Protocol"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"One of your applications tried to establish a connection through Tor using a"
-" protocol that Tor does not understand. Please ensure you configure your "
-"applications to use only SOCKS4a or SOCKS5 with remote hostname resolution."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Invalid Destination Hostname"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"One of your applications tried to establish a connection through Tor to "
-"\"%1\", which Tor does not recognize as a valid hostname. Please check your "
-"application's configuration."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "External IP Address Changed"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Tor has determined your relay's public IP address is currently %1%2. If that"
-" is not correct, please consider setting the 'Address' option in your "
-"relay's configuration."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "DNS Hijacking Detected"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Tor detected that your DNS provider is providing false responses for domains"
-" that do not exist. Some ISPs and other DNS providers, such as OpenDNS, are "
-"known to do this in order to display their own search or advertising pages."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Tor detected that your DNS provider is providing false responses for well "
-"known domains. Since clients rely on Tor network relays to provide accurate "
-"DNS repsonses, your relay will not be configured as an exit relay."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Checking Server Port Reachability"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Tor is trying to determine if your relay's server port is reachable from the"
-" Tor network by connecting to itself at %1:%2. This test could take several "
-"minutes."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Server Port Reachability Test Successful!"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Your relay's server port is reachable from the Tor network!"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Server Port Reachability Test Failed"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Your relay's server port is not reachable by other Tor clients. This can "
-"happen if you are behind a router or firewall that requires you to set up "
-"port forwarding. If %1:%2 is not your correct IP address and server port, "
-"please check your relay's configuration."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Checking Directory Port Reachability"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Tor is trying to determine if your relay's directory port is reachable from "
-"the Tor network by connecting to itself at %1:%2. This test could take "
-"several minutes."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Directory Port Reachability Test Successful!"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Your relay's directory port is reachable from the Tor network!"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Directory Port Reachability Test Failed"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Your relay's directory port is not reachable by other Tor clients. This can "
-"happen if you are behind a router or firewall that requires you to set up "
-"port forwarding. If %1:%2 is not your correct IP address and directory port,"
-" please check your relay's configuration."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Relay Descriptor Rejected"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Your relay's descriptor, which enables clients to connect to your relay, was"
-" rejected by the directory server at %1:%2. The reason given was: %3"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Your Relay is Online"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Your relay is now online and available for Tor clients to use. You should "
-"see an increase in network traffic shown by the Bandwidth Graph within a few"
-" hours as more clients learn about your relay. Thank you for contributing to"
-" the Tor network!"
-msgstr ""
-
msgctxt "Stream"
msgid "New"
msgstr ""
@@ -3476,68 +3025,6 @@ msgctxt "TorSettings"
msgid "Failed to hash the control password."
msgstr ""
-msgctxt "TorrcDialog"
-msgid "Editing torrc"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid ""
-"Save settings. If unchecked it will only apply settings to the current Tor "
-"instance."
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Cut"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Copy"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Paste"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Undo"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Redo"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Select All"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Apply all"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Apply selection only"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Error connecting to Tor"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Selection is empty. Please select some text, or check \"Apply all\""
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Error at line %1: \"%2\""
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Error"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "An error ocurred while opening torrc file"
-msgstr ""
-
msgctxt "UPNPControl"
msgid "Success"
msgstr ""
@@ -3595,15 +3082,11 @@ msgid "Testing Universal Plug & Play Support"
msgstr ""
msgctxt "UpdateProcess"
-msgid ""
-"Vidalia was unable to check for available software updates because it could "
-"not find '%1'."
+msgid "Vidalia was unable to check for available software updates because it could not find '%1'."
msgstr ""
msgctxt "UpdateProcess"
-msgid ""
-"Vidalia was unable to check for available software updates because Tor's "
-"update process exited unexpectedly."
+msgid "Vidalia was unable to check for available software updates because Tor's update process exited unexpectedly."
msgstr ""
msgctxt "UpdateProgressDialog"
@@ -3759,10 +3242,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 ""
@@ -3775,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 ""
@@ -3812,5 +3290,3 @@ msgstr ""
msgctxt "stringutil.h"
msgid "%1 mins"
msgstr ""
-
-
diff --git a/src/vidalia/i18n/po/ka/qt_ka.po b/src/vidalia/i18n/po/ka/qt_ka.po
index 6fb4a0e..0304b2e 100644
--- a/src/vidalia/i18n/po/ka/qt_ka.po
+++ b/src/vidalia/i18n/po/ka/qt_ka.po
@@ -1,11 +1,10 @@
#
-# Translators:
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-08-20 03:25+0000\n"
-"PO-Revision-Date: 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"
@@ -431,5 +430,3 @@ msgstr ""
msgctxt "QFileSystemModel"
msgid "%1 bytes"
msgstr ""
-
-
diff --git a/src/vidalia/i18n/po/ka/vidalia_ka.po b/src/vidalia/i18n/po/ka/vidalia_ka.po
index ba7877f..cd31a6d 100755
--- a/src/vidalia/i18n/po/ka/vidalia_ka.po
+++ b/src/vidalia/i18n/po/ka/vidalia_ka.po
@@ -1,3816 +1,2682 @@
-#
-# Translators:
+#, fuzzy
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: 2010-12-05 20:03+0000\n"
-"Last-Translator: \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: 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: ka\n"
-"Plural-Forms: nplurals=1; plural=0\n"
"X-Generator: Vidalia ts2po 0.2\n"
+#: aboutdialog.ui:16
msgctxt "AboutDialog"
msgid "About Vidalia"
msgstr ""
+#: aboutdialog.ui:53
msgctxt "AboutDialog"
-msgid "License"
+msgid "Vidalia"
+msgstr ""
+
+#: aboutdialog.ui:88
+msgctxt "AboutDialog"
+msgid "Qt"
+msgstr ""
+
+#: aboutdialog.ui:69
+msgctxt "AboutDialog"
+msgid "Tor"
+msgstr ""
+
+#: aboutdialog.cpp:53
+msgctxt "AboutDialog"
+msgid "Unavailable"
+msgstr ""
+
+#: aboutdialog.cpp:57
+msgctxt "AboutDialog"
+msgid "Not Running"
+msgstr ""
+
+#: aboutdialog.ui:81
+msgctxt "AboutDialog"
+msgid "0.2.0"
+msgstr ""
+
+#: aboutdialog.ui:106
+msgctxt "AboutDialog"
+msgid "0.2.0.31-alpha-dev (r123456)"
msgstr ""
+#: aboutdialog.ui:131
msgctxt "AboutDialog"
-msgid "Vidalia 0.2.0"
+msgid "4.4.2"
msgstr ""
+#: aboutdialog.ui:107
msgctxt "AboutDialog"
-msgid "Tor 0.2.0.32"
+msgid "License"
msgstr ""
+#: aboutdialog.ui:163
msgctxt "AboutDialog"
-msgid "Qt 4.4.2"
+msgid "version"
msgstr ""
+#: advancedpage.cpp:109
msgctxt "AdvancedPage"
msgid "'%1' is not a valid IP address."
msgstr ""
+#: advancedpage.cpp:120
msgctxt "AdvancedPage"
-msgid ""
-"You selected 'Password' authentication, but did not specify a password."
+msgid "You selected 'Password' authentication, but did not specify a password."
msgstr ""
+#: advancedpage.cpp:223
msgctxt "AdvancedPage"
msgid "Select Tor Configuration File"
msgstr ""
+#: advancedpage.cpp:236
msgctxt "AdvancedPage"
msgid "File Not Found"
msgstr ""
+#: advancedpage.cpp:238
msgctxt "AdvancedPage"
msgid "%1 does not exist. Would you like to create it?"
msgstr ""
+#: advancedpage.cpp:249
msgctxt "AdvancedPage"
msgid "Failed to Create File"
msgstr ""
+#: advancedpage.cpp:250
msgctxt "AdvancedPage"
msgid "Unable to create %1 [%2]"
msgstr ""
+#: advancedpage.cpp:265
msgctxt "AdvancedPage"
msgid "Select a Directory to Use for Tor Data"
msgstr ""
+#: advancedpage.cpp:287
msgctxt "AdvancedPage"
msgid "Unable to remove Tor Service"
msgstr ""
+#: advancedpage.cpp:289
+msgctxt "AdvancedPage"
+msgid "Vidalia was unable to remove the Tor service."
+""
+"You may need to remove it manually."
+msgstr ""
+
+#: advancedpage.cpp:298
msgctxt "AdvancedPage"
msgid "Unable to install Tor Service"
msgstr ""
+#: advancedpage.cpp:299
msgctxt "AdvancedPage"
msgid "Vidalia was unable to install the Tor service."
msgstr ""
+#: advancedpage.ui:28
+msgctxt "AdvancedPage"
+msgid "Control Port"
+msgstr ""
+
+#: advancedpage.ui:48
msgctxt "AdvancedPage"
msgid "Authentication:"
msgstr ""
+#: advancedpage.ui:58
msgctxt "AdvancedPage"
msgid "Address:"
msgstr ""
+#: advancedpage.ui:86
msgctxt "AdvancedPage"
msgid "None"
msgstr ""
+#: advancedpage.ui:91
msgctxt "AdvancedPage"
msgid "Cookie"
msgstr ""
+#: advancedpage.ui:96
msgctxt "AdvancedPage"
msgid "Password"
msgstr ""
+#: advancedpage.ui:111
msgctxt "AdvancedPage"
msgid "Randomly Generate"
msgstr ""
+#: advancedpage.ui:157
msgctxt "AdvancedPage"
msgid ":"
msgstr ""
+#: advancedpage.ui:219
msgctxt "AdvancedPage"
msgid "Tor Configuration File"
msgstr ""
+#: advancedpage.ui:240
msgctxt "AdvancedPage"
msgid "Start the Tor software with the specified configuration file (torrc)"
msgstr ""
+#: advancedpage.ui:259
msgctxt "AdvancedPage"
msgid "Select path to your configuration file"
msgstr ""
+#: advancedpage.ui:318
msgctxt "AdvancedPage"
msgid "Browse"
msgstr ""
+#: advancedpage.ui:275
msgctxt "AdvancedPage"
msgid "Data Directory"
msgstr ""
+#: advancedpage.ui:296
msgctxt "AdvancedPage"
msgid "Store data for the Tor software in the following directory"
msgstr ""
+#: advancedpage.ui:315
msgctxt "AdvancedPage"
msgid "Select the directory used to store data for the Tor software"
msgstr ""
-msgctxt "AdvancedPage"
-msgid "Tor Control"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "Use TCP connection (ControlPort)"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "Path:"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "Use Unix domain socket (ControlSocket)"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "Edit current torrc"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "NOTE: this will edit the currently loaded torrc"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "ControlSocket path doesn't exist."
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid ""
-"The specified Tor configuration file location contains characters that "
-"cannot be represented in your system's current 8-bit character encoding."
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid ""
-"The specified Tor data directory location contains characters that cannot be"
-" represented in your system's current 8-bit character encoding."
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "Warning"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "You changed torrc path, would you like to restart Tor?"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "Tor Configuration File (torrc);;All Files (*)"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "Select a file to use for Tor socket path"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "Configure ControlPort automatically"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid ""
-"Vidalia was unable to remove the Tor service.\n"
-"\n"
-"You may need to remove it manually."
-msgstr ""
-
+#: appearancepage.ui:22
msgctxt "AppearancePage"
msgid "Language"
msgstr ""
+#: appearancepage.ui:37
msgctxt "AppearancePage"
msgid "Choose the language used in Vidalia"
msgstr ""
+#: appearancepage.ui:75
msgctxt "AppearancePage"
msgid "Style"
msgstr ""
+#: appearancepage.ui:103
msgctxt "AppearancePage"
msgid "Choose Vidalia's interface style"
msgstr ""
+#: appearancepage.cpp:67
msgctxt "AppearancePage"
msgid "Vidalia was unable to load the selected language translation."
msgstr ""
+#: bwgraph.cpp:166
msgctxt "BandwidthGraph"
msgid "Since:"
msgstr ""
+#: bwgraph.cpp:232
msgctxt "BandwidthGraph"
msgid "Hide Settings"
msgstr ""
+#: bwgraph.ui:40
msgctxt "BandwidthGraph"
msgid "Show Settings"
msgstr ""
+#: bwgraph.ui:16
msgctxt "BandwidthGraph"
msgid "Tor Bandwidth Usage"
msgstr ""
+#: bwgraph.ui:63
msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
+#: bwgraph.ui:151
msgctxt "BandwidthGraph"
msgid "Receive Rate"
msgstr ""
+#: bwgraph.ui:170
msgctxt "BandwidthGraph"
msgid "Send Rate"
msgstr ""
+#: bwgraph.ui:183
msgctxt "BandwidthGraph"
msgid "Always on Top"
msgstr ""
+#: bwgraph.ui:234
msgctxt "BandwidthGraph"
msgid "Style"
msgstr ""
+#: bwgraph.ui:284
msgctxt "BandwidthGraph"
msgid "Changes the transparency of the Bandwidth Graph"
msgstr ""
+#: bwgraph.ui:368
msgctxt "BandwidthGraph"
msgid "100"
msgstr ""
+#: bwgraph.ui:383
msgctxt "BandwidthGraph"
msgid "% Opaque"
msgstr ""
+#: bwgraph.ui:443
msgctxt "BandwidthGraph"
msgid "Save"
msgstr ""
+#: bwgraph.ui:450
msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
-msgctxt "BridgeDownloader"
-msgid "Starting HTTPS bridge request..."
-msgstr ""
-
-msgctxt "BridgeDownloader"
-msgid "Connecting to %1:%2..."
-msgstr ""
-
-msgctxt "BridgeDownloader"
-msgid "Sending an HTTPS request for bridges..."
-msgstr ""
-
-msgctxt "BridgeDownloader"
-msgid "Downloading a list of bridges..."
-msgstr ""
-
-msgctxt "BridgeDownloaderProgressDialog"
-msgid "Downloading Bridges"
-msgstr ""
-
-msgctxt "BridgeDownloaderProgressDialog"
-msgid "Unable to download bridges: %1"
-msgstr ""
-
-msgctxt "BridgeDownloaderProgressDialog"
-msgid "Retrying bridge request..."
-msgstr ""
-
-msgctxt "BridgeUsageDialog"
-msgid "Country"
-msgstr ""
-
-msgctxt "BridgeUsageDialog"
-msgid "# Clients"
-msgstr ""
-
-msgctxt "BridgeUsageDialog"
-msgid "Clients from the following countries have used your relay since %1"
-msgstr ""
-
-msgctxt "BridgeUsageDialog"
-msgid "Bridge Usage Summary"
-msgstr ""
-
-msgctxt "BridgeUsageDialog"
-msgid "Client Summary"
-msgstr ""
-
+#: circuit.cpp:112
msgctxt "Circuit"
msgid "New"
msgstr ""
+#: circuit.cpp:113
msgctxt "Circuit"
msgid "Open"
msgstr ""
+#: circuit.cpp:114
msgctxt "Circuit"
msgid "Building"
msgstr ""
+#: circuit.cpp:115
msgctxt "Circuit"
msgid "Failed"
msgstr ""
+#: circuit.cpp:116
msgctxt "Circuit"
msgid "Closed"
msgstr ""
+#: circuit.cpp:117
msgctxt "Circuit"
msgid "Unknown"
msgstr ""
+#: circuititem.cpp:39
msgctxt "CircuitItem"
msgid "<Path Empty>"
msgstr ""
+#: circuitlistwidget.cpp:55
msgctxt "CircuitListWidget"
msgid "Connection"
msgstr ""
+#: circuitlistwidget.cpp:55
msgctxt "CircuitListWidget"
msgid "Status"
msgstr ""
+#: circuitlistwidget.cpp:87
msgctxt "CircuitListWidget"
msgid "Zoom to Circuit"
msgstr ""
+#: circuitlistwidget.cpp:89
msgctxt "CircuitListWidget"
msgid "Close Circuit (Del)"
msgstr ""
+#: circuitlistwidget.cpp:110
msgctxt "CircuitListWidget"
msgid "Close Stream (Del)"
msgstr ""
+#: configdialog.cpp:77
msgctxt "ConfigDialog"
msgid "General"
msgstr ""
+#: configdialog.cpp:81
msgctxt "ConfigDialog"
msgid "Network"
msgstr ""
+#: configdialog.cpp:85
msgctxt "ConfigDialog"
msgid "Sharing"
msgstr ""
+#: configdialog.cpp:89
msgctxt "ConfigDialog"
msgid "Services"
msgstr ""
+#: configdialog.cpp:93
msgctxt "ConfigDialog"
msgid "Appearance"
msgstr ""
+#: configdialog.cpp:97
msgctxt "ConfigDialog"
msgid "Advanced"
msgstr ""
+#: configdialog.cpp:111
msgctxt "ConfigDialog"
msgid "Help"
msgstr ""
+#: configdialog.cpp:196
msgctxt "ConfigDialog"
msgid "Error Saving Settings"
msgstr ""
+#: configdialog.cpp:198
msgctxt "ConfigDialog"
msgid "Vidalia was unable to save your %1 settings."
msgstr ""
+#: configdialog.cpp:225
msgctxt "ConfigDialog"
msgid "Error Applying Settings"
msgstr ""
+#: configdialog.cpp:227
msgctxt "ConfigDialog"
msgid "Vidalia was unable to apply your %1 settings to Tor."
msgstr ""
+#: configdialog.ui:16
msgctxt "ConfigDialog"
msgid "Settings"
msgstr ""
+#: controlconnection.cpp:134
msgctxt "ControlConnection"
msgid "Vidalia was unable to connect to Tor. (%1)"
msgstr ""
+#: controlconnection.cpp:331
msgctxt "ControlConnection"
msgid "Control socket is not connected."
msgstr ""
+#: controlpasswordinputdialog.ui:28
msgctxt "ControlPasswordInputDialog"
msgid "Password Required"
msgstr ""
+#: controlpasswordinputdialog.ui:80
msgctxt "ControlPasswordInputDialog"
-msgid "Remember my password"
+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:"
+msgid "Remember my password"
msgstr ""
+#: controlsocket.cpp:70
msgctxt "ControlSocket"
msgid "Control socket is not connected."
msgstr ""
+#: controlsocket.cpp:80
msgctxt "ControlSocket"
msgid "Error sending control command. [%1]"
msgstr ""
+#: controlsocket.cpp:117
msgctxt "ControlSocket"
msgid "Socket disconnected while attempting to read a line of data."
msgstr ""
+#: controlsocket.cpp:156
msgctxt "ControlSocket"
msgid "Invalid control reply. [%1]"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Afghanistan"
+#: generalpage.cpp:62
+msgctxt "GeneralPage"
+msgid "Executables (*.exe)"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Andorra"
+#: generalpage.cpp:75
+msgctxt "GeneralPage"
+msgid "Select Path to Tor"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Angola"
+#: generalpage.cpp:85
+msgctxt "GeneralPage"
+msgid "Select Proxy Executable"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Antigua & Barbuda"
+#: generalpage.cpp:98
+msgctxt "GeneralPage"
+msgid "You must specify the name of your Tor executable."
msgstr ""
-msgctxt "CountryInfo"
-msgid "Argentina"
+#: generalpage.cpp:106
+msgctxt "GeneralPage"
+msgid "The proxy arguments specified are not properly formatted."
msgstr ""
-msgctxt "CountryInfo"
-msgid "Armenia"
+#: generalpage.ui:28
+msgctxt "GeneralPage"
+msgid "Start Vidalia when my system starts"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Australia"
+#: generalpage.ui:121
+msgctxt "GeneralPage"
+msgid "Browse"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Azerbaijan"
+#: generalpage.ui:57
+msgctxt "GeneralPage"
+msgid "Start the Tor software when Vidalia starts"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Bahamas"
+#: generalpage.ui:51
+msgctxt "GeneralPage"
+msgid "Tor"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Bangladesh"
+#: generalpage.ui:93
+msgctxt "GeneralPage"
+msgid "Proxy Application (optional)"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Barbados"
+#: generalpage.ui:99
+msgctxt "GeneralPage"
+msgid "Start a proxy application when Tor starts"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Belarus"
+#: generalpage.ui:135
+msgctxt "GeneralPage"
+msgid "Proxy Application Arguments:"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Belgium"
+#: graphframe.cpp:238
+msgctxt "GraphFrame"
+msgid "Recv: "
msgstr ""
-msgctxt "CountryInfo"
-msgid "Belize"
+#: graphframe.cpp:298
+msgctxt "GraphFrame"
+msgid "%1 KB/s"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Bhutan"
+#: graphframe.cpp:247
+msgctxt "GraphFrame"
+msgid "Sent: "
msgstr ""
-msgctxt "CountryInfo"
-msgid "Bolivia"
+#: graphframe.cpp:259
+msgctxt "GraphFrame"
+msgid "%1 KB"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Bosnia & Herzegovina"
+#: graphframe.cpp:262
+msgctxt "GraphFrame"
+msgid "%1 MB"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Botswana"
+#: graphframe.cpp:265
+msgctxt "GraphFrame"
+msgid "%1 GB"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Brazil"
+#: helpbrowser.cpp:135
+msgctxt "HelpBrowser"
+msgid "Error Loading Help Contents: "
msgstr ""
-msgctxt "CountryInfo"
-msgid "Brunei Darussalam"
+#: helpbrowser.cpp:147
+msgctxt "HelpBrowser"
+msgid "Supplied XML file is not a valid Contents document."
msgstr ""
-msgctxt "CountryInfo"
-msgid "Bulgaria"
+#: helpbrowser.cpp:396
+msgctxt "HelpBrowser"
+msgid "Search reached end of document"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Burkina Faso"
+#: helpbrowser.cpp:398
+msgctxt "HelpBrowser"
+msgid "Search reached start of document"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Burundi"
+#: helpbrowser.cpp:400
+msgctxt "HelpBrowser"
+msgid "Text not found in document"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Cambodia"
+#: helpbrowser.cpp:445
+msgctxt "HelpBrowser"
+msgid "Found %1 results"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Cameroon"
+#: helpbrowser.ui:33
+msgctxt "HelpBrowser"
+msgid "Vidalia Help"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Canada"
+#: helpbrowser.ui:484
+msgctxt "HelpBrowser"
+msgid "Back"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Cape Verde"
+#: helpbrowser.ui:487
+msgctxt "HelpBrowser"
+msgid "Move to previous page (Backspace)"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Central African Republic"
+#: helpbrowser.ui:490
+msgctxt "HelpBrowser"
+msgid "Backspace"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Chad"
+#: helpbrowser.ui:498
+msgctxt "HelpBrowser"
+msgid "Forward"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Chile"
+#: helpbrowser.ui:501
+msgctxt "HelpBrowser"
+msgid "Move to next page (Shift+Backspace)"
msgstr ""
-msgctxt "CountryInfo"
-msgid "China"
+#: helpbrowser.ui:504
+msgctxt "HelpBrowser"
+msgid "Shift+Backspace"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Colombia"
+#: helpbrowser.ui:512
+msgctxt "HelpBrowser"
+msgid "Home"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Comoros"
+#: helpbrowser.ui:515
+msgctxt "HelpBrowser"
+msgid "Move to the Home page (Ctrl+H)"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Congo, The Democratic Republic of the"
+#: helpbrowser.ui:518
+msgctxt "HelpBrowser"
+msgid "Ctrl+H"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Congo"
+#: helpbrowser.ui:535
+msgctxt "HelpBrowser"
+msgid "Find"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Costa Rica"
+#: helpbrowser.ui:538
+msgctxt "HelpBrowser"
+msgid "Search for a word or phrase on current page (Ctrl+F)"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Cote d’Ivoire"
+#: helpbrowser.ui:541
+msgctxt "HelpBrowser"
+msgid "Ctrl+F"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Croatia"
+#: helpbrowser.ui:549
+msgctxt "HelpBrowser"
+msgid "Close"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Cuba"
+#: helpbrowser.ui:552
+msgctxt "HelpBrowser"
+msgid "Close Vidalia Help"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Cyprus"
+#: helpbrowser.ui:555
+msgctxt "HelpBrowser"
+msgid "Esc"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Czech Republic"
+#: helpbrowser.ui:152
+msgctxt "HelpBrowser"
+msgid "Find:"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Denmark"
+#: helpbrowser.ui:174
+msgctxt "HelpBrowser"
+msgid "Find Previous"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Djibouti"
+#: helpbrowser.ui:187
+msgctxt "HelpBrowser"
+msgid "Find Next"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Dominica"
+#: helpbrowser.ui:221
+msgctxt "HelpBrowser"
+msgid "Case sensitive"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Dominican Republic"
+#: helpbrowser.ui:231
+msgctxt "HelpBrowser"
+msgid "Whole words only"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Ecuador"
+#: helpbrowser.ui:305
+msgctxt "HelpBrowser"
+msgid "Help Topics"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Egypt"
+#: helpbrowser.ui:260
+msgctxt "HelpBrowser"
+msgid "Contents"
msgstr ""
-msgctxt "CountryInfo"
-msgid "El Salvador"
+#: helpbrowser.ui:350
+msgctxt "HelpBrowser"
+msgid "Search"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Equatorial Guinea"
+#: helpbrowser.ui:362
+msgctxt "HelpBrowser"
+msgid "Searching for:"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Eritrea"
+#: helpbrowser.ui:405
+msgctxt "HelpBrowser"
+msgid "Found Documents"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Estonia"
+#: helptextbrowser.cpp:54
+msgctxt "HelpTextBrowser"
+msgid "Error opening help file: "
msgstr ""
-msgctxt "CountryInfo"
-msgid "France"
+#: helptextbrowser.cpp:72
+msgctxt "HelpTextBrowser"
+msgid "Opening External Link"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Gabon"
+#: 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."
msgstr ""
-msgctxt "CountryInfo"
-msgid "Gambia"
+#: helptextbrowser.cpp:78
+msgctxt "HelpTextBrowser"
+msgid "Do you want Vidalia to open the link in your Web browser?"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Georgia"
+#: helptextbrowser.cpp:88
+msgctxt "HelpTextBrowser"
+msgid "Unable to Open Link"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Germany"
+#: helptextbrowser.cpp:90
+msgctxt "HelpTextBrowser"
+msgid "Vidalia was unable to open the selected link in your Web browser. You can still copy the URL and paste it into your browser."
msgstr ""
-msgctxt "CountryInfo"
-msgid "Ghana"
+#: licensedialog.ui:13
+msgctxt "LicenseDialog"
+msgid "License Information"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Grenada"
+#: licensedialog.ui:43
+msgctxt "LicenseDialog"
+msgid "License"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Guatemala"
+#: licensedialog.ui:76
+msgctxt "LicenseDialog"
+msgid "Credits"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Guinea"
+#: logevent.cpp:57
+msgctxt "LogEvent"
+msgid "Debug"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Guinea-Bissau"
+#: logevent.cpp:58
+msgctxt "LogEvent"
+msgid "Info"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Guyana"
+#: logevent.cpp:59
+msgctxt "LogEvent"
+msgid "Notice"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Hong Kong"
+#: logevent.cpp:60
+msgctxt "LogEvent"
+msgid "Warning"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Haiti"
+#: logevent.cpp:61
+msgctxt "LogEvent"
+msgid "Error"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Honduras"
+#: logevent.cpp:62
+msgctxt "LogEvent"
+msgid "Unknown"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Israel"
+#: mainwindow.ui:233
+msgctxt "MainWindow"
+msgid "Start Tor"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Italy"
+#: mainwindow.ui:443
+msgctxt "MainWindow"
+msgid "Exit"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Jamaica"
+#: mainwindow.ui:304
+msgctxt "MainWindow"
+msgid "Bandwidth Graph"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Japan"
+#: mainwindow.ui:317
+msgctxt "MainWindow"
+msgid "Message Log"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Jordan"
+#: mainwindow.cpp:348
+msgctxt "MainWindow"
+msgid "Network Map"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Kazakhstan"
+#: mainwindow.cpp:354
+msgctxt "MainWindow"
+msgid "Control Panel"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Kenya"
+#: mainwindow.ui:380
+msgctxt "MainWindow"
+msgid "Settings"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Kiribati"
+#: mainwindow.ui:430
+msgctxt "MainWindow"
+msgid "About"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Kuwait"
+#: mainwindow.ui:367
+msgctxt "MainWindow"
+msgid "Help"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Kyrgyzstan"
+#: mainwindow.cpp:1391
+msgctxt "MainWindow"
+msgid "New Identity"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Laos"
+#: mainwindow.cpp:437
+msgctxt "MainWindow"
+msgid "Ctrl+T"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Latvia"
+#: mainwindow.cpp:438
+msgctxt "MainWindow"
+msgid "Ctrl+B"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Lebanon"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Lesotho"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Liberia"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Liechtenstein"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Lithuania"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Luxembourg"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Macedonia"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Madagascar"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Malawi"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Malaysia"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Mali"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Malta"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Marshall Islands"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Mauritania"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Mauritius"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Micronesia"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Moldova"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Monaco"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Mongolia"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Montenegro"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Morocco"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Mozambique"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Namibia"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Nauru"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Nepal"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Netherlands"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "New Zealand"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Nicaragua"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Niger"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Nigeria"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Norway"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Oman"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Pakistan"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Palau"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Palestine"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Panama"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Papua New Guinea"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Paraguay"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Peru"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Philippines"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Poland"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Portugal"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Qatar"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Romania"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Russia"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Rwanda"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Saint Kitts & Nevis"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Saint Lucia"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Saint Vincent & the Grenadines"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Samoa"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "San Marino"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Sao Tome & Principe"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Saudi Arabia"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Senegal"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Serbia"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Seychelles"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Sierra Leone"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Singapore"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Slovakia"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Slovenia"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Solomon Islands"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Somalia"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "South Africa"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Spain"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Sri Lanka"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Sudan"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Suriname"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Swaziland"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Sweden"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Switzerland"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Syria"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Tajikistan"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Tanzania"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Thailand"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Timor-Leste (East Timor)"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Togo"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Tonga"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Trinidad & Tobago"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Tunisia"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Turkey"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Turkmenistan"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Tuvalu"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Uganda"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Ukraine"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "United Arab Emirates"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "United Kingdom"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "United States"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Uruguay"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Uzbekistan"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Vanuatu"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Vatican"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Venezuela"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Vietnam"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Western Sahara"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Yemen"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Zambia"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Zimbabwe"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Zaire"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Albania"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Algeria"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Austria"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Bahrain"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Benin"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Ethiopia"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Fiji"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Finland"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Greece"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Guam"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Hungary"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Iceland"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "India"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Indonesia"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Iran"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Iraq"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Ireland"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Korea, North"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Korea, South"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Libya"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Maldives"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Mexico"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Myanmar"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Taiwan"
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid "Submit a Crash Report"
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid "Vidalia encountered an error and needed to close"
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid "Restart Vidalia"
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid "Don't Restart"
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid "Unable to restart Vidalia"
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid ""
-"We were unable to automatically restart Vidalia. Please restart Vidalia "
-"manually."
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid "Please fill a ticket in:"
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid ""
-"<a "
-"href=\"https://trac.torproject.org/projects/tor/newticket\">https://trac.torproject.org/projects/tor/newticket</a>"
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid ""
-"A crash report has been created that you can send to the Vidalia developers "
-"to help identify and fix the problem. The submitted report does not contain "
-"any personally identifying information."
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid ""
-"with a description of what you were doing before the application crashed, "
-"along with the following files corresponding to the crash report:"
-msgstr ""
-
-msgctxt "GeneralPage"
-msgid "Executables (*.exe)"
-msgstr ""
-
-msgctxt "GeneralPage"
-msgid "Select Path to Tor"
-msgstr ""
-
-msgctxt "GeneralPage"
-msgid "Select Proxy Executable"
-msgstr ""
-
-msgctxt "GeneralPage"
-msgid "You must specify the name of your Tor executable."
-msgstr ""
-
-msgctxt "GeneralPage"
-msgid "Start Vidalia when my system starts"
-msgstr ""
-
-msgctxt "GeneralPage"
-msgid "Browse"
-msgstr ""
-
-msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr ""
-
-msgctxt "GeneralPage"
-msgid "Tor"
-msgstr ""
-
-msgctxt "GeneralPage"
-msgid "Proxy Application (optional)"
-msgstr ""
-
-msgctxt "GeneralPage"
-msgid "Start a proxy application when Tor starts"
-msgstr ""
-
-msgctxt "GeneralPage"
-msgid "Proxy Application Arguments:"
-msgstr ""
-
-msgctxt "GeneralPage"
-msgid "Software Updates"
-msgstr ""
-
-msgctxt "GeneralPage"
-msgid "Check for new software updates automatically"
-msgstr ""
-
-msgctxt "GeneralPage"
-msgid "Check Now"
-msgstr ""
-
-msgctxt "GraphFrame"
-msgid "%1 KB/s"
-msgstr ""
-
-msgctxt "GraphFrame"
-msgid "%1 KB"
-msgstr ""
-
-msgctxt "GraphFrame"
-msgid "%1 MB"
-msgstr ""
-
-msgctxt "GraphFrame"
-msgid "%1 GB"
-msgstr ""
-
-msgctxt "GraphFrame"
-msgid "Recv:"
-msgstr ""
-
-msgctxt "GraphFrame"
-msgid "Sent:"
-msgstr ""
-
-msgctxt "HelpBrowser"
-msgid "Supplied XML file is not a valid Contents document."
-msgstr ""
-
-msgctxt "HelpBrowser"
-msgid "Search reached end of document"
-msgstr ""
-
-msgctxt "HelpBrowser"
-msgid "Search reached start of document"
-msgstr ""
-
-msgctxt "HelpBrowser"
-msgid "Text not found in document"
-msgstr ""
-
-msgctxt "HelpBrowser"
-msgid "Found %1 results"
-msgstr ""
-
-msgctxt "HelpBrowser"
-msgid "Vidalia Help"
-msgstr ""
-
-msgctxt "HelpBrowser"
-msgid "Back"
-msgstr ""
-
-msgctxt "HelpBrowser"
-msgid "Move to previous page (Backspace)"
-msgstr ""
-
-msgctxt "HelpBrowser"
-msgid "Backspace"
-msgstr ""
-
-msgctxt "HelpBrowser"
-msgid "Forward"
-msgstr ""
-
-msgctxt "HelpBrowser"
-msgid "Move to next page (Shift+Backspace)"
-msgstr ""
-
-msgctxt "HelpBrowser"
-msgid "Shift+Backspace"
-msgstr ""
-
-msgctxt "HelpBrowser"
-msgid "Home"
-msgstr ""
-
-msgctxt "HelpBrowser"
-msgid "Move to the Home page (Ctrl+H)"
-msgstr ""
-
-msgctxt "HelpBrowser"
-msgid "Ctrl+H"
-msgstr ""
-
-msgctxt "HelpBrowser"
-msgid "Find"
-msgstr ""
-
-msgctxt "HelpBrowser"
-msgid "Search for a word or phrase on current page (Ctrl+F)"
-msgstr ""
-
-msgctxt "HelpBrowser"
-msgid "Ctrl+F"
-msgstr ""
-
-msgctxt "HelpBrowser"
-msgid "Close"
-msgstr ""
-
-msgctxt "HelpBrowser"
-msgid "Close Vidalia Help"
-msgstr ""
-
-msgctxt "HelpBrowser"
-msgid "Esc"
-msgstr ""
-
-msgctxt "HelpBrowser"
-msgid "Find:"
-msgstr ""
-
-msgctxt "HelpBrowser"
-msgid "Find Previous"
-msgstr ""
-
-msgctxt "HelpBrowser"
-msgid "Find Next"
-msgstr ""
-
-msgctxt "HelpBrowser"
-msgid "Case sensitive"
-msgstr ""
-
-msgctxt "HelpBrowser"
-msgid "Whole words only"
-msgstr ""
-
-msgctxt "HelpBrowser"
-msgid "Help Topics"
-msgstr ""
-
-msgctxt "HelpBrowser"
-msgid "Contents"
-msgstr ""
-
-msgctxt "HelpBrowser"
-msgid "Search"
-msgstr ""
-
-msgctxt "HelpBrowser"
-msgid "Searching for:"
-msgstr ""
-
-msgctxt "HelpBrowser"
-msgid "Found Documents"
-msgstr ""
-
-msgctxt "HelpBrowser"
-msgid "Error Loading Help Contents:"
-msgstr ""
-
-msgctxt "HelpTextBrowser"
-msgid "Opening External Link"
-msgstr ""
-
-msgctxt "HelpTextBrowser"
-msgid ""
-"Vidalia can open the link you selected in your default Web browser. If your "
-"browser is not currently configured to use Tor then the request will not be "
-"anonymous."
-msgstr ""
-
-msgctxt "HelpTextBrowser"
-msgid "Do you want Vidalia to open the link in your Web browser?"
-msgstr ""
-
-msgctxt "HelpTextBrowser"
-msgid "Unable to Open Link"
-msgstr ""
-
-msgctxt "HelpTextBrowser"
-msgid ""
-"Vidalia was unable to open the selected link in your Web browser. You can "
-"still copy the URL and paste it into your browser."
-msgstr ""
-
-msgctxt "HelpTextBrowser"
-msgid "Error opening help file:"
-msgstr ""
-
-msgctxt "LicenseDialog"
-msgid "License Information"
-msgstr ""
-
-msgctxt "LicenseDialog"
-msgid "License"
-msgstr ""
-
-msgctxt "LicenseDialog"
-msgid "Credits"
-msgstr ""
-
-msgctxt "LogEvent"
-msgid "Debug"
-msgstr ""
-
-msgctxt "LogEvent"
-msgid "Info"
-msgstr ""
-
-msgctxt "LogEvent"
-msgid "Notice"
-msgstr ""
-
-msgctxt "LogEvent"
-msgid "Warning"
-msgstr ""
-
-msgctxt "LogEvent"
-msgid "Error"
-msgstr ""
-
-msgctxt "LogEvent"
-msgid "Unknown"
-msgstr ""
-
-msgctxt "LogTreeItem"
-msgid "Debug"
-msgstr ""
-
-msgctxt "LogTreeItem"
-msgid "Info"
-msgstr ""
-
-msgctxt "LogTreeItem"
-msgid "Notice"
-msgstr ""
-
-msgctxt "LogTreeItem"
-msgid "Warning"
-msgstr ""
-
-msgctxt "LogTreeItem"
-msgid "Error"
-msgstr ""
-
-msgctxt "LogTreeItem"
-msgid "Unknown"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Start Tor"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Exit"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Bandwidth Graph"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Message Log"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Network Map"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Control Panel"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Settings"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "About"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Help"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "New Identity"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+T"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+B"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+L"
+#: mainwindow.cpp:439
+msgctxt "MainWindow"
+msgid "Ctrl+L"
msgstr ""
+#: mainwindow.cpp:440
msgctxt "MainWindow"
msgid "Ctrl+N"
msgstr ""
+#: mainwindow.cpp:441
msgctxt "MainWindow"
msgid "Ctrl+?"
msgstr ""
+#: mainwindow.cpp:442
msgctxt "MainWindow"
msgid "Ctrl+I"
msgstr ""
+#: mainwindow.cpp:443
msgctxt "MainWindow"
msgid "Ctrl+P"
msgstr ""
+#: mainwindow.cpp:463
msgctxt "MainWindow"
msgid "Tor"
msgstr ""
+#: mainwindow.cpp:468
msgctxt "MainWindow"
msgid "View"
msgstr ""
+#: mainwindow.cpp:476
msgctxt "MainWindow"
msgid "Vidalia Help"
msgstr ""
+#: mainwindow.cpp:527
msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
+#: mainwindow.cpp:528
msgctxt "MainWindow"
msgid "Vidalia was unable to start the configured web browser"
msgstr ""
+#: mainwindow.cpp:540
msgctxt "MainWindow"
msgid "Error starting IM client"
msgstr ""
+#: mainwindow.cpp:541
msgctxt "MainWindow"
msgid "Vidalia was unable to start the configured IM client"
msgstr ""
+#: mainwindow.cpp:562
msgctxt "MainWindow"
msgid "Error starting proxy server"
msgstr ""
+#: mainwindow.cpp:563
msgctxt "MainWindow"
msgid "Vidalia was unable to start the configured proxy server"
msgstr ""
+#: mainwindow.cpp:579
msgctxt "MainWindow"
msgid "Connecting to a relay directory"
msgstr ""
+#: mainwindow.cpp:583
msgctxt "MainWindow"
msgid "Establishing an encrypted directory connection"
msgstr ""
+#: mainwindow.cpp:586
msgctxt "MainWindow"
msgid "Retrieving network status"
msgstr ""
+#: mainwindow.cpp:589
msgctxt "MainWindow"
msgid "Loading network status"
msgstr ""
+#: mainwindow.cpp:592
msgctxt "MainWindow"
msgid "Loading authority certificates"
msgstr ""
+#: mainwindow.cpp:595
msgctxt "MainWindow"
msgid "Requesting relay information"
msgstr ""
+#: mainwindow.cpp:598
msgctxt "MainWindow"
msgid "Loading relay information"
msgstr ""
+#: mainwindow.cpp:1132
msgctxt "MainWindow"
msgid "Connecting to the Tor network"
msgstr ""
+#: mainwindow.cpp:605
msgctxt "MainWindow"
msgid "Establishing a Tor circuit"
msgstr ""
+#: mainwindow.cpp:1297
msgctxt "MainWindow"
msgid "Connected to the Tor network!"
msgstr ""
+#: mainwindow.cpp:612
msgctxt "MainWindow"
msgid "Unrecognized startup status"
msgstr ""
+#: mainwindow.cpp:619
msgctxt "MainWindow"
msgid "miscellaneous"
msgstr ""
+#: mainwindow.cpp:622
msgctxt "MainWindow"
msgid "identity mismatch"
msgstr ""
+#: mainwindow.cpp:625
msgctxt "MainWindow"
msgid "done"
msgstr ""
+#: mainwindow.cpp:628
msgctxt "MainWindow"
msgid "connection refused"
msgstr ""
+#: mainwindow.cpp:631
msgctxt "MainWindow"
msgid "connection timeout"
msgstr ""
+#: mainwindow.cpp:634
msgctxt "MainWindow"
msgid "read/write error"
msgstr ""
+#: mainwindow.cpp:637
msgctxt "MainWindow"
msgid "no route to host"
msgstr ""
+#: mainwindow.cpp:640
msgctxt "MainWindow"
msgid "insufficient resources"
msgstr ""
+#: mainwindow.cpp:643
msgctxt "MainWindow"
msgid "unknown"
msgstr ""
+#: mainwindow.cpp:645
+msgctxt "MainWindow"
+msgid " failed (%1)"
+msgstr ""
+
+#: mainwindow.ui:168
msgctxt "MainWindow"
msgid "Tor is not running"
msgstr ""
+#: mainwindow.cpp:686
+msgctxt "MainWindow"
+msgid "Your relay is shutting down."
+"Click 'Stop' again to stop your relay now."
+msgstr ""
+
+#: mainwindow.cpp:688
msgctxt "MainWindow"
msgid "Tor is shutting down"
msgstr ""
+#: mainwindow.cpp:693
msgctxt "MainWindow"
msgid "Stop Tor Now"
msgstr ""
+#: mainwindow.cpp:695
msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
+#: mainwindow.cpp:711
msgctxt "MainWindow"
msgid "Starting the Tor software"
msgstr ""
+#: mainwindow.ui:75
msgctxt "MainWindow"
msgid "Starting Tor"
msgstr ""
+#: mainwindow.cpp:859
msgctxt "MainWindow"
msgid "Error Starting Tor"
msgstr ""
+#: mainwindow.cpp:862
msgctxt "MainWindow"
-msgid ""
-"Vidalia was unable to start Tor. Check your settings to ensure the correct "
-"name and location of your Tor executable is specified."
+msgid "Vidalia was unable to start Tor. Check your settings to ensure the correct name and location of your Tor executable is specified."
msgstr ""
+#: mainwindow.cpp:896
msgctxt "MainWindow"
msgid "Connecting to Tor"
msgstr ""
+#: mainwindow.cpp:906
msgctxt "MainWindow"
msgid "Connection Error"
msgstr ""
+#: mainwindow.cpp:938
msgctxt "MainWindow"
msgid "Relaying is Enabled"
msgstr ""
+#: mainwindow.cpp:943
+msgctxt "MainWindow"
+msgid "You are currently running a relay. Terminating your relay will interrupt any open connections from clients."
+""
+"Would you like to shutdown gracefully and give clients time to find a new relay?"
+msgstr ""
+
+#: mainwindow.cpp:965
msgctxt "MainWindow"
msgid "Error Shutting Down"
msgstr ""
+#: mainwindow.cpp:966
msgctxt "MainWindow"
msgid "Vidalia was unable to stop the Tor software."
msgstr ""
+#: mainwindow.cpp:997
msgctxt "MainWindow"
msgid "Unexpected Error"
msgstr ""
+#: mainwindow.cpp:1001
+msgctxt "MainWindow"
+msgid "Vidalia detected that the Tor software exited unexpectedly."
+""
+"Please check the message log for recent warning or error messages."
+msgstr ""
+
+#: mainwindow.cpp:1055
msgctxt "MainWindow"
msgid "Authenticating to Tor"
msgstr ""
+#: mainwindow.cpp:1075
msgctxt "MainWindow"
msgid "Cookie Authentication Required"
msgstr ""
+#: mainwindow.cpp:1078
msgctxt "MainWindow"
-msgid ""
-"The Tor software requires Vidalia to send the contents of an authentication "
-"cookie, but Vidalia was unable to find one."
+msgid "The Tor software requires Vidalia to send the contents of an authentication cookie, but Vidalia was unable to find one."
msgstr ""
+#: mainwindow.cpp:1080
msgctxt "MainWindow"
msgid "Would you like to browse for the file 'control_auth_cookie' yourself?"
msgstr ""
+#: mainwindow.cpp:1087
msgctxt "MainWindow"
msgid "Data Directory"
msgstr ""
+#: mainwindow.cpp:1089
msgctxt "MainWindow"
msgid "Control Cookie (control_auth_cookie)"
msgstr ""
+#: mainwindow.cpp:1141
msgctxt "MainWindow"
msgid "Error Registering for Events"
msgstr ""
+#: mainwindow.cpp:1143
msgctxt "MainWindow"
-msgid ""
-"Vidalia was unable to register for some events. Many of Vidalia's features "
-"may be unavailable."
+msgid "Vidalia was unable to register for some events. Many of Vidalia's features may be unavailable."
msgstr ""
+#: mainwindow.cpp:1222
msgctxt "MainWindow"
msgid "Authentication Error"
msgstr ""
+#: mainwindow.cpp:1224
msgctxt "MainWindow"
msgid "Vidalia was unable to authenticate to the Tor software. (%1)"
msgstr ""
+#: mainwindow.cpp:1226
msgctxt "MainWindow"
msgid "Please check your control port authentication settings."
msgstr ""
+#: mainwindow.cpp:1330
msgctxt "MainWindow"
msgid "Tor Update Available"
msgstr ""
+#: mainwindow.cpp:1333
msgctxt "MainWindow"
-msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended. Please visit the Tor website to download the latest version."
+msgid "The currently installed version of Tor is out of date or no longer recommended. Please visit the Tor website to download the latest version."
msgstr ""
+#: mainwindow.cpp:1333
msgctxt "MainWindow"
msgid "Tor website: %1"
msgstr ""
+#: mainwindow.cpp:1394
msgctxt "MainWindow"
-msgid ""
-"All subsequent connections will appear to be different than your old "
-"connections."
+msgid "All subsequent connections will appear to be different than your old connections."
msgstr ""
+#: mainwindow.cpp:1409
msgctxt "MainWindow"
msgid "Failed to Create New Identity"
msgstr ""
+#: mainwindow.cpp:1458
msgctxt "MainWindow"
msgid "Port Forwarding Failed"
msgstr ""
+#: mainwindow.cpp:1459
msgctxt "MainWindow"
msgid "Vidalia was unable to configure automatic port forwarding."
msgstr ""
+#: mainwindow.ui:19
msgctxt "MainWindow"
msgid "Vidalia Control Panel"
msgstr ""
+#: mainwindow.ui:49
msgctxt "MainWindow"
msgid "Status"
msgstr ""
+#: mainwindow.ui:218
msgctxt "MainWindow"
msgid "Vidalia Shortcuts"
msgstr ""
+#: mainwindow.ui:243
msgctxt "MainWindow"
msgid "Setup Relaying"
msgstr ""
+#: mainwindow.ui:246
msgctxt "MainWindow"
msgid "Set up a relay and help the network grow"
msgstr ""
+#: mainwindow.ui:256
msgctxt "MainWindow"
msgid "View the Network"
msgstr ""
+#: mainwindow.ui:259
msgctxt "MainWindow"
msgid "View a map of the Tor network"
msgstr ""
+#: mainwindow.ui:272
msgctxt "MainWindow"
msgid "Use a New Identity"
msgstr ""
+#: mainwindow.ui:275
msgctxt "MainWindow"
msgid "Make subsequent connections appear new"
msgstr ""
+#: mainwindow.ui:307
msgctxt "MainWindow"
msgid "View recent bandwidth usage"
msgstr ""
+#: mainwindow.ui:320
msgctxt "MainWindow"
-msgid "View log message history"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "View help documentation"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Configure Vidalia"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "View version and license information"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Exit Vidalia"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Show this window on startup"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Hide"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Hide this window"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Password Reset Failed"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid ""
-"Vidalia tried to reset Tor's control password, but was not able to restart "
-"the Tor software. Please check your Task Manager to ensure there are no "
-"other Tor processes running."
-msgstr ""
-
-msgctxt "MainWindow"
-msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended."
-msgstr ""
-
-msgctxt "MainWindow"
-msgid ""
-"Would you like to check if a newer package is available for installation?"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Potentially Unsafe Connection"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid ""
-"Tor has automatically closed your connection in order to protect your "
-"anonymity."
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Update Failed"
+msgid "View log message history"
msgstr ""
+#: mainwindow.ui:370
msgctxt "MainWindow"
-msgid "Your software is up to date"
+msgid "View help documentation"
msgstr ""
+#: mainwindow.ui:383
msgctxt "MainWindow"
-msgid ""
-"There are no new Tor software packages available for your computer at this "
-"time."
+msgid "Configure Vidalia"
msgstr ""
+#: mainwindow.ui:433
msgctxt "MainWindow"
-msgid "Installation Failed"
+msgid "View version and license information"
msgstr ""
+#: mainwindow.ui:446
msgctxt "MainWindow"
-msgid "Vidalia was unable to install your software updates."
+msgid "Exit Vidalia"
msgstr ""
+#: mainwindow.ui:498
msgctxt "MainWindow"
-msgid "The following error occurred:"
+msgid "Show this window on startup"
msgstr ""
+#: mainwindow.ui:517
msgctxt "MainWindow"
-msgid ""
-"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 "Hide"
msgstr ""
+#: mainwindow.ui:520
msgctxt "MainWindow"
-msgid "failed (%1)"
+msgid "Hide this window"
msgstr ""
+#: mainwindow.cpp:1210
msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+msgid "Password Reset Failed"
msgstr ""
+#: mainwindow.cpp:1213
msgctxt "MainWindow"
-msgid "Bootstrapping torrc from %1 to %2"
+msgid "Vidalia tried to reset Tor's control 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 ""
-"You are currently running a relay. Terminating your relay 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 ""
-msgctxt "MainWindow"
-msgid "(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)"
+#: 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."
+#: 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 ""
+#: messagelog.cpp:190
msgctxt "MessageLog"
msgid "Vidalia was unable to register for Tor's log events."
msgstr ""
+#: messagelog.cpp:205
msgctxt "MessageLog"
msgid "Error Opening Log File"
msgstr ""
+#: messagelog.cpp:206
msgctxt "MessageLog"
msgid "Vidalia was unable to open the specified log file."
msgstr ""
+#: messagelog.cpp:227
msgctxt "MessageLog"
msgid "Log Filename Required"
msgstr ""
+#: messagelog.cpp:229
msgctxt "MessageLog"
msgid "You must enter a filename to be able to save log messages to a file."
msgstr ""
+#: messagelog.cpp:280
msgctxt "MessageLog"
msgid "Select Log File"
msgstr ""
+#: messagelog.cpp:297
msgctxt "MessageLog"
msgid "Save Log Messages"
msgstr ""
+#: messagelog.cpp:300
msgctxt "MessageLog"
msgid "Text Files (*.txt)"
msgstr ""
+#: messagelog.cpp:309
msgctxt "MessageLog"
msgid "Vidalia"
msgstr ""
+#: messagelog.cpp:310
+msgctxt "MessageLog"
+msgid "Cannot write file %1"
+""
+"%2."
+msgstr ""
+
+#: messagelog.cpp:360
msgctxt "MessageLog"
msgid "Find in Message Log"
msgstr ""
+#: messagelog.cpp:361
msgctxt "MessageLog"
msgid "Find:"
msgstr ""
+#: messagelog.cpp:367
msgctxt "MessageLog"
msgid "Not Found"
msgstr ""
+#: messagelog.cpp:368
msgctxt "MessageLog"
msgid "Search found 0 matches."
msgstr ""
+#: messagelog.ui:19
msgctxt "MessageLog"
msgid "Message Log"
msgstr ""
+#: messagelog.ui:452
msgctxt "MessageLog"
msgid "Message Filters..."
msgstr ""
+#: messagelog.ui:455
msgctxt "MessageLog"
msgid "Set message filters"
msgstr ""
+#: messagelog.ui:463
msgctxt "MessageLog"
msgid "History Size..."
msgstr ""
+#: messagelog.ui:466
msgctxt "MessageLog"
msgid "Set maximum number of messages to display"
msgstr ""
+#: messagelog.ui:477
msgctxt "MessageLog"
msgid "Clear"
msgstr ""
+#: messagelog.ui:480
msgctxt "MessageLog"
msgid "Clear all messages from the Message Log (Ctrl+E)"
msgstr ""
+#: messagelog.ui:483
msgctxt "MessageLog"
msgid "Ctrl+E"
msgstr ""
+#: messagelog.ui:497
msgctxt "MessageLog"
msgid "Copy"
msgstr ""
+#: messagelog.ui:500
msgctxt "MessageLog"
msgid "Copy the selected messages to the clipboard (Ctrl+C)"
msgstr ""
+#: messagelog.ui:503
msgctxt "MessageLog"
msgid "Ctrl+C"
msgstr ""
+#: messagelog.ui:514
msgctxt "MessageLog"
msgid "Select All"
msgstr ""
+#: messagelog.ui:517
msgctxt "MessageLog"
msgid "Select all messages (Ctrl+A)"
msgstr ""
+#: messagelog.ui:520
msgctxt "MessageLog"
msgid "Ctrl+A"
msgstr ""
+#: messagelog.ui:528
msgctxt "MessageLog"
msgid "Save All"
msgstr ""
+#: messagelog.ui:531
msgctxt "MessageLog"
msgid "Save all messages to a file"
msgstr ""
+#: messagelog.ui:539
msgctxt "MessageLog"
msgid "Save Selected"
msgstr ""
+#: messagelog.ui:542
msgctxt "MessageLog"
msgid "Save selected messages to a file"
msgstr ""
+#: messagelog.ui:553
msgctxt "MessageLog"
msgid "Settings"
msgstr ""
+#: messagelog.ui:556
msgctxt "MessageLog"
msgid "Adjust Message Log Settings"
msgstr ""
+#: messagelog.ui:559
msgctxt "MessageLog"
msgid "Ctrl+T"
msgstr ""
+#: messagelog.ui:567
msgctxt "MessageLog"
msgid "Help"
msgstr ""
+#: messagelog.ui:570
msgctxt "MessageLog"
msgid "Show the help browser"
msgstr ""
+#: messagelog.ui:573
msgctxt "MessageLog"
msgid "F1"
msgstr ""
+#: messagelog.ui:581
msgctxt "MessageLog"
msgid "Close"
msgstr ""
+#: messagelog.ui:584
msgctxt "MessageLog"
msgid "Close the Message Log"
msgstr ""
+#: messagelog.ui:587
msgctxt "MessageLog"
msgid "Esc"
msgstr ""
+#: messagelog.ui:598
msgctxt "MessageLog"
msgid "Find"
msgstr ""
+#: messagelog.ui:601
msgctxt "MessageLog"
msgid "Find all messages containing the search text (Ctrl+F)"
msgstr ""
+#: messagelog.ui:604
msgctxt "MessageLog"
msgid "Ctrl+F"
msgstr ""
+#: messagelog.ui:66
msgctxt "MessageLog"
msgid "Time"
msgstr ""
+#: messagelog.ui:71
msgctxt "MessageLog"
msgid "Type"
msgstr ""
+#: messagelog.ui:76
msgctxt "MessageLog"
msgid "Message"
msgstr ""
+#: messagelog.ui:160
msgctxt "MessageLog"
msgid "Saves the current Message Log settings"
msgstr ""
+#: messagelog.ui:163
msgctxt "MessageLog"
msgid "Save Settings"
msgstr ""
+#: messagelog.ui:179
msgctxt "MessageLog"
msgid "Cancels changes made to settings"
msgstr ""
+#: messagelog.ui:182
msgctxt "MessageLog"
msgid "Cancel"
msgstr ""
+#: messagelog.ui:196
msgctxt "MessageLog"
msgid "Message Filter"
msgstr ""
+#: messagelog.ui:217
msgctxt "MessageLog"
msgid "Error"
msgstr ""
+#: messagelog.ui:233
msgctxt "MessageLog"
msgid "Warning"
msgstr ""
+#: messagelog.ui:249
msgctxt "MessageLog"
msgid "Notice"
msgstr ""
+#: messagelog.ui:265
msgctxt "MessageLog"
msgid "Info"
msgstr ""
+#: messagelog.ui:281
msgctxt "MessageLog"
msgid "Debug"
msgstr ""
+#: messagelog.ui:297
msgctxt "MessageLog"
msgid "Message Log History"
msgstr ""
+#: messagelog.ui:318
msgctxt "MessageLog"
msgid "Number of messages to display in the message log window"
msgstr ""
+#: messagelog.ui:337
msgctxt "MessageLog"
msgid "messages"
msgstr ""
-msgctxt "MessageLog"
-msgid "Browse"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Enable automatically saving all new log messages to a file"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Automatically save new log messages to a file"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Basic"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Tor Status"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Advanced"
-msgstr ""
-
+#: messagelog.ui:356
msgctxt "MessageLog"
msgid "Always Save New Log Messages"
msgstr ""
+#: messagelog.ui:371
msgctxt "MessageLog"
-msgid ""
-"Messages that appear when something has \n"
-"gone very wrong and Tor cannot proceed."
-msgstr ""
-
-msgctxt "MessageLog"
-msgid ""
-"Messages that only appear when \n"
-"something has gone wrong with Tor."
-msgstr ""
-
-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 ""
-
-msgctxt "MessageLog"
-msgid ""
-"Messages that appear frequently \n"
-"during normal Tor operation."
+msgid "Browse"
msgstr ""
+#: messagelog.ui:394
msgctxt "MessageLog"
-msgid ""
-"Hyper-verbose messages primarily of \n"
-"interest to Tor developers."
+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 ""
+#: netviewer.ui:24
msgctxt "NetViewer"
msgid "Tor Network Map"
msgstr ""
+#: netviewer.ui:239
msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
+#: netviewer.ui:245
msgctxt "NetViewer"
msgid "Refresh the list of Tor relays and connections"
msgstr ""
+#: netviewer.ui:248
msgctxt "NetViewer"
msgid "Ctrl+R"
msgstr ""
+#: netviewer.ui:256
msgctxt "NetViewer"
msgid "Help"
msgstr ""
+#: netviewer.ui:259
msgctxt "NetViewer"
msgid "Show the network map help"
msgstr ""
+#: netviewer.ui:262
msgctxt "NetViewer"
msgid "Show network map help"
msgstr ""
+#: netviewer.ui:265
msgctxt "NetViewer"
msgid "F1"
msgstr ""
+#: netviewer.ui:273
msgctxt "NetViewer"
msgid "Close"
msgstr ""
+#: netviewer.ui:279
msgctxt "NetViewer"
msgid "Close the network map"
msgstr ""
+#: netviewer.ui:282
msgctxt "NetViewer"
msgid "Esc"
msgstr ""
+#: netviewer.ui:290
msgctxt "NetViewer"
msgid "Zoom In"
msgstr ""
+#: netviewer.ui:296
msgctxt "NetViewer"
msgid "Zoom in on the network map"
msgstr ""
+#: netviewer.ui:299
msgctxt "NetViewer"
msgid "+"
msgstr ""
+#: netviewer.ui:307
msgctxt "NetViewer"
msgid "Zoom Out"
msgstr ""
+#: netviewer.ui:313
msgctxt "NetViewer"
msgid "Zoom out on the network map"
msgstr ""
+#: netviewer.ui:316
msgctxt "NetViewer"
msgid "-"
msgstr ""
+#: netviewer.ui:324
msgctxt "NetViewer"
msgid "Zoom To Fit"
msgstr ""
+#: netviewer.ui:330
msgctxt "NetViewer"
msgid "Zooms to fit all currently displayed circuits"
msgstr ""
+#: netviewer.ui:333
msgctxt "NetViewer"
msgid "Ctrl+Z"
msgstr ""
-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 ""
-
+#: networkpage.cpp:193
msgctxt "NetworkPage"
msgid "Invalid Bridge"
msgstr ""
+#: networkpage.cpp:194
msgctxt "NetworkPage"
msgid "The specified bridge identifier is not valid."
msgstr ""
+#: networkpage.cpp:241
msgctxt "NetworkPage"
msgid "Copy (Ctrl+C)"
msgstr ""
+#: networkpage.cpp:272
msgctxt "NetworkPage"
-msgid ""
-"You must specify both an IP address or hostname and a port number to "
-"configure Tor to use a proxy to access the Internet."
+msgid "You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet."
msgstr ""
+#: networkpage.cpp:278
msgctxt "NetworkPage"
-msgid ""
-"You must specify one or more ports to which your firewall allows you to "
-"connect."
+msgid "You must specify one or more ports to which your firewall allows you to connect."
msgstr ""
+#: networkpage.cpp:314
msgctxt "NetworkPage"
msgid "'%1' is not a valid port number."
msgstr ""
+#: networkpage.ui:25
msgctxt "NetworkPage"
msgid "Check if your local network requires a proxy to access the Internet"
msgstr ""
+#: networkpage.ui:28
msgctxt "NetworkPage"
msgid "I use a proxy to access the Internet"
msgstr ""
+#: networkpage.ui:58
msgctxt "NetworkPage"
msgid "Proxy Settings"
msgstr ""
+#: networkpage.ui:70
+msgctxt "NetworkPage"
+msgid "HTTP Proxy:"
+msgstr ""
+
+#: networkpage.ui:80
msgctxt "NetworkPage"
msgid "Username:"
msgstr ""
+#: networkpage.ui:90
+msgctxt "NetworkPage"
+msgid "Use this proxy for HTTPS also"
+msgstr ""
+
+#: networkpage.ui:108
msgctxt "NetworkPage"
msgid "Password:"
msgstr ""
+#: networkpage.ui:135
msgctxt "NetworkPage"
msgid "Port:"
msgstr ""
+#: networkpage.ui:176
msgctxt "NetworkPage"
msgid "Check to only connect to relays using ports allowed by your firewall"
msgstr ""
+#: networkpage.ui:179
msgctxt "NetworkPage"
msgid "My firewall only lets me connect to certain ports"
msgstr ""
+#: networkpage.ui:203
msgctxt "NetworkPage"
msgid "Firewall Settings"
msgstr ""
+#: networkpage.ui:215
msgctxt "NetworkPage"
msgid "Allowed Ports:"
msgstr ""
+#: networkpage.ui:225
msgctxt "NetworkPage"
msgid "80, 443"
msgstr ""
+#: networkpage.ui:235
msgctxt "NetworkPage"
-msgid ""
-"Check to encrypt directory requests and, optionally, use bridge relays to "
-"access the Tor network"
+msgid "Check to encrypt directory requests and, optionally, use bridge relays to access the Tor network"
msgstr ""
+#: networkpage.ui:238
msgctxt "NetworkPage"
msgid "My ISP blocks connections to the Tor network"
msgstr ""
+#: networkpage.ui:262
msgctxt "NetworkPage"
msgid "Bridge Settings"
msgstr ""
+#: networkpage.ui:274
msgctxt "NetworkPage"
-msgid "Add a Bridge:"
-msgstr ""
-
-msgctxt "NetworkPage"
-msgid "Remove the selected bridges from the list"
-msgstr ""
-
-msgctxt "NetworkPage"
-msgid "Copy the selected bridges to the clipboard"
-msgstr ""
-
-msgctxt "NetworkPage"
-msgid "Find Bridges Now"
-msgstr ""
-
-msgctxt "NetworkPage"
-msgid "<a href=\"bridges.finding\">How else can I find bridges?</a>"
-msgstr ""
-
-msgctxt "NetworkPage"
-msgid "<a href=\"bridges.finding\">How can I find bridges?</a>"
-msgstr ""
-
-msgctxt "NetworkPage"
-msgid ""
-"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:"
+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 "You must select the proxy type."
-msgstr ""
-
-msgctxt "NetworkPage"
-msgid "SOCKS 4"
+msgid "Add a Bridge:"
msgstr ""
+#: networkpage.ui:318
msgctxt "NetworkPage"
-msgid "SOCKS 5"
+msgid "<a href=\"bridges.finding\">How do I find a bridge?</a>"
msgstr ""
+#: networkpage.ui:383
msgctxt "NetworkPage"
-msgid "HTTP"
+msgid "Remove the selected bridges from the list"
msgstr ""
+#: networkpage.ui:399
msgctxt "NetworkPage"
-msgid "HTTP / HTTPS"
+msgid "Copy the selected bridges to the clipboard"
msgstr ""
+#: policy.cpp:167
msgctxt "Policy"
msgid "accept"
msgstr ""
+#: policy.cpp:167
msgctxt "Policy"
msgid "reject"
msgstr ""
+#: routerdescriptor.cpp:76
msgctxt "RouterDescriptor"
msgid "Online"
msgstr ""
+#: routerdescriptor.cpp:78
msgctxt "RouterDescriptor"
msgid "Hibernating"
msgstr ""
+#: routerdescriptor.cpp:80
msgctxt "RouterDescriptor"
msgid "Offline"
msgstr ""
+#: routerdescriptorview.cpp:139
msgctxt "RouterDescriptorView"
msgid "Location:"
msgstr ""
+#: routerdescriptorview.cpp:143
msgctxt "RouterDescriptorView"
msgid "IP Address:"
msgstr ""
+#: routerdescriptorview.cpp:144
msgctxt "RouterDescriptorView"
msgid "Platform:"
msgstr ""
+#: routerdescriptorview.cpp:148
msgctxt "RouterDescriptorView"
msgid "Bandwidth:"
msgstr ""
+#: routerdescriptorview.cpp:150
msgctxt "RouterDescriptorView"
msgid "Uptime:"
msgstr ""
+#: routerdescriptorview.cpp:156
msgctxt "RouterDescriptorView"
msgid "Last Updated:"
msgstr ""
+#: routerdescriptorview.cpp:100
msgctxt "RouterDescriptorView"
-msgid "Copy"
-msgstr ""
-
-msgctxt "RouterInfoDialog"
-msgid "Hibernating"
-msgstr ""
-
-msgctxt "RouterInfoDialog"
-msgid "Online"
-msgstr ""
-
-msgctxt "RouterInfoDialog"
-msgid "Offline"
+msgid "%1 days "
msgstr ""
-msgctxt "RouterInfoDialog"
-msgid "Unknown"
-msgstr ""
-
-msgctxt "RouterInfoDialog"
-msgid "Relay Details"
-msgstr ""
-
-msgctxt "RouterInfoDialog"
-msgid "Summary"
-msgstr ""
-
-msgctxt "RouterInfoDialog"
-msgid "Name:"
-msgstr ""
-
-msgctxt "RouterInfoDialog"
-msgid "Status:"
-msgstr ""
-
-msgctxt "RouterInfoDialog"
-msgid "Location:"
-msgstr ""
-
-msgctxt "RouterInfoDialog"
-msgid "IP Address:"
-msgstr ""
-
-msgctxt "RouterInfoDialog"
-msgid "Platform:"
-msgstr ""
-
-msgctxt "RouterInfoDialog"
-msgid "Bandwidth:"
-msgstr ""
-
-msgctxt "RouterInfoDialog"
-msgid "Uptime:"
+#: routerdescriptorview.cpp:103
+msgctxt "RouterDescriptorView"
+msgid "%1 hours "
msgstr ""
-msgctxt "RouterInfoDialog"
-msgid "Contact:"
+#: routerdescriptorview.cpp:106
+msgctxt "RouterDescriptorView"
+msgid "%1 mins "
msgstr ""
-msgctxt "RouterInfoDialog"
-msgid "Last Updated:"
+#: routerdescriptorview.cpp:109
+msgctxt "RouterDescriptorView"
+msgid "%1 secs"
msgstr ""
-msgctxt "RouterInfoDialog"
-msgid "Descriptor"
+#: routerdescriptorview.cpp:48
+msgctxt "RouterDescriptorView"
+msgid "Copy"
msgstr ""
+#: routerlistitem.cpp:67
msgctxt "RouterListItem"
msgid "Offline"
msgstr ""
+#: routerlistitem.cpp:71
msgctxt "RouterListItem"
msgid "Hibernating"
msgstr ""
+#: routerlistitem.cpp:83
msgctxt "RouterListItem"
msgid "%1 KB/s"
msgstr ""
+#: routerlistwidget.cpp:49
msgctxt "RouterListWidget"
msgid "Relay"
msgstr ""
+#: routerlistwidget.cpp:74
msgctxt "RouterListWidget"
msgid "Zoom to Relay"
msgstr ""
+#: routerlistwidget.cpp:220
msgctxt "RouterListWidget"
msgid "%1 relays online"
msgstr ""
+#: routerlistwidget.cpp:67
msgctxt "RouterListWidget"
msgid "Copy"
msgstr ""
+#: routerlistwidget.cpp:68
msgctxt "RouterListWidget"
msgid "Nickname"
msgstr ""
+#: routerlistwidget.cpp:71
msgctxt "RouterListWidget"
msgid "Fingerprint"
msgstr ""
+#: serverpage.cpp:140
msgctxt "ServerPage"
msgid "Bridge Support Unavailable"
msgstr ""
+#: serverpage.cpp:143
msgctxt "ServerPage"
-msgid ""
-"You have configured Tor to act as a bridge relay for censored users, but "
-"your version of Tor does not support bridges."
+msgid "You have configured Tor to act as a bridge relay for censored users, but your version of Tor does not support bridges."
msgstr ""
+#: serverpage.cpp:145
msgctxt "ServerPage"
-msgid ""
-"Please upgrade your Tor software or configure Tor to act as a normal Tor "
-"relay."
+msgid "Please upgrade your Tor software or configure Tor to act as a normal Tor relay."
msgstr ""
+#: serverpage.cpp:199
msgctxt "ServerPage"
msgid "Your bridge relay is not running."
msgstr ""
+#: serverpage.cpp:263
msgctxt "ServerPage"
msgid "You must specify at least a relay nickname and port."
msgstr ""
+#: serverpage.ui:25
msgctxt "ServerPage"
msgid "Run as a client only"
msgstr ""
+#: serverpage.ui:32
msgctxt "ServerPage"
msgid "Relay traffic for the Tor network"
msgstr ""
+#: serverpage.ui:39
+msgctxt "ServerPage"
+msgid "Help censored users reach the Tor network (Tor 0.2.0.8-alpha or newer)"
+msgstr ""
+
+#: serverpage.ui:91
msgctxt "ServerPage"
msgid "Relay Port:"
msgstr ""
+#: serverpage.ui:110
msgctxt "ServerPage"
msgid "Enable to mirror the relay directory"
msgstr ""
+#: serverpage.ui:113
+msgctxt "ServerPage"
+msgid "Mirror the Relay Directory "
+msgstr ""
+
+#: serverpage.ui:139
msgctxt "ServerPage"
msgid "Attempt to automatically configure port forwarding"
msgstr ""
+#: serverpage.ui:154
msgctxt "ServerPage"
msgid "Test"
msgstr ""
+#: serverpage.ui:164
msgctxt "ServerPage"
msgid "Show help topic on port forwarding"
msgstr ""
+#: serverpage.ui:204
+msgctxt "ServerPage"
+msgid "Email address at which you may be reached if there is a"
+"problem with your relay. You might also include your PGP or GPG fingerprint."
+msgstr ""
+
+#: serverpage.ui:234
msgctxt "ServerPage"
msgid "Directory Port:"
msgstr ""
+#: serverpage.ui:267
msgctxt "ServerPage"
msgid "Directory Port Number"
msgstr ""
+#: serverpage.ui:279
msgctxt "ServerPage"
msgid "Contact Info:"
msgstr ""
+#: serverpage.ui:337
msgctxt "ServerPage"
msgid "Name of your relay"
msgstr ""
+#: serverpage.ui:370
msgctxt "ServerPage"
msgid "Port on which users and other relays can communicate with your relay"
msgstr ""
+#: serverpage.ui:380
msgctxt "ServerPage"
msgid "Nickname:"
msgstr ""
+#: serverpage.ui:76
msgctxt "ServerPage"
msgid "Basic Settings"
msgstr ""
+#: serverpage.ui:435
msgctxt "ServerPage"
-msgid ""
-"For Internet connections with fast download speed but slow upload, please "
-"list your upload speed here."
+msgid "For Internet connections with fast download speed but slow upload, please list your upload speed here."
msgstr ""
+#: serverpage.ui:466
msgctxt "ServerPage"
msgid "Cable/DSL 256 Kbps"
msgstr ""
+#: serverpage.ui:471
msgctxt "ServerPage"
msgid "Cable/DSL 512 Kbps"
msgstr ""
+#: serverpage.ui:476
msgctxt "ServerPage"
msgid "Cable/DSL 768 Kbps"
msgstr ""
+#: serverpage.ui:481
msgctxt "ServerPage"
msgid "T1/Cable/DSL 1.5 Mbps"
msgstr ""
+#: serverpage.ui:486
msgctxt "ServerPage"
msgid "> 1.5 Mbps"
msgstr ""
+#: serverpage.ui:491
msgctxt "ServerPage"
msgid "Custom"
msgstr ""
+#: serverpage.ui:456
msgctxt "ServerPage"
msgid "Select the entry that most closely resembles your Internet connection"
msgstr ""
+#: serverpage.ui:502
msgctxt "ServerPage"
msgid "Show help topic on bandwidth rate limits"
msgstr ""
+#: serverpage.ui:591
msgctxt "ServerPage"
-msgid "Average Rate"
-msgstr ""
-
-msgctxt "ServerPage"
-msgid "Long-term average bandwidth limit"
-msgstr ""
-
-msgctxt "ServerPage"
-msgid "KB/s"
-msgstr ""
-
-msgctxt "ServerPage"
-msgid "Maximum Rate"
-msgstr ""
-
-msgctxt "ServerPage"
-msgid "Peak bandwidth rate limit"
-msgstr ""
-
-msgctxt "ServerPage"
-msgid ""
-"Your maximum bandwidth rate must be greater than or equal to your average "
-"bandwidth rate. Both values must be at least 20 KB/s."
-msgstr ""
-
-msgctxt "ServerPage"
-msgid "Bandwidth Limits"
-msgstr ""
-
-msgctxt "ServerPage"
-msgid "Ports 6660 - 6669 and 6697"
-msgstr ""
-
-msgctxt "ServerPage"
-msgid "Internet Relay Chat (IRC)"
-msgstr ""
-
-msgctxt "ServerPage"
-msgid "Ports 110, 143, 993 and 995"
-msgstr ""
-
-msgctxt "ServerPage"
-msgid "Retrieve Mail (POP, IMAP)"
-msgstr ""
-
-msgctxt "ServerPage"
-msgid "Ports unspecified by other checkboxes"
-msgstr ""
-
-msgctxt "ServerPage"
-msgid "Misc Other Services"
-msgstr ""
-
-msgctxt "ServerPage"
-msgid "Ports 706, 1863, 5050, 5190, 5222, 5223, 8300 and 8888"
+msgid "Average Rate"
msgstr ""
+#: serverpage.ui:620
msgctxt "ServerPage"
-msgid "Instant Messaging (IM)"
+msgid "Long-term average bandwidth limit"
msgstr ""
+#: serverpage.ui:708
msgctxt "ServerPage"
-msgid "Port 443"
+msgid "KB/s"
msgstr ""
+#: serverpage.ui:666
msgctxt "ServerPage"
-msgid "Secure Websites (SSL)"
+msgid "Maximum Rate"
msgstr ""
+#: serverpage.ui:695
msgctxt "ServerPage"
-msgid "Port 80"
+msgid "Peak bandwidth rate limit"
msgstr ""
+#: serverpage.ui:737
msgctxt "ServerPage"
-msgid "Websites"
+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 "Show help topic on exit policies"
+msgid "Bandwidth Limits"
msgstr ""
+#: serverpage.ui:802
msgctxt "ServerPage"
-msgid ""
-"What Internet resources should users be able to access from your relay?"
+msgid "Ports 6660 - 6669 and 6697"
msgstr ""
+#: serverpage.ui:805
msgctxt "ServerPage"
-msgid ""
-"Tor will still block some outgoing mail and file sharing applications by "
-"default to reduce spam and other abuse."
+msgid "Internet Relay Chat (IRC)"
msgstr ""
+#: serverpage.ui:815
msgctxt "ServerPage"
-msgid "Exit Policies"
+msgid "Ports 110, 143, 993 and 995"
msgstr ""
+#: serverpage.ui:818
msgctxt "ServerPage"
-msgid "Let others access your bridge by giving them this line:"
+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"
+msgid "Ports unspecified by other checkboxes"
msgstr ""
+#: serverpage.ui:831
msgctxt "ServerPage"
-msgid "Copy your bridge relay's identity to the clipboard"
+msgid "Misc Other Services"
msgstr ""
+#: serverpage.ui:841
msgctxt "ServerPage"
-msgid "No Recent Usage"
+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."
+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."
+msgid "Port 443"
msgstr ""
+#: serverpage.ui:857
msgctxt "ServerPage"
-msgid "Bridge History"
+msgid "Secure Websites (SSL)"
msgstr ""
+#: serverpage.ui:867
msgctxt "ServerPage"
-msgid "Vidalia was unable to retrieve your bridge's usage history."
+msgid "Port 80"
msgstr ""
+#: serverpage.ui:870
msgctxt "ServerPage"
-msgid ""
-"Tor returned an improperly formatted response when Vidalia requested your "
-"bridge's usage history."
+msgid "Websites"
msgstr ""
+#: serverpage.ui:896
msgctxt "ServerPage"
-msgid "The returned response was: %1"
+msgid "Show help topic on exit policies"
msgstr ""
+#: serverpage.ui:969
msgctxt "ServerPage"
-msgid "Help censored users reach the Tor network"
+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>"
+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>"
+msgid "Exit Policies"
msgstr ""
+#: serverpage.ui:1015
msgctxt "ServerPage"
-msgid "Automatically distribute my bridge address"
+msgid "Let others access your bridge by giving them this line:"
msgstr ""
+#: serverpage.ui:1039
msgctxt "ServerPage"
-msgid "Mirror the Relay Directory"
+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 ""
+#: servicepage.cpp:116
msgctxt "ServicePage"
msgid "Error while trying to unpublish all services"
msgstr ""
+#: servicepage.cpp:123
msgctxt "ServicePage"
-msgid ""
-"Please configure at least a service directory and a virtual port for each "
-"service you want to save. Remove the other ones."
+msgid "Please configure at least a service directory and a virtual port for each service you want to save. Remove the other ones."
msgstr ""
+#: servicepage.cpp:597
msgctxt "ServicePage"
msgid "Error"
msgstr ""
+#: servicepage.cpp:452
msgctxt "ServicePage"
msgid "Please select a Service."
msgstr ""
+#: servicepage.cpp:458
msgctxt "ServicePage"
msgid "Select Service Directory"
msgstr ""
+#: servicepage.cpp:547
msgctxt "ServicePage"
msgid "Virtual Port may only contain valid port numbers [1..65535]."
msgstr ""
+#: servicepage.cpp:578
msgctxt "ServicePage"
msgid "Target may only contain address:port, address, or port."
msgstr ""
+#: servicepage.cpp:598
msgctxt "ServicePage"
msgid "Directory already in use by another service."
msgstr ""
+#: servicepage.ui:19
msgctxt "ServicePage"
msgid "Form"
msgstr ""
+#: servicepage.ui:31
msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
+#: servicepage.ui:56
msgctxt "ServicePage"
msgid "Onion Address"
msgstr ""
+#: servicepage.ui:61
msgctxt "ServicePage"
msgid "Virtual Port"
msgstr ""
+#: servicepage.ui:66
msgctxt "ServicePage"
msgid "Target"
msgstr ""
+#: servicepage.ui:71
msgctxt "ServicePage"
msgid "Directory Path"
msgstr ""
+#: servicepage.ui:76
msgctxt "ServicePage"
msgid "Enabled"
msgstr ""
+#: servicepage.ui:84
msgctxt "ServicePage"
msgid "Add new service to list"
msgstr ""
+#: servicepage.ui:97
msgctxt "ServicePage"
msgid "Remove selected service from list"
msgstr ""
+#: servicepage.ui:110
msgctxt "ServicePage"
msgid "Copy onion address of selected service to clipboard"
msgstr ""
+#: servicepage.ui:123
msgctxt "ServicePage"
msgid "Browse in local file system and choose directory for selected service"
msgstr ""
+#: servicepage.cpp:384
msgctxt "ServicePage"
msgid "Created by Tor"
msgstr ""
-msgctxt "StatusEventWidget"
-msgid "Copy to Clipboard"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "The Tor Software is Running"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "You are currently running version \"%1\" of the Tor software."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "The Tor Software is not Running"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Click \"Start Tor\" in the Vidalia Control Panel to restart the Tor "
-"software. If Tor exited unexpectedly, select the \"Advanced\" tab above for "
-"details about any errors encountered."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"You are currently running version \"%1\" of the Tor software, which is no "
-"longer recommended. Please upgrade to the most recent version of the "
-"software, which may contain important security, reliability and performance "
-"fixes."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"You are currently running version \"%1\" of the Tor software, which may no "
-"longer work with the current Tor network. Please upgrade to the most recent "
-"version of the software, which may contain important security, reliability "
-"and performance fixes."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Your Tor Software is Out-of-date"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Connected to the Tor Network"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"We were able to successfully establish a connection to the Tor network. You "
-"can now configure your applications to use the Internet anonymously."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Tor Software Error"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"The Tor software encountered an internal bug. Please report the following "
-"error message to the Tor developers at bugs.torproject.org: \"%1\""
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Tor has determined that your computer's clock may be set to %1 seconds in "
-"the past compared to the source \"%2\". If your clock is not correct, Tor "
-"will not be able to function. Please verify your computer displays the "
-"correct time."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Tor has determined that your computer's clock may be set to %1 seconds in "
-"the future compared to the source \"%2\". If your clock is not correct, Tor "
-"will not be able to function. Please verify your computer displays the "
-"correct time."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Your Computer's Clock is Potentially Incorrect"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"One of the applications on your computer may have attempted to make an "
-"unencrypted connection through Tor to port %1. Sending unencrypted "
-"information over the Tor network is dangerous and not recommended. For your "
-"protection, Tor has automatically closed this connection."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"One of the applications on your computer may have attempted to make an "
-"unencrypted connection through Tor to port %1. Sending unencrypted "
-"information over the Tor network is dangerous and not recommended."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Potentially Dangerous Connection!"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"One of your applications established a connection through Tor to \"%1\" "
-"using a protocol that may leak information about your destination. Please "
-"ensure you configure your applications to use only SOCKS4a or SOCKS5 with "
-"remote hostname resolution."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Unknown SOCKS Protocol"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"One of your applications tried to establish a connection through Tor using a"
-" protocol that Tor does not understand. Please ensure you configure your "
-"applications to use only SOCKS4a or SOCKS5 with remote hostname resolution."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Invalid Destination Hostname"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"One of your applications tried to establish a connection through Tor to "
-"\"%1\", which Tor does not recognize as a valid hostname. Please check your "
-"application's configuration."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "External IP Address Changed"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Tor has determined your relay's public IP address is currently %1%2. If that"
-" is not correct, please consider setting the 'Address' option in your "
-"relay's configuration."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "DNS Hijacking Detected"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Tor detected that your DNS provider is providing false responses for domains"
-" that do not exist. Some ISPs and other DNS providers, such as OpenDNS, are "
-"known to do this in order to display their own search or advertising pages."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Tor detected that your DNS provider is providing false responses for well "
-"known domains. Since clients rely on Tor network relays to provide accurate "
-"DNS repsonses, your relay will not be configured as an exit relay."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Checking Server Port Reachability"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Tor is trying to determine if your relay's server port is reachable from the"
-" Tor network by connecting to itself at %1:%2. This test could take several "
-"minutes."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Server Port Reachability Test Successful!"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Your relay's server port is reachable from the Tor network!"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Server Port Reachability Test Failed"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Your relay's server port is not reachable by other Tor clients. This can "
-"happen if you are behind a router or firewall that requires you to set up "
-"port forwarding. If %1:%2 is not your correct IP address and server port, "
-"please check your relay's configuration."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Checking Directory Port Reachability"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Tor is trying to determine if your relay's directory port is reachable from "
-"the Tor network by connecting to itself at %1:%2. This test could take "
-"several minutes."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Directory Port Reachability Test Successful!"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Your relay's directory port is reachable from the Tor network!"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Directory Port Reachability Test Failed"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Your relay's directory port is not reachable by other Tor clients. This can "
-"happen if you are behind a router or firewall that requires you to set up "
-"port forwarding. If %1:%2 is not your correct IP address and directory port,"
-" please check your relay's configuration."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Relay Descriptor Rejected"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Your relay's descriptor, which enables clients to connect to your relay, was"
-" rejected by the directory server at %1:%2. The reason given was: %3"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Your Relay is Online"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Your relay is now online and available for Tor clients to use. You should "
-"see an increase in network traffic shown by the Bandwidth Graph within a few"
-" hours as more clients learn about your relay. Thank you for contributing to"
-" the Tor network!"
-msgstr ""
-
+#: stream.cpp:131
msgctxt "Stream"
msgid "New"
msgstr ""
+#: stream.cpp:133
msgctxt "Stream"
msgid "Resolving"
msgstr ""
+#: stream.cpp:134
msgctxt "Stream"
msgid "Connecting"
msgstr ""
+#: stream.cpp:135
msgctxt "Stream"
msgid "Open"
msgstr ""
+#: stream.cpp:136
msgctxt "Stream"
msgid "Failed"
msgstr ""
+#: stream.cpp:137
msgctxt "Stream"
msgid "Closed"
msgstr ""
+#: stream.cpp:138
msgctxt "Stream"
msgid "Retrying"
msgstr ""
+#: stream.cpp:139
msgctxt "Stream"
msgid "Remapped"
msgstr ""
+#: stream.cpp:140
msgctxt "Stream"
msgid "Unknown"
msgstr ""
+#: torprocess.cpp:107
msgctxt "TorProcess"
msgid "Process %1 failed to stop. [%2]"
msgstr ""
+#: torservice.cpp:143
msgctxt "TorService"
msgid "The Tor service is not installed."
msgstr ""
+#: torservice.cpp:161
msgctxt "TorService"
msgid "Unable to start the Tor service."
msgstr ""
+#: torsettings.cpp:103
msgctxt "TorSettings"
msgid "Failed to hash the control password."
msgstr ""
-msgctxt "TorrcDialog"
-msgid "Editing torrc"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid ""
-"Save settings. If unchecked it will only apply settings to the current Tor "
-"instance."
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Cut"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Copy"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Paste"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Undo"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Redo"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Select All"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Apply all"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Apply selection only"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Error connecting to Tor"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Selection is empty. Please select some text, or check \"Apply all\""
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Error at line %1: \"%2\""
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Error"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "An error ocurred while opening torrc file"
-msgstr ""
-
+#: upnpcontrol.cpp:139
msgctxt "UPNPControl"
msgid "Success"
msgstr ""
+#: upnpcontrol.cpp:141
msgctxt "UPNPControl"
msgid "No UPnP-enabled devices found"
msgstr ""
+#: upnpcontrol.cpp:143
msgctxt "UPNPControl"
msgid "No valid UPnP-enabled Internet gateway devices found"
msgstr ""
+#: upnpcontrol.cpp:145
msgctxt "UPNPControl"
msgid "WSAStartup failed"
msgstr ""
+#: upnpcontrol.cpp:147
msgctxt "UPNPControl"
msgid "Failed to add a port mapping"
msgstr ""
+#: upnpcontrol.cpp:149
msgctxt "UPNPControl"
msgid "Failed to retrieve a port mapping"
msgstr ""
+#: upnpcontrol.cpp:151
msgctxt "UPNPControl"
msgid "Failed to remove a port mapping"
msgstr ""
+#: upnpcontrol.cpp:153
msgctxt "UPNPControl"
msgid "Unknown error"
msgstr ""
+#: upnptestdialog.cpp:112
msgctxt "UPNPTestDialog"
msgid "Discovering UPnP-enabled devices"
msgstr ""
+#: upnptestdialog.cpp:117
msgctxt "UPNPTestDialog"
msgid "Updating directory port mapping"
msgstr ""
+#: upnptestdialog.cpp:122
msgctxt "UPNPTestDialog"
msgid "Updating relay port mapping"
msgstr ""
+#: upnptestdialog.cpp:127
msgctxt "UPNPTestDialog"
msgid "Test completed successfully!"
msgstr ""
+#: upnptestdialog.ui:13
msgctxt "UPNPTestDialog"
msgid "Testing UPnP Support"
msgstr ""
+#: upnptestdialog.ui:92
msgctxt "UPNPTestDialog"
msgid "Testing Universal Plug & Play Support"
msgstr ""
-msgctxt "UpdateProcess"
-msgid ""
-"Vidalia was unable to check for available software updates because it could "
-"not find '%1'."
-msgstr ""
-
-msgctxt "UpdateProcess"
-msgid ""
-"Vidalia was unable to check for available software updates because Tor's "
-"update process exited unexpectedly."
-msgstr ""
-
-msgctxt "UpdateProgressDialog"
-msgid "Checking for available updates..."
-msgstr ""
-
-msgctxt "UpdateProgressDialog"
-msgid "Hide"
-msgstr ""
-
-msgctxt "UpdateProgressDialog"
-msgid "Downloading updates..."
-msgstr ""
-
-msgctxt "UpdateProgressDialog"
-msgid "Installing updated software..."
-msgstr ""
-
-msgctxt "UpdateProgressDialog"
-msgid "Done! Your software is now up to date."
-msgstr ""
-
-msgctxt "UpdateProgressDialog"
-msgid "OK"
-msgstr ""
-
-msgctxt "UpdateProgressDialog"
-msgid "Software Updates"
-msgstr ""
-
-msgctxt "UpdateProgressDialog"
-msgid "Checking for updates..."
-msgstr ""
-
-msgctxt "UpdateProgressDialog"
-msgid "Cancel"
-msgstr ""
-
-msgctxt "UpdatesAvailableDialog"
-msgid "Software Updates Available"
-msgstr ""
-
-msgctxt "UpdatesAvailableDialog"
-msgid "Remind Me Later"
-msgstr ""
-
-msgctxt "UpdatesAvailableDialog"
-msgid "Install"
-msgstr ""
-
-msgctxt "UpdatesAvailableDialog"
-msgid "The following updated software packages are ready for installation:"
-msgstr ""
-
-msgctxt "UpdatesAvailableDialog"
-msgid "Package"
-msgstr ""
-
-msgctxt "UpdatesAvailableDialog"
-msgid "Version"
-msgstr ""
-
+#: vmessagebox.cpp:77
msgctxt "VMessageBox"
msgid "OK"
msgstr ""
+#: vmessagebox.cpp:78
msgctxt "VMessageBox"
msgid "Cancel"
msgstr ""
+#: vmessagebox.cpp:79
msgctxt "VMessageBox"
msgid "Yes"
msgstr ""
+#: vmessagebox.cpp:80
msgctxt "VMessageBox"
msgid "No"
msgstr ""
+#: vmessagebox.cpp:81
msgctxt "VMessageBox"
msgid "Help"
msgstr ""
+#: vmessagebox.cpp:82
msgctxt "VMessageBox"
msgid "Retry"
msgstr ""
+#: vmessagebox.cpp:83
msgctxt "VMessageBox"
msgid "Show Log"
msgstr ""
+#: vmessagebox.cpp:84
msgctxt "VMessageBox"
msgid "Show Settings"
msgstr ""
+#: vmessagebox.cpp:85
msgctxt "VMessageBox"
msgid "Continue"
msgstr ""
+#: vmessagebox.cpp:86
msgctxt "VMessageBox"
msgid "Quit"
msgstr ""
+#: vmessagebox.cpp:87
msgctxt "VMessageBox"
msgid "Browse"
msgstr ""
+#: main.cpp:75
msgctxt "Vidalia"
msgid "Invalid Argument"
msgstr ""
+#: main.cpp:89
msgctxt "Vidalia"
msgid "Vidalia is already running"
msgstr ""
+#: main.cpp:95
+msgctxt "Vidalia"
+msgid "Another Vidalia process is possibly already running. If there really is not another Vidalia process running, you can choose to continue anyway."
+""
+"Would you like to continue starting Vidalia?"
+msgstr ""
+
+#: vidalia.cpp:169
msgctxt "Vidalia"
msgid "Displays this usage message and exits."
msgstr ""
+#: vidalia.cpp:171
msgctxt "Vidalia"
msgid "Resets ALL stored Vidalia settings."
msgstr ""
+#: vidalia.cpp:173
msgctxt "Vidalia"
msgid "Sets the directory Vidalia uses for data files."
msgstr ""
+#: vidalia.cpp:175
msgctxt "Vidalia"
msgid "Sets the name and location of Vidalia's pidfile."
msgstr ""
+#: vidalia.cpp:177
msgctxt "Vidalia"
msgid "Sets the name and location of Vidalia's logfile."
msgstr ""
+#: vidalia.cpp:180
msgctxt "Vidalia"
msgid "Sets the verbosity of Vidalia's logging."
msgstr ""
+#: vidalia.cpp:183
msgctxt "Vidalia"
msgid "Sets Vidalia's interface style."
msgstr ""
+#: vidalia.cpp:186
msgctxt "Vidalia"
msgid "Sets Vidalia's language."
msgstr ""
+#: vidalia.cpp:190
msgctxt "Vidalia"
msgid "Vidalia Usage Information"
msgstr ""
+#: vidalia.cpp:238
msgctxt "Vidalia"
-msgid "Unable to open log file '%1': %2"
-msgstr ""
-
-msgctxt "Vidalia"
-msgid "Value required for parameter :"
-msgstr ""
-
-msgctxt "Vidalia"
-msgid "Invalid language code specified:"
+msgid "Invalid language code specified: "
msgstr ""
+#: vidalia.cpp:245
msgctxt "Vidalia"
-msgid "Invalid GUI style specified:"
+msgid "Invalid GUI style specified: "
msgstr ""
+#: vidalia.cpp:251
msgctxt "Vidalia"
-msgid "Invalid log level specified:"
+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?"
-msgstr ""
-
-msgctxt "stringutil.h"
-msgid "%1 secs"
-msgstr ""
-
-msgctxt "stringutil.h"
-msgid "%1 B/s"
-msgstr ""
-
-msgctxt "stringutil.h"
-msgid "%1 KB/s"
-msgstr ""
-
-msgctxt "stringutil.h"
-msgid "%1 MB/s"
-msgstr ""
-
-msgctxt "stringutil.h"
-msgid "%1 GB/s"
-msgstr ""
-
-msgctxt "stringutil.h"
-msgid "%1 days"
-msgstr ""
-
-msgctxt "stringutil.h"
-msgid "%1 hours"
-msgstr ""
-
-msgctxt "stringutil.h"
-msgid "%1 mins"
+msgid "Unable to open log file '%1': %2"
msgstr ""
-
-
diff --git a/src/vidalia/i18n/po/km/qt_km.po b/src/vidalia/i18n/po/km/qt_km.po
index e7467ac..ef3663a 100644
--- a/src/vidalia/i18n/po/km/qt_km.po
+++ b/src/vidalia/i18n/po/km/qt_km.po
@@ -1,11 +1,10 @@
#
-# Translators:
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-08-20 03:25+0000\n"
-"PO-Revision-Date: 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"
@@ -431,5 +430,3 @@ msgstr ""
msgctxt "QFileSystemModel"
msgid "%1 bytes"
msgstr ""
-
-
diff --git a/src/vidalia/i18n/po/km/vidalia_km.po b/src/vidalia/i18n/po/km/vidalia_km.po
index de3a625..cd31a6d 100755
--- a/src/vidalia/i18n/po/km/vidalia_km.po
+++ b/src/vidalia/i18n/po/km/vidalia_km.po
@@ -1,3816 +1,2682 @@
-#
-# Translators:
+#, fuzzy
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: 2010-12-05 20:03+0000\n"
-"Last-Translator: \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: 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: km\n"
-"Plural-Forms: nplurals=1; plural=0\n"
"X-Generator: Vidalia ts2po 0.2\n"
+#: aboutdialog.ui:16
msgctxt "AboutDialog"
msgid "About Vidalia"
msgstr ""
+#: aboutdialog.ui:53
msgctxt "AboutDialog"
-msgid "License"
+msgid "Vidalia"
+msgstr ""
+
+#: aboutdialog.ui:88
+msgctxt "AboutDialog"
+msgid "Qt"
+msgstr ""
+
+#: aboutdialog.ui:69
+msgctxt "AboutDialog"
+msgid "Tor"
+msgstr ""
+
+#: aboutdialog.cpp:53
+msgctxt "AboutDialog"
+msgid "Unavailable"
+msgstr ""
+
+#: aboutdialog.cpp:57
+msgctxt "AboutDialog"
+msgid "Not Running"
+msgstr ""
+
+#: aboutdialog.ui:81
+msgctxt "AboutDialog"
+msgid "0.2.0"
+msgstr ""
+
+#: aboutdialog.ui:106
+msgctxt "AboutDialog"
+msgid "0.2.0.31-alpha-dev (r123456)"
msgstr ""
+#: aboutdialog.ui:131
msgctxt "AboutDialog"
-msgid "Vidalia 0.2.0"
+msgid "4.4.2"
msgstr ""
+#: aboutdialog.ui:107
msgctxt "AboutDialog"
-msgid "Tor 0.2.0.32"
+msgid "License"
msgstr ""
+#: aboutdialog.ui:163
msgctxt "AboutDialog"
-msgid "Qt 4.4.2"
+msgid "version"
msgstr ""
+#: advancedpage.cpp:109
msgctxt "AdvancedPage"
msgid "'%1' is not a valid IP address."
msgstr ""
+#: advancedpage.cpp:120
msgctxt "AdvancedPage"
-msgid ""
-"You selected 'Password' authentication, but did not specify a password."
+msgid "You selected 'Password' authentication, but did not specify a password."
msgstr ""
+#: advancedpage.cpp:223
msgctxt "AdvancedPage"
msgid "Select Tor Configuration File"
msgstr ""
+#: advancedpage.cpp:236
msgctxt "AdvancedPage"
msgid "File Not Found"
msgstr ""
+#: advancedpage.cpp:238
msgctxt "AdvancedPage"
msgid "%1 does not exist. Would you like to create it?"
msgstr ""
+#: advancedpage.cpp:249
msgctxt "AdvancedPage"
msgid "Failed to Create File"
msgstr ""
+#: advancedpage.cpp:250
msgctxt "AdvancedPage"
msgid "Unable to create %1 [%2]"
msgstr ""
+#: advancedpage.cpp:265
msgctxt "AdvancedPage"
msgid "Select a Directory to Use for Tor Data"
msgstr ""
+#: advancedpage.cpp:287
msgctxt "AdvancedPage"
msgid "Unable to remove Tor Service"
msgstr ""
+#: advancedpage.cpp:289
+msgctxt "AdvancedPage"
+msgid "Vidalia was unable to remove the Tor service."
+""
+"You may need to remove it manually."
+msgstr ""
+
+#: advancedpage.cpp:298
msgctxt "AdvancedPage"
msgid "Unable to install Tor Service"
msgstr ""
+#: advancedpage.cpp:299
msgctxt "AdvancedPage"
msgid "Vidalia was unable to install the Tor service."
msgstr ""
+#: advancedpage.ui:28
+msgctxt "AdvancedPage"
+msgid "Control Port"
+msgstr ""
+
+#: advancedpage.ui:48
msgctxt "AdvancedPage"
msgid "Authentication:"
msgstr ""
+#: advancedpage.ui:58
msgctxt "AdvancedPage"
msgid "Address:"
msgstr ""
+#: advancedpage.ui:86
msgctxt "AdvancedPage"
msgid "None"
msgstr ""
+#: advancedpage.ui:91
msgctxt "AdvancedPage"
msgid "Cookie"
msgstr ""
+#: advancedpage.ui:96
msgctxt "AdvancedPage"
msgid "Password"
msgstr ""
+#: advancedpage.ui:111
msgctxt "AdvancedPage"
msgid "Randomly Generate"
msgstr ""
+#: advancedpage.ui:157
msgctxt "AdvancedPage"
msgid ":"
msgstr ""
+#: advancedpage.ui:219
msgctxt "AdvancedPage"
msgid "Tor Configuration File"
msgstr ""
+#: advancedpage.ui:240
msgctxt "AdvancedPage"
msgid "Start the Tor software with the specified configuration file (torrc)"
msgstr ""
+#: advancedpage.ui:259
msgctxt "AdvancedPage"
msgid "Select path to your configuration file"
msgstr ""
+#: advancedpage.ui:318
msgctxt "AdvancedPage"
msgid "Browse"
msgstr ""
+#: advancedpage.ui:275
msgctxt "AdvancedPage"
msgid "Data Directory"
msgstr ""
+#: advancedpage.ui:296
msgctxt "AdvancedPage"
msgid "Store data for the Tor software in the following directory"
msgstr ""
+#: advancedpage.ui:315
msgctxt "AdvancedPage"
msgid "Select the directory used to store data for the Tor software"
msgstr ""
-msgctxt "AdvancedPage"
-msgid "Tor Control"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "Use TCP connection (ControlPort)"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "Path:"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "Use Unix domain socket (ControlSocket)"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "Edit current torrc"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "NOTE: this will edit the currently loaded torrc"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "ControlSocket path doesn't exist."
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid ""
-"The specified Tor configuration file location contains characters that "
-"cannot be represented in your system's current 8-bit character encoding."
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid ""
-"The specified Tor data directory location contains characters that cannot be"
-" represented in your system's current 8-bit character encoding."
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "Warning"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "You changed torrc path, would you like to restart Tor?"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "Tor Configuration File (torrc);;All Files (*)"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "Select a file to use for Tor socket path"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "Configure ControlPort automatically"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid ""
-"Vidalia was unable to remove the Tor service.\n"
-"\n"
-"You may need to remove it manually."
-msgstr ""
-
+#: appearancepage.ui:22
msgctxt "AppearancePage"
msgid "Language"
msgstr ""
+#: appearancepage.ui:37
msgctxt "AppearancePage"
msgid "Choose the language used in Vidalia"
msgstr ""
+#: appearancepage.ui:75
msgctxt "AppearancePage"
msgid "Style"
msgstr ""
+#: appearancepage.ui:103
msgctxt "AppearancePage"
msgid "Choose Vidalia's interface style"
msgstr ""
+#: appearancepage.cpp:67
msgctxt "AppearancePage"
msgid "Vidalia was unable to load the selected language translation."
msgstr ""
+#: bwgraph.cpp:166
msgctxt "BandwidthGraph"
msgid "Since:"
msgstr ""
+#: bwgraph.cpp:232
msgctxt "BandwidthGraph"
msgid "Hide Settings"
msgstr ""
+#: bwgraph.ui:40
msgctxt "BandwidthGraph"
msgid "Show Settings"
msgstr ""
+#: bwgraph.ui:16
msgctxt "BandwidthGraph"
msgid "Tor Bandwidth Usage"
msgstr ""
+#: bwgraph.ui:63
msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
+#: bwgraph.ui:151
msgctxt "BandwidthGraph"
msgid "Receive Rate"
msgstr ""
+#: bwgraph.ui:170
msgctxt "BandwidthGraph"
msgid "Send Rate"
msgstr ""
+#: bwgraph.ui:183
msgctxt "BandwidthGraph"
msgid "Always on Top"
msgstr ""
+#: bwgraph.ui:234
msgctxt "BandwidthGraph"
msgid "Style"
msgstr ""
+#: bwgraph.ui:284
msgctxt "BandwidthGraph"
msgid "Changes the transparency of the Bandwidth Graph"
msgstr ""
+#: bwgraph.ui:368
msgctxt "BandwidthGraph"
msgid "100"
msgstr ""
+#: bwgraph.ui:383
msgctxt "BandwidthGraph"
msgid "% Opaque"
msgstr ""
+#: bwgraph.ui:443
msgctxt "BandwidthGraph"
msgid "Save"
msgstr ""
+#: bwgraph.ui:450
msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
-msgctxt "BridgeDownloader"
-msgid "Starting HTTPS bridge request..."
-msgstr ""
-
-msgctxt "BridgeDownloader"
-msgid "Connecting to %1:%2..."
-msgstr ""
-
-msgctxt "BridgeDownloader"
-msgid "Sending an HTTPS request for bridges..."
-msgstr ""
-
-msgctxt "BridgeDownloader"
-msgid "Downloading a list of bridges..."
-msgstr ""
-
-msgctxt "BridgeDownloaderProgressDialog"
-msgid "Downloading Bridges"
-msgstr ""
-
-msgctxt "BridgeDownloaderProgressDialog"
-msgid "Unable to download bridges: %1"
-msgstr ""
-
-msgctxt "BridgeDownloaderProgressDialog"
-msgid "Retrying bridge request..."
-msgstr ""
-
-msgctxt "BridgeUsageDialog"
-msgid "Country"
-msgstr ""
-
-msgctxt "BridgeUsageDialog"
-msgid "# Clients"
-msgstr ""
-
-msgctxt "BridgeUsageDialog"
-msgid "Clients from the following countries have used your relay since %1"
-msgstr ""
-
-msgctxt "BridgeUsageDialog"
-msgid "Bridge Usage Summary"
-msgstr ""
-
-msgctxt "BridgeUsageDialog"
-msgid "Client Summary"
-msgstr ""
-
+#: circuit.cpp:112
msgctxt "Circuit"
msgid "New"
msgstr ""
+#: circuit.cpp:113
msgctxt "Circuit"
msgid "Open"
msgstr ""
+#: circuit.cpp:114
msgctxt "Circuit"
msgid "Building"
msgstr ""
+#: circuit.cpp:115
msgctxt "Circuit"
msgid "Failed"
msgstr ""
+#: circuit.cpp:116
msgctxt "Circuit"
msgid "Closed"
msgstr ""
+#: circuit.cpp:117
msgctxt "Circuit"
msgid "Unknown"
msgstr ""
+#: circuititem.cpp:39
msgctxt "CircuitItem"
msgid "<Path Empty>"
msgstr ""
+#: circuitlistwidget.cpp:55
msgctxt "CircuitListWidget"
msgid "Connection"
msgstr ""
+#: circuitlistwidget.cpp:55
msgctxt "CircuitListWidget"
msgid "Status"
msgstr ""
+#: circuitlistwidget.cpp:87
msgctxt "CircuitListWidget"
msgid "Zoom to Circuit"
msgstr ""
+#: circuitlistwidget.cpp:89
msgctxt "CircuitListWidget"
msgid "Close Circuit (Del)"
msgstr ""
+#: circuitlistwidget.cpp:110
msgctxt "CircuitListWidget"
msgid "Close Stream (Del)"
msgstr ""
+#: configdialog.cpp:77
msgctxt "ConfigDialog"
msgid "General"
msgstr ""
+#: configdialog.cpp:81
msgctxt "ConfigDialog"
msgid "Network"
msgstr ""
+#: configdialog.cpp:85
msgctxt "ConfigDialog"
msgid "Sharing"
msgstr ""
+#: configdialog.cpp:89
msgctxt "ConfigDialog"
msgid "Services"
msgstr ""
+#: configdialog.cpp:93
msgctxt "ConfigDialog"
msgid "Appearance"
msgstr ""
+#: configdialog.cpp:97
msgctxt "ConfigDialog"
msgid "Advanced"
msgstr ""
+#: configdialog.cpp:111
msgctxt "ConfigDialog"
msgid "Help"
msgstr ""
+#: configdialog.cpp:196
msgctxt "ConfigDialog"
msgid "Error Saving Settings"
msgstr ""
+#: configdialog.cpp:198
msgctxt "ConfigDialog"
msgid "Vidalia was unable to save your %1 settings."
msgstr ""
+#: configdialog.cpp:225
msgctxt "ConfigDialog"
msgid "Error Applying Settings"
msgstr ""
+#: configdialog.cpp:227
msgctxt "ConfigDialog"
msgid "Vidalia was unable to apply your %1 settings to Tor."
msgstr ""
+#: configdialog.ui:16
msgctxt "ConfigDialog"
msgid "Settings"
msgstr ""
+#: controlconnection.cpp:134
msgctxt "ControlConnection"
msgid "Vidalia was unable to connect to Tor. (%1)"
msgstr ""
+#: controlconnection.cpp:331
msgctxt "ControlConnection"
msgid "Control socket is not connected."
msgstr ""
+#: controlpasswordinputdialog.ui:28
msgctxt "ControlPasswordInputDialog"
msgid "Password Required"
msgstr ""
+#: controlpasswordinputdialog.ui:80
msgctxt "ControlPasswordInputDialog"
-msgid "Remember my password"
+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:"
+msgid "Remember my password"
msgstr ""
+#: controlsocket.cpp:70
msgctxt "ControlSocket"
msgid "Control socket is not connected."
msgstr ""
+#: controlsocket.cpp:80
msgctxt "ControlSocket"
msgid "Error sending control command. [%1]"
msgstr ""
+#: controlsocket.cpp:117
msgctxt "ControlSocket"
msgid "Socket disconnected while attempting to read a line of data."
msgstr ""
+#: controlsocket.cpp:156
msgctxt "ControlSocket"
msgid "Invalid control reply. [%1]"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Afghanistan"
+#: generalpage.cpp:62
+msgctxt "GeneralPage"
+msgid "Executables (*.exe)"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Andorra"
+#: generalpage.cpp:75
+msgctxt "GeneralPage"
+msgid "Select Path to Tor"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Angola"
+#: generalpage.cpp:85
+msgctxt "GeneralPage"
+msgid "Select Proxy Executable"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Antigua & Barbuda"
+#: generalpage.cpp:98
+msgctxt "GeneralPage"
+msgid "You must specify the name of your Tor executable."
msgstr ""
-msgctxt "CountryInfo"
-msgid "Argentina"
+#: generalpage.cpp:106
+msgctxt "GeneralPage"
+msgid "The proxy arguments specified are not properly formatted."
msgstr ""
-msgctxt "CountryInfo"
-msgid "Armenia"
+#: generalpage.ui:28
+msgctxt "GeneralPage"
+msgid "Start Vidalia when my system starts"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Australia"
+#: generalpage.ui:121
+msgctxt "GeneralPage"
+msgid "Browse"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Azerbaijan"
+#: generalpage.ui:57
+msgctxt "GeneralPage"
+msgid "Start the Tor software when Vidalia starts"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Bahamas"
+#: generalpage.ui:51
+msgctxt "GeneralPage"
+msgid "Tor"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Bangladesh"
+#: generalpage.ui:93
+msgctxt "GeneralPage"
+msgid "Proxy Application (optional)"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Barbados"
+#: generalpage.ui:99
+msgctxt "GeneralPage"
+msgid "Start a proxy application when Tor starts"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Belarus"
+#: generalpage.ui:135
+msgctxt "GeneralPage"
+msgid "Proxy Application Arguments:"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Belgium"
+#: graphframe.cpp:238
+msgctxt "GraphFrame"
+msgid "Recv: "
msgstr ""
-msgctxt "CountryInfo"
-msgid "Belize"
+#: graphframe.cpp:298
+msgctxt "GraphFrame"
+msgid "%1 KB/s"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Bhutan"
+#: graphframe.cpp:247
+msgctxt "GraphFrame"
+msgid "Sent: "
msgstr ""
-msgctxt "CountryInfo"
-msgid "Bolivia"
+#: graphframe.cpp:259
+msgctxt "GraphFrame"
+msgid "%1 KB"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Bosnia & Herzegovina"
+#: graphframe.cpp:262
+msgctxt "GraphFrame"
+msgid "%1 MB"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Botswana"
+#: graphframe.cpp:265
+msgctxt "GraphFrame"
+msgid "%1 GB"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Brazil"
+#: helpbrowser.cpp:135
+msgctxt "HelpBrowser"
+msgid "Error Loading Help Contents: "
msgstr ""
-msgctxt "CountryInfo"
-msgid "Brunei Darussalam"
+#: helpbrowser.cpp:147
+msgctxt "HelpBrowser"
+msgid "Supplied XML file is not a valid Contents document."
msgstr ""
-msgctxt "CountryInfo"
-msgid "Bulgaria"
+#: helpbrowser.cpp:396
+msgctxt "HelpBrowser"
+msgid "Search reached end of document"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Burkina Faso"
+#: helpbrowser.cpp:398
+msgctxt "HelpBrowser"
+msgid "Search reached start of document"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Burundi"
+#: helpbrowser.cpp:400
+msgctxt "HelpBrowser"
+msgid "Text not found in document"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Cambodia"
+#: helpbrowser.cpp:445
+msgctxt "HelpBrowser"
+msgid "Found %1 results"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Cameroon"
+#: helpbrowser.ui:33
+msgctxt "HelpBrowser"
+msgid "Vidalia Help"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Canada"
+#: helpbrowser.ui:484
+msgctxt "HelpBrowser"
+msgid "Back"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Cape Verde"
+#: helpbrowser.ui:487
+msgctxt "HelpBrowser"
+msgid "Move to previous page (Backspace)"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Central African Republic"
+#: helpbrowser.ui:490
+msgctxt "HelpBrowser"
+msgid "Backspace"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Chad"
+#: helpbrowser.ui:498
+msgctxt "HelpBrowser"
+msgid "Forward"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Chile"
+#: helpbrowser.ui:501
+msgctxt "HelpBrowser"
+msgid "Move to next page (Shift+Backspace)"
msgstr ""
-msgctxt "CountryInfo"
-msgid "China"
+#: helpbrowser.ui:504
+msgctxt "HelpBrowser"
+msgid "Shift+Backspace"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Colombia"
+#: helpbrowser.ui:512
+msgctxt "HelpBrowser"
+msgid "Home"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Comoros"
+#: helpbrowser.ui:515
+msgctxt "HelpBrowser"
+msgid "Move to the Home page (Ctrl+H)"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Congo, The Democratic Republic of the"
+#: helpbrowser.ui:518
+msgctxt "HelpBrowser"
+msgid "Ctrl+H"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Congo"
+#: helpbrowser.ui:535
+msgctxt "HelpBrowser"
+msgid "Find"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Costa Rica"
+#: helpbrowser.ui:538
+msgctxt "HelpBrowser"
+msgid "Search for a word or phrase on current page (Ctrl+F)"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Cote d’Ivoire"
+#: helpbrowser.ui:541
+msgctxt "HelpBrowser"
+msgid "Ctrl+F"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Croatia"
+#: helpbrowser.ui:549
+msgctxt "HelpBrowser"
+msgid "Close"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Cuba"
+#: helpbrowser.ui:552
+msgctxt "HelpBrowser"
+msgid "Close Vidalia Help"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Cyprus"
+#: helpbrowser.ui:555
+msgctxt "HelpBrowser"
+msgid "Esc"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Czech Republic"
+#: helpbrowser.ui:152
+msgctxt "HelpBrowser"
+msgid "Find:"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Denmark"
+#: helpbrowser.ui:174
+msgctxt "HelpBrowser"
+msgid "Find Previous"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Djibouti"
+#: helpbrowser.ui:187
+msgctxt "HelpBrowser"
+msgid "Find Next"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Dominica"
+#: helpbrowser.ui:221
+msgctxt "HelpBrowser"
+msgid "Case sensitive"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Dominican Republic"
+#: helpbrowser.ui:231
+msgctxt "HelpBrowser"
+msgid "Whole words only"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Ecuador"
+#: helpbrowser.ui:305
+msgctxt "HelpBrowser"
+msgid "Help Topics"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Egypt"
+#: helpbrowser.ui:260
+msgctxt "HelpBrowser"
+msgid "Contents"
msgstr ""
-msgctxt "CountryInfo"
-msgid "El Salvador"
+#: helpbrowser.ui:350
+msgctxt "HelpBrowser"
+msgid "Search"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Equatorial Guinea"
+#: helpbrowser.ui:362
+msgctxt "HelpBrowser"
+msgid "Searching for:"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Eritrea"
+#: helpbrowser.ui:405
+msgctxt "HelpBrowser"
+msgid "Found Documents"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Estonia"
+#: helptextbrowser.cpp:54
+msgctxt "HelpTextBrowser"
+msgid "Error opening help file: "
msgstr ""
-msgctxt "CountryInfo"
-msgid "France"
+#: helptextbrowser.cpp:72
+msgctxt "HelpTextBrowser"
+msgid "Opening External Link"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Gabon"
+#: 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."
msgstr ""
-msgctxt "CountryInfo"
-msgid "Gambia"
+#: helptextbrowser.cpp:78
+msgctxt "HelpTextBrowser"
+msgid "Do you want Vidalia to open the link in your Web browser?"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Georgia"
+#: helptextbrowser.cpp:88
+msgctxt "HelpTextBrowser"
+msgid "Unable to Open Link"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Germany"
+#: helptextbrowser.cpp:90
+msgctxt "HelpTextBrowser"
+msgid "Vidalia was unable to open the selected link in your Web browser. You can still copy the URL and paste it into your browser."
msgstr ""
-msgctxt "CountryInfo"
-msgid "Ghana"
+#: licensedialog.ui:13
+msgctxt "LicenseDialog"
+msgid "License Information"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Grenada"
+#: licensedialog.ui:43
+msgctxt "LicenseDialog"
+msgid "License"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Guatemala"
+#: licensedialog.ui:76
+msgctxt "LicenseDialog"
+msgid "Credits"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Guinea"
+#: logevent.cpp:57
+msgctxt "LogEvent"
+msgid "Debug"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Guinea-Bissau"
+#: logevent.cpp:58
+msgctxt "LogEvent"
+msgid "Info"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Guyana"
+#: logevent.cpp:59
+msgctxt "LogEvent"
+msgid "Notice"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Hong Kong"
+#: logevent.cpp:60
+msgctxt "LogEvent"
+msgid "Warning"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Haiti"
+#: logevent.cpp:61
+msgctxt "LogEvent"
+msgid "Error"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Honduras"
+#: logevent.cpp:62
+msgctxt "LogEvent"
+msgid "Unknown"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Israel"
+#: mainwindow.ui:233
+msgctxt "MainWindow"
+msgid "Start Tor"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Italy"
+#: mainwindow.ui:443
+msgctxt "MainWindow"
+msgid "Exit"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Jamaica"
+#: mainwindow.ui:304
+msgctxt "MainWindow"
+msgid "Bandwidth Graph"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Japan"
+#: mainwindow.ui:317
+msgctxt "MainWindow"
+msgid "Message Log"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Jordan"
+#: mainwindow.cpp:348
+msgctxt "MainWindow"
+msgid "Network Map"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Kazakhstan"
+#: mainwindow.cpp:354
+msgctxt "MainWindow"
+msgid "Control Panel"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Kenya"
+#: mainwindow.ui:380
+msgctxt "MainWindow"
+msgid "Settings"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Kiribati"
+#: mainwindow.ui:430
+msgctxt "MainWindow"
+msgid "About"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Kuwait"
+#: mainwindow.ui:367
+msgctxt "MainWindow"
+msgid "Help"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Kyrgyzstan"
+#: mainwindow.cpp:1391
+msgctxt "MainWindow"
+msgid "New Identity"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Laos"
+#: mainwindow.cpp:437
+msgctxt "MainWindow"
+msgid "Ctrl+T"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Latvia"
+#: mainwindow.cpp:438
+msgctxt "MainWindow"
+msgid "Ctrl+B"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Lebanon"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Lesotho"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Liberia"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Liechtenstein"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Lithuania"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Luxembourg"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Macedonia"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Madagascar"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Malawi"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Malaysia"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Mali"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Malta"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Marshall Islands"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Mauritania"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Mauritius"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Micronesia"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Moldova"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Monaco"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Mongolia"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Montenegro"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Morocco"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Mozambique"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Namibia"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Nauru"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Nepal"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Netherlands"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "New Zealand"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Nicaragua"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Niger"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Nigeria"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Norway"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Oman"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Pakistan"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Palau"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Palestine"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Panama"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Papua New Guinea"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Paraguay"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Peru"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Philippines"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Poland"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Portugal"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Qatar"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Romania"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Russia"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Rwanda"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Saint Kitts & Nevis"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Saint Lucia"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Saint Vincent & the Grenadines"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Samoa"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "San Marino"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Sao Tome & Principe"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Saudi Arabia"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Senegal"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Serbia"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Seychelles"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Sierra Leone"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Singapore"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Slovakia"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Slovenia"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Solomon Islands"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Somalia"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "South Africa"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Spain"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Sri Lanka"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Sudan"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Suriname"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Swaziland"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Sweden"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Switzerland"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Syria"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Tajikistan"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Tanzania"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Thailand"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Timor-Leste (East Timor)"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Togo"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Tonga"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Trinidad & Tobago"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Tunisia"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Turkey"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Turkmenistan"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Tuvalu"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Uganda"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Ukraine"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "United Arab Emirates"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "United Kingdom"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "United States"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Uruguay"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Uzbekistan"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Vanuatu"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Vatican"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Venezuela"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Vietnam"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Western Sahara"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Yemen"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Zambia"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Zimbabwe"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Zaire"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Albania"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Algeria"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Austria"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Bahrain"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Benin"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Ethiopia"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Fiji"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Finland"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Greece"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Guam"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Hungary"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Iceland"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "India"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Indonesia"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Iran"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Iraq"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Ireland"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Korea, North"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Korea, South"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Libya"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Maldives"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Mexico"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Myanmar"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Taiwan"
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid "Submit a Crash Report"
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid "Vidalia encountered an error and needed to close"
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid "Restart Vidalia"
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid "Don't Restart"
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid "Unable to restart Vidalia"
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid ""
-"We were unable to automatically restart Vidalia. Please restart Vidalia "
-"manually."
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid "Please fill a ticket in:"
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid ""
-"<a "
-"href=\"https://trac.torproject.org/projects/tor/newticket\">https://trac.torproject.org/projects/tor/newticket</a>"
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid ""
-"A crash report has been created that you can send to the Vidalia developers "
-"to help identify and fix the problem. The submitted report does not contain "
-"any personally identifying information."
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid ""
-"with a description of what you were doing before the application crashed, "
-"along with the following files corresponding to the crash report:"
-msgstr ""
-
-msgctxt "GeneralPage"
-msgid "Executables (*.exe)"
-msgstr ""
-
-msgctxt "GeneralPage"
-msgid "Select Path to Tor"
-msgstr ""
-
-msgctxt "GeneralPage"
-msgid "Select Proxy Executable"
-msgstr ""
-
-msgctxt "GeneralPage"
-msgid "You must specify the name of your Tor executable."
-msgstr ""
-
-msgctxt "GeneralPage"
-msgid "Start Vidalia when my system starts"
-msgstr ""
-
-msgctxt "GeneralPage"
-msgid "Browse"
-msgstr ""
-
-msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr ""
-
-msgctxt "GeneralPage"
-msgid "Tor"
-msgstr ""
-
-msgctxt "GeneralPage"
-msgid "Proxy Application (optional)"
-msgstr ""
-
-msgctxt "GeneralPage"
-msgid "Start a proxy application when Tor starts"
-msgstr ""
-
-msgctxt "GeneralPage"
-msgid "Proxy Application Arguments:"
-msgstr ""
-
-msgctxt "GeneralPage"
-msgid "Software Updates"
-msgstr ""
-
-msgctxt "GeneralPage"
-msgid "Check for new software updates automatically"
-msgstr ""
-
-msgctxt "GeneralPage"
-msgid "Check Now"
-msgstr ""
-
-msgctxt "GraphFrame"
-msgid "%1 KB/s"
-msgstr ""
-
-msgctxt "GraphFrame"
-msgid "%1 KB"
-msgstr ""
-
-msgctxt "GraphFrame"
-msgid "%1 MB"
-msgstr ""
-
-msgctxt "GraphFrame"
-msgid "%1 GB"
-msgstr ""
-
-msgctxt "GraphFrame"
-msgid "Recv:"
-msgstr ""
-
-msgctxt "GraphFrame"
-msgid "Sent:"
-msgstr ""
-
-msgctxt "HelpBrowser"
-msgid "Supplied XML file is not a valid Contents document."
-msgstr ""
-
-msgctxt "HelpBrowser"
-msgid "Search reached end of document"
-msgstr ""
-
-msgctxt "HelpBrowser"
-msgid "Search reached start of document"
-msgstr ""
-
-msgctxt "HelpBrowser"
-msgid "Text not found in document"
-msgstr ""
-
-msgctxt "HelpBrowser"
-msgid "Found %1 results"
-msgstr ""
-
-msgctxt "HelpBrowser"
-msgid "Vidalia Help"
-msgstr ""
-
-msgctxt "HelpBrowser"
-msgid "Back"
-msgstr ""
-
-msgctxt "HelpBrowser"
-msgid "Move to previous page (Backspace)"
-msgstr ""
-
-msgctxt "HelpBrowser"
-msgid "Backspace"
-msgstr ""
-
-msgctxt "HelpBrowser"
-msgid "Forward"
-msgstr ""
-
-msgctxt "HelpBrowser"
-msgid "Move to next page (Shift+Backspace)"
-msgstr ""
-
-msgctxt "HelpBrowser"
-msgid "Shift+Backspace"
-msgstr ""
-
-msgctxt "HelpBrowser"
-msgid "Home"
-msgstr ""
-
-msgctxt "HelpBrowser"
-msgid "Move to the Home page (Ctrl+H)"
-msgstr ""
-
-msgctxt "HelpBrowser"
-msgid "Ctrl+H"
-msgstr ""
-
-msgctxt "HelpBrowser"
-msgid "Find"
-msgstr ""
-
-msgctxt "HelpBrowser"
-msgid "Search for a word or phrase on current page (Ctrl+F)"
-msgstr ""
-
-msgctxt "HelpBrowser"
-msgid "Ctrl+F"
-msgstr ""
-
-msgctxt "HelpBrowser"
-msgid "Close"
-msgstr ""
-
-msgctxt "HelpBrowser"
-msgid "Close Vidalia Help"
-msgstr ""
-
-msgctxt "HelpBrowser"
-msgid "Esc"
-msgstr ""
-
-msgctxt "HelpBrowser"
-msgid "Find:"
-msgstr ""
-
-msgctxt "HelpBrowser"
-msgid "Find Previous"
-msgstr ""
-
-msgctxt "HelpBrowser"
-msgid "Find Next"
-msgstr ""
-
-msgctxt "HelpBrowser"
-msgid "Case sensitive"
-msgstr ""
-
-msgctxt "HelpBrowser"
-msgid "Whole words only"
-msgstr ""
-
-msgctxt "HelpBrowser"
-msgid "Help Topics"
-msgstr ""
-
-msgctxt "HelpBrowser"
-msgid "Contents"
-msgstr ""
-
-msgctxt "HelpBrowser"
-msgid "Search"
-msgstr ""
-
-msgctxt "HelpBrowser"
-msgid "Searching for:"
-msgstr ""
-
-msgctxt "HelpBrowser"
-msgid "Found Documents"
-msgstr ""
-
-msgctxt "HelpBrowser"
-msgid "Error Loading Help Contents:"
-msgstr ""
-
-msgctxt "HelpTextBrowser"
-msgid "Opening External Link"
-msgstr ""
-
-msgctxt "HelpTextBrowser"
-msgid ""
-"Vidalia can open the link you selected in your default Web browser. If your "
-"browser is not currently configured to use Tor then the request will not be "
-"anonymous."
-msgstr ""
-
-msgctxt "HelpTextBrowser"
-msgid "Do you want Vidalia to open the link in your Web browser?"
-msgstr ""
-
-msgctxt "HelpTextBrowser"
-msgid "Unable to Open Link"
-msgstr ""
-
-msgctxt "HelpTextBrowser"
-msgid ""
-"Vidalia was unable to open the selected link in your Web browser. You can "
-"still copy the URL and paste it into your browser."
-msgstr ""
-
-msgctxt "HelpTextBrowser"
-msgid "Error opening help file:"
-msgstr ""
-
-msgctxt "LicenseDialog"
-msgid "License Information"
-msgstr ""
-
-msgctxt "LicenseDialog"
-msgid "License"
-msgstr ""
-
-msgctxt "LicenseDialog"
-msgid "Credits"
-msgstr ""
-
-msgctxt "LogEvent"
-msgid "Debug"
-msgstr ""
-
-msgctxt "LogEvent"
-msgid "Info"
-msgstr ""
-
-msgctxt "LogEvent"
-msgid "Notice"
-msgstr ""
-
-msgctxt "LogEvent"
-msgid "Warning"
-msgstr ""
-
-msgctxt "LogEvent"
-msgid "Error"
-msgstr ""
-
-msgctxt "LogEvent"
-msgid "Unknown"
-msgstr ""
-
-msgctxt "LogTreeItem"
-msgid "Debug"
-msgstr ""
-
-msgctxt "LogTreeItem"
-msgid "Info"
-msgstr ""
-
-msgctxt "LogTreeItem"
-msgid "Notice"
-msgstr ""
-
-msgctxt "LogTreeItem"
-msgid "Warning"
-msgstr ""
-
-msgctxt "LogTreeItem"
-msgid "Error"
-msgstr ""
-
-msgctxt "LogTreeItem"
-msgid "Unknown"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Start Tor"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Exit"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Bandwidth Graph"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Message Log"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Network Map"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Control Panel"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Settings"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "About"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Help"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "New Identity"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+T"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+B"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+L"
+#: mainwindow.cpp:439
+msgctxt "MainWindow"
+msgid "Ctrl+L"
msgstr ""
+#: mainwindow.cpp:440
msgctxt "MainWindow"
msgid "Ctrl+N"
msgstr ""
+#: mainwindow.cpp:441
msgctxt "MainWindow"
msgid "Ctrl+?"
msgstr ""
+#: mainwindow.cpp:442
msgctxt "MainWindow"
msgid "Ctrl+I"
msgstr ""
+#: mainwindow.cpp:443
msgctxt "MainWindow"
msgid "Ctrl+P"
msgstr ""
+#: mainwindow.cpp:463
msgctxt "MainWindow"
msgid "Tor"
msgstr ""
+#: mainwindow.cpp:468
msgctxt "MainWindow"
msgid "View"
msgstr ""
+#: mainwindow.cpp:476
msgctxt "MainWindow"
msgid "Vidalia Help"
msgstr ""
+#: mainwindow.cpp:527
msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
+#: mainwindow.cpp:528
msgctxt "MainWindow"
msgid "Vidalia was unable to start the configured web browser"
msgstr ""
+#: mainwindow.cpp:540
msgctxt "MainWindow"
msgid "Error starting IM client"
msgstr ""
+#: mainwindow.cpp:541
msgctxt "MainWindow"
msgid "Vidalia was unable to start the configured IM client"
msgstr ""
+#: mainwindow.cpp:562
msgctxt "MainWindow"
msgid "Error starting proxy server"
msgstr ""
+#: mainwindow.cpp:563
msgctxt "MainWindow"
msgid "Vidalia was unable to start the configured proxy server"
msgstr ""
+#: mainwindow.cpp:579
msgctxt "MainWindow"
msgid "Connecting to a relay directory"
msgstr ""
+#: mainwindow.cpp:583
msgctxt "MainWindow"
msgid "Establishing an encrypted directory connection"
msgstr ""
+#: mainwindow.cpp:586
msgctxt "MainWindow"
msgid "Retrieving network status"
msgstr ""
+#: mainwindow.cpp:589
msgctxt "MainWindow"
msgid "Loading network status"
msgstr ""
+#: mainwindow.cpp:592
msgctxt "MainWindow"
msgid "Loading authority certificates"
msgstr ""
+#: mainwindow.cpp:595
msgctxt "MainWindow"
msgid "Requesting relay information"
msgstr ""
+#: mainwindow.cpp:598
msgctxt "MainWindow"
msgid "Loading relay information"
msgstr ""
+#: mainwindow.cpp:1132
msgctxt "MainWindow"
msgid "Connecting to the Tor network"
msgstr ""
+#: mainwindow.cpp:605
msgctxt "MainWindow"
msgid "Establishing a Tor circuit"
msgstr ""
+#: mainwindow.cpp:1297
msgctxt "MainWindow"
msgid "Connected to the Tor network!"
msgstr ""
+#: mainwindow.cpp:612
msgctxt "MainWindow"
msgid "Unrecognized startup status"
msgstr ""
+#: mainwindow.cpp:619
msgctxt "MainWindow"
msgid "miscellaneous"
msgstr ""
+#: mainwindow.cpp:622
msgctxt "MainWindow"
msgid "identity mismatch"
msgstr ""
+#: mainwindow.cpp:625
msgctxt "MainWindow"
msgid "done"
msgstr ""
+#: mainwindow.cpp:628
msgctxt "MainWindow"
msgid "connection refused"
msgstr ""
+#: mainwindow.cpp:631
msgctxt "MainWindow"
msgid "connection timeout"
msgstr ""
+#: mainwindow.cpp:634
msgctxt "MainWindow"
msgid "read/write error"
msgstr ""
+#: mainwindow.cpp:637
msgctxt "MainWindow"
msgid "no route to host"
msgstr ""
+#: mainwindow.cpp:640
msgctxt "MainWindow"
msgid "insufficient resources"
msgstr ""
+#: mainwindow.cpp:643
msgctxt "MainWindow"
msgid "unknown"
msgstr ""
+#: mainwindow.cpp:645
+msgctxt "MainWindow"
+msgid " failed (%1)"
+msgstr ""
+
+#: mainwindow.ui:168
msgctxt "MainWindow"
msgid "Tor is not running"
msgstr ""
+#: mainwindow.cpp:686
+msgctxt "MainWindow"
+msgid "Your relay is shutting down."
+"Click 'Stop' again to stop your relay now."
+msgstr ""
+
+#: mainwindow.cpp:688
msgctxt "MainWindow"
msgid "Tor is shutting down"
msgstr ""
+#: mainwindow.cpp:693
msgctxt "MainWindow"
msgid "Stop Tor Now"
msgstr ""
+#: mainwindow.cpp:695
msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
+#: mainwindow.cpp:711
msgctxt "MainWindow"
msgid "Starting the Tor software"
msgstr ""
+#: mainwindow.ui:75
msgctxt "MainWindow"
msgid "Starting Tor"
msgstr ""
+#: mainwindow.cpp:859
msgctxt "MainWindow"
msgid "Error Starting Tor"
msgstr ""
+#: mainwindow.cpp:862
msgctxt "MainWindow"
-msgid ""
-"Vidalia was unable to start Tor. Check your settings to ensure the correct "
-"name and location of your Tor executable is specified."
+msgid "Vidalia was unable to start Tor. Check your settings to ensure the correct name and location of your Tor executable is specified."
msgstr ""
+#: mainwindow.cpp:896
msgctxt "MainWindow"
msgid "Connecting to Tor"
msgstr ""
+#: mainwindow.cpp:906
msgctxt "MainWindow"
msgid "Connection Error"
msgstr ""
+#: mainwindow.cpp:938
msgctxt "MainWindow"
msgid "Relaying is Enabled"
msgstr ""
+#: mainwindow.cpp:943
+msgctxt "MainWindow"
+msgid "You are currently running a relay. Terminating your relay will interrupt any open connections from clients."
+""
+"Would you like to shutdown gracefully and give clients time to find a new relay?"
+msgstr ""
+
+#: mainwindow.cpp:965
msgctxt "MainWindow"
msgid "Error Shutting Down"
msgstr ""
+#: mainwindow.cpp:966
msgctxt "MainWindow"
msgid "Vidalia was unable to stop the Tor software."
msgstr ""
+#: mainwindow.cpp:997
msgctxt "MainWindow"
msgid "Unexpected Error"
msgstr ""
+#: mainwindow.cpp:1001
+msgctxt "MainWindow"
+msgid "Vidalia detected that the Tor software exited unexpectedly."
+""
+"Please check the message log for recent warning or error messages."
+msgstr ""
+
+#: mainwindow.cpp:1055
msgctxt "MainWindow"
msgid "Authenticating to Tor"
msgstr ""
+#: mainwindow.cpp:1075
msgctxt "MainWindow"
msgid "Cookie Authentication Required"
msgstr ""
+#: mainwindow.cpp:1078
msgctxt "MainWindow"
-msgid ""
-"The Tor software requires Vidalia to send the contents of an authentication "
-"cookie, but Vidalia was unable to find one."
+msgid "The Tor software requires Vidalia to send the contents of an authentication cookie, but Vidalia was unable to find one."
msgstr ""
+#: mainwindow.cpp:1080
msgctxt "MainWindow"
msgid "Would you like to browse for the file 'control_auth_cookie' yourself?"
msgstr ""
+#: mainwindow.cpp:1087
msgctxt "MainWindow"
msgid "Data Directory"
msgstr ""
+#: mainwindow.cpp:1089
msgctxt "MainWindow"
msgid "Control Cookie (control_auth_cookie)"
msgstr ""
+#: mainwindow.cpp:1141
msgctxt "MainWindow"
msgid "Error Registering for Events"
msgstr ""
+#: mainwindow.cpp:1143
msgctxt "MainWindow"
-msgid ""
-"Vidalia was unable to register for some events. Many of Vidalia's features "
-"may be unavailable."
+msgid "Vidalia was unable to register for some events. Many of Vidalia's features may be unavailable."
msgstr ""
+#: mainwindow.cpp:1222
msgctxt "MainWindow"
msgid "Authentication Error"
msgstr ""
+#: mainwindow.cpp:1224
msgctxt "MainWindow"
msgid "Vidalia was unable to authenticate to the Tor software. (%1)"
msgstr ""
+#: mainwindow.cpp:1226
msgctxt "MainWindow"
msgid "Please check your control port authentication settings."
msgstr ""
+#: mainwindow.cpp:1330
msgctxt "MainWindow"
msgid "Tor Update Available"
msgstr ""
+#: mainwindow.cpp:1333
msgctxt "MainWindow"
-msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended. Please visit the Tor website to download the latest version."
+msgid "The currently installed version of Tor is out of date or no longer recommended. Please visit the Tor website to download the latest version."
msgstr ""
+#: mainwindow.cpp:1333
msgctxt "MainWindow"
msgid "Tor website: %1"
msgstr ""
+#: mainwindow.cpp:1394
msgctxt "MainWindow"
-msgid ""
-"All subsequent connections will appear to be different than your old "
-"connections."
+msgid "All subsequent connections will appear to be different than your old connections."
msgstr ""
+#: mainwindow.cpp:1409
msgctxt "MainWindow"
msgid "Failed to Create New Identity"
msgstr ""
+#: mainwindow.cpp:1458
msgctxt "MainWindow"
msgid "Port Forwarding Failed"
msgstr ""
+#: mainwindow.cpp:1459
msgctxt "MainWindow"
msgid "Vidalia was unable to configure automatic port forwarding."
msgstr ""
+#: mainwindow.ui:19
msgctxt "MainWindow"
msgid "Vidalia Control Panel"
msgstr ""
+#: mainwindow.ui:49
msgctxt "MainWindow"
msgid "Status"
msgstr ""
+#: mainwindow.ui:218
msgctxt "MainWindow"
msgid "Vidalia Shortcuts"
msgstr ""
+#: mainwindow.ui:243
msgctxt "MainWindow"
msgid "Setup Relaying"
msgstr ""
+#: mainwindow.ui:246
msgctxt "MainWindow"
msgid "Set up a relay and help the network grow"
msgstr ""
+#: mainwindow.ui:256
msgctxt "MainWindow"
msgid "View the Network"
msgstr ""
+#: mainwindow.ui:259
msgctxt "MainWindow"
msgid "View a map of the Tor network"
msgstr ""
+#: mainwindow.ui:272
msgctxt "MainWindow"
msgid "Use a New Identity"
msgstr ""
+#: mainwindow.ui:275
msgctxt "MainWindow"
msgid "Make subsequent connections appear new"
msgstr ""
+#: mainwindow.ui:307
msgctxt "MainWindow"
msgid "View recent bandwidth usage"
msgstr ""
+#: mainwindow.ui:320
msgctxt "MainWindow"
-msgid "View log message history"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "View help documentation"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Configure Vidalia"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "View version and license information"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Exit Vidalia"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Show this window on startup"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Hide"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Hide this window"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Password Reset Failed"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid ""
-"Vidalia tried to reset Tor's control password, but was not able to restart "
-"the Tor software. Please check your Task Manager to ensure there are no "
-"other Tor processes running."
-msgstr ""
-
-msgctxt "MainWindow"
-msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended."
-msgstr ""
-
-msgctxt "MainWindow"
-msgid ""
-"Would you like to check if a newer package is available for installation?"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Potentially Unsafe Connection"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid ""
-"Tor has automatically closed your connection in order to protect your "
-"anonymity."
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Update Failed"
+msgid "View log message history"
msgstr ""
+#: mainwindow.ui:370
msgctxt "MainWindow"
-msgid "Your software is up to date"
+msgid "View help documentation"
msgstr ""
+#: mainwindow.ui:383
msgctxt "MainWindow"
-msgid ""
-"There are no new Tor software packages available for your computer at this "
-"time."
+msgid "Configure Vidalia"
msgstr ""
+#: mainwindow.ui:433
msgctxt "MainWindow"
-msgid "Installation Failed"
+msgid "View version and license information"
msgstr ""
+#: mainwindow.ui:446
msgctxt "MainWindow"
-msgid "Vidalia was unable to install your software updates."
+msgid "Exit Vidalia"
msgstr ""
+#: mainwindow.ui:498
msgctxt "MainWindow"
-msgid "The following error occurred:"
+msgid "Show this window on startup"
msgstr ""
+#: mainwindow.ui:517
msgctxt "MainWindow"
-msgid ""
-"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 "Hide"
msgstr ""
+#: mainwindow.ui:520
msgctxt "MainWindow"
-msgid "failed (%1)"
+msgid "Hide this window"
msgstr ""
+#: mainwindow.cpp:1210
msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+msgid "Password Reset Failed"
msgstr ""
+#: mainwindow.cpp:1213
msgctxt "MainWindow"
-msgid "Bootstrapping torrc from %1 to %2"
+msgid "Vidalia tried to reset Tor's control 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 ""
-"You are currently running a relay. Terminating your relay 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 ""
-msgctxt "MainWindow"
-msgid "(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)"
+#: 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."
+#: 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 ""
+#: messagelog.cpp:190
msgctxt "MessageLog"
msgid "Vidalia was unable to register for Tor's log events."
msgstr ""
+#: messagelog.cpp:205
msgctxt "MessageLog"
msgid "Error Opening Log File"
msgstr ""
+#: messagelog.cpp:206
msgctxt "MessageLog"
msgid "Vidalia was unable to open the specified log file."
msgstr ""
+#: messagelog.cpp:227
msgctxt "MessageLog"
msgid "Log Filename Required"
msgstr ""
+#: messagelog.cpp:229
msgctxt "MessageLog"
msgid "You must enter a filename to be able to save log messages to a file."
msgstr ""
+#: messagelog.cpp:280
msgctxt "MessageLog"
msgid "Select Log File"
msgstr ""
+#: messagelog.cpp:297
msgctxt "MessageLog"
msgid "Save Log Messages"
msgstr ""
+#: messagelog.cpp:300
msgctxt "MessageLog"
msgid "Text Files (*.txt)"
msgstr ""
+#: messagelog.cpp:309
msgctxt "MessageLog"
msgid "Vidalia"
msgstr ""
+#: messagelog.cpp:310
+msgctxt "MessageLog"
+msgid "Cannot write file %1"
+""
+"%2."
+msgstr ""
+
+#: messagelog.cpp:360
msgctxt "MessageLog"
msgid "Find in Message Log"
msgstr ""
+#: messagelog.cpp:361
msgctxt "MessageLog"
msgid "Find:"
msgstr ""
+#: messagelog.cpp:367
msgctxt "MessageLog"
msgid "Not Found"
msgstr ""
+#: messagelog.cpp:368
msgctxt "MessageLog"
msgid "Search found 0 matches."
msgstr ""
+#: messagelog.ui:19
msgctxt "MessageLog"
msgid "Message Log"
msgstr ""
+#: messagelog.ui:452
msgctxt "MessageLog"
msgid "Message Filters..."
msgstr ""
+#: messagelog.ui:455
msgctxt "MessageLog"
msgid "Set message filters"
msgstr ""
+#: messagelog.ui:463
msgctxt "MessageLog"
msgid "History Size..."
msgstr ""
+#: messagelog.ui:466
msgctxt "MessageLog"
msgid "Set maximum number of messages to display"
msgstr ""
+#: messagelog.ui:477
msgctxt "MessageLog"
msgid "Clear"
msgstr ""
+#: messagelog.ui:480
msgctxt "MessageLog"
msgid "Clear all messages from the Message Log (Ctrl+E)"
msgstr ""
+#: messagelog.ui:483
msgctxt "MessageLog"
msgid "Ctrl+E"
msgstr ""
+#: messagelog.ui:497
msgctxt "MessageLog"
msgid "Copy"
msgstr ""
+#: messagelog.ui:500
msgctxt "MessageLog"
msgid "Copy the selected messages to the clipboard (Ctrl+C)"
msgstr ""
+#: messagelog.ui:503
msgctxt "MessageLog"
msgid "Ctrl+C"
msgstr ""
+#: messagelog.ui:514
msgctxt "MessageLog"
msgid "Select All"
msgstr ""
+#: messagelog.ui:517
msgctxt "MessageLog"
msgid "Select all messages (Ctrl+A)"
msgstr ""
+#: messagelog.ui:520
msgctxt "MessageLog"
msgid "Ctrl+A"
msgstr ""
+#: messagelog.ui:528
msgctxt "MessageLog"
msgid "Save All"
msgstr ""
+#: messagelog.ui:531
msgctxt "MessageLog"
msgid "Save all messages to a file"
msgstr ""
+#: messagelog.ui:539
msgctxt "MessageLog"
msgid "Save Selected"
msgstr ""
+#: messagelog.ui:542
msgctxt "MessageLog"
msgid "Save selected messages to a file"
msgstr ""
+#: messagelog.ui:553
msgctxt "MessageLog"
msgid "Settings"
msgstr ""
+#: messagelog.ui:556
msgctxt "MessageLog"
msgid "Adjust Message Log Settings"
msgstr ""
+#: messagelog.ui:559
msgctxt "MessageLog"
msgid "Ctrl+T"
msgstr ""
+#: messagelog.ui:567
msgctxt "MessageLog"
msgid "Help"
msgstr ""
+#: messagelog.ui:570
msgctxt "MessageLog"
msgid "Show the help browser"
msgstr ""
+#: messagelog.ui:573
msgctxt "MessageLog"
msgid "F1"
msgstr ""
+#: messagelog.ui:581
msgctxt "MessageLog"
msgid "Close"
msgstr ""
+#: messagelog.ui:584
msgctxt "MessageLog"
msgid "Close the Message Log"
msgstr ""
+#: messagelog.ui:587
msgctxt "MessageLog"
msgid "Esc"
msgstr ""
+#: messagelog.ui:598
msgctxt "MessageLog"
msgid "Find"
msgstr ""
+#: messagelog.ui:601
msgctxt "MessageLog"
msgid "Find all messages containing the search text (Ctrl+F)"
msgstr ""
+#: messagelog.ui:604
msgctxt "MessageLog"
msgid "Ctrl+F"
msgstr ""
+#: messagelog.ui:66
msgctxt "MessageLog"
msgid "Time"
msgstr ""
+#: messagelog.ui:71
msgctxt "MessageLog"
msgid "Type"
msgstr ""
+#: messagelog.ui:76
msgctxt "MessageLog"
msgid "Message"
msgstr ""
+#: messagelog.ui:160
msgctxt "MessageLog"
msgid "Saves the current Message Log settings"
msgstr ""
+#: messagelog.ui:163
msgctxt "MessageLog"
msgid "Save Settings"
msgstr ""
+#: messagelog.ui:179
msgctxt "MessageLog"
msgid "Cancels changes made to settings"
msgstr ""
+#: messagelog.ui:182
msgctxt "MessageLog"
msgid "Cancel"
msgstr ""
+#: messagelog.ui:196
msgctxt "MessageLog"
msgid "Message Filter"
msgstr ""
+#: messagelog.ui:217
msgctxt "MessageLog"
msgid "Error"
msgstr ""
+#: messagelog.ui:233
msgctxt "MessageLog"
msgid "Warning"
msgstr ""
+#: messagelog.ui:249
msgctxt "MessageLog"
msgid "Notice"
msgstr ""
+#: messagelog.ui:265
msgctxt "MessageLog"
msgid "Info"
msgstr ""
+#: messagelog.ui:281
msgctxt "MessageLog"
msgid "Debug"
msgstr ""
+#: messagelog.ui:297
msgctxt "MessageLog"
msgid "Message Log History"
msgstr ""
+#: messagelog.ui:318
msgctxt "MessageLog"
msgid "Number of messages to display in the message log window"
msgstr ""
+#: messagelog.ui:337
msgctxt "MessageLog"
msgid "messages"
msgstr ""
-msgctxt "MessageLog"
-msgid "Browse"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Enable automatically saving all new log messages to a file"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Automatically save new log messages to a file"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Basic"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Tor Status"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Advanced"
-msgstr ""
-
+#: messagelog.ui:356
msgctxt "MessageLog"
msgid "Always Save New Log Messages"
msgstr ""
+#: messagelog.ui:371
msgctxt "MessageLog"
-msgid ""
-"Messages that appear when something has \n"
-"gone very wrong and Tor cannot proceed."
-msgstr ""
-
-msgctxt "MessageLog"
-msgid ""
-"Messages that only appear when \n"
-"something has gone wrong with Tor."
-msgstr ""
-
-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 ""
-
-msgctxt "MessageLog"
-msgid ""
-"Messages that appear frequently \n"
-"during normal Tor operation."
+msgid "Browse"
msgstr ""
+#: messagelog.ui:394
msgctxt "MessageLog"
-msgid ""
-"Hyper-verbose messages primarily of \n"
-"interest to Tor developers."
+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 ""
+#: netviewer.ui:24
msgctxt "NetViewer"
msgid "Tor Network Map"
msgstr ""
+#: netviewer.ui:239
msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
+#: netviewer.ui:245
msgctxt "NetViewer"
msgid "Refresh the list of Tor relays and connections"
msgstr ""
+#: netviewer.ui:248
msgctxt "NetViewer"
msgid "Ctrl+R"
msgstr ""
+#: netviewer.ui:256
msgctxt "NetViewer"
msgid "Help"
msgstr ""
+#: netviewer.ui:259
msgctxt "NetViewer"
msgid "Show the network map help"
msgstr ""
+#: netviewer.ui:262
msgctxt "NetViewer"
msgid "Show network map help"
msgstr ""
+#: netviewer.ui:265
msgctxt "NetViewer"
msgid "F1"
msgstr ""
+#: netviewer.ui:273
msgctxt "NetViewer"
msgid "Close"
msgstr ""
+#: netviewer.ui:279
msgctxt "NetViewer"
msgid "Close the network map"
msgstr ""
+#: netviewer.ui:282
msgctxt "NetViewer"
msgid "Esc"
msgstr ""
+#: netviewer.ui:290
msgctxt "NetViewer"
msgid "Zoom In"
msgstr ""
+#: netviewer.ui:296
msgctxt "NetViewer"
msgid "Zoom in on the network map"
msgstr ""
+#: netviewer.ui:299
msgctxt "NetViewer"
msgid "+"
msgstr ""
+#: netviewer.ui:307
msgctxt "NetViewer"
msgid "Zoom Out"
msgstr ""
+#: netviewer.ui:313
msgctxt "NetViewer"
msgid "Zoom out on the network map"
msgstr ""
+#: netviewer.ui:316
msgctxt "NetViewer"
msgid "-"
msgstr ""
+#: netviewer.ui:324
msgctxt "NetViewer"
msgid "Zoom To Fit"
msgstr ""
+#: netviewer.ui:330
msgctxt "NetViewer"
msgid "Zooms to fit all currently displayed circuits"
msgstr ""
+#: netviewer.ui:333
msgctxt "NetViewer"
msgid "Ctrl+Z"
msgstr ""
-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 ""
-
+#: networkpage.cpp:193
msgctxt "NetworkPage"
msgid "Invalid Bridge"
msgstr ""
+#: networkpage.cpp:194
msgctxt "NetworkPage"
msgid "The specified bridge identifier is not valid."
msgstr ""
+#: networkpage.cpp:241
msgctxt "NetworkPage"
msgid "Copy (Ctrl+C)"
msgstr ""
+#: networkpage.cpp:272
msgctxt "NetworkPage"
-msgid ""
-"You must specify both an IP address or hostname and a port number to "
-"configure Tor to use a proxy to access the Internet."
+msgid "You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet."
msgstr ""
+#: networkpage.cpp:278
msgctxt "NetworkPage"
-msgid ""
-"You must specify one or more ports to which your firewall allows you to "
-"connect."
+msgid "You must specify one or more ports to which your firewall allows you to connect."
msgstr ""
+#: networkpage.cpp:314
msgctxt "NetworkPage"
msgid "'%1' is not a valid port number."
msgstr ""
+#: networkpage.ui:25
msgctxt "NetworkPage"
msgid "Check if your local network requires a proxy to access the Internet"
msgstr ""
+#: networkpage.ui:28
msgctxt "NetworkPage"
msgid "I use a proxy to access the Internet"
msgstr ""
+#: networkpage.ui:58
msgctxt "NetworkPage"
msgid "Proxy Settings"
msgstr ""
+#: networkpage.ui:70
+msgctxt "NetworkPage"
+msgid "HTTP Proxy:"
+msgstr ""
+
+#: networkpage.ui:80
msgctxt "NetworkPage"
msgid "Username:"
msgstr ""
+#: networkpage.ui:90
+msgctxt "NetworkPage"
+msgid "Use this proxy for HTTPS also"
+msgstr ""
+
+#: networkpage.ui:108
msgctxt "NetworkPage"
msgid "Password:"
msgstr ""
+#: networkpage.ui:135
msgctxt "NetworkPage"
msgid "Port:"
msgstr ""
+#: networkpage.ui:176
msgctxt "NetworkPage"
msgid "Check to only connect to relays using ports allowed by your firewall"
msgstr ""
+#: networkpage.ui:179
msgctxt "NetworkPage"
msgid "My firewall only lets me connect to certain ports"
msgstr ""
+#: networkpage.ui:203
msgctxt "NetworkPage"
msgid "Firewall Settings"
msgstr ""
+#: networkpage.ui:215
msgctxt "NetworkPage"
msgid "Allowed Ports:"
msgstr ""
+#: networkpage.ui:225
msgctxt "NetworkPage"
msgid "80, 443"
msgstr ""
+#: networkpage.ui:235
msgctxt "NetworkPage"
-msgid ""
-"Check to encrypt directory requests and, optionally, use bridge relays to "
-"access the Tor network"
+msgid "Check to encrypt directory requests and, optionally, use bridge relays to access the Tor network"
msgstr ""
+#: networkpage.ui:238
msgctxt "NetworkPage"
msgid "My ISP blocks connections to the Tor network"
msgstr ""
+#: networkpage.ui:262
msgctxt "NetworkPage"
msgid "Bridge Settings"
msgstr ""
+#: networkpage.ui:274
msgctxt "NetworkPage"
-msgid "Add a Bridge:"
-msgstr ""
-
-msgctxt "NetworkPage"
-msgid "Remove the selected bridges from the list"
-msgstr ""
-
-msgctxt "NetworkPage"
-msgid "Copy the selected bridges to the clipboard"
-msgstr ""
-
-msgctxt "NetworkPage"
-msgid "Find Bridges Now"
-msgstr ""
-
-msgctxt "NetworkPage"
-msgid "<a href=\"bridges.finding\">How else can I find bridges?</a>"
-msgstr ""
-
-msgctxt "NetworkPage"
-msgid "<a href=\"bridges.finding\">How can I find bridges?</a>"
-msgstr ""
-
-msgctxt "NetworkPage"
-msgid ""
-"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:"
+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 "You must select the proxy type."
-msgstr ""
-
-msgctxt "NetworkPage"
-msgid "SOCKS 4"
+msgid "Add a Bridge:"
msgstr ""
+#: networkpage.ui:318
msgctxt "NetworkPage"
-msgid "SOCKS 5"
+msgid "<a href=\"bridges.finding\">How do I find a bridge?</a>"
msgstr ""
+#: networkpage.ui:383
msgctxt "NetworkPage"
-msgid "HTTP"
+msgid "Remove the selected bridges from the list"
msgstr ""
+#: networkpage.ui:399
msgctxt "NetworkPage"
-msgid "HTTP / HTTPS"
+msgid "Copy the selected bridges to the clipboard"
msgstr ""
+#: policy.cpp:167
msgctxt "Policy"
msgid "accept"
msgstr ""
+#: policy.cpp:167
msgctxt "Policy"
msgid "reject"
msgstr ""
+#: routerdescriptor.cpp:76
msgctxt "RouterDescriptor"
msgid "Online"
msgstr ""
+#: routerdescriptor.cpp:78
msgctxt "RouterDescriptor"
msgid "Hibernating"
msgstr ""
+#: routerdescriptor.cpp:80
msgctxt "RouterDescriptor"
msgid "Offline"
msgstr ""
+#: routerdescriptorview.cpp:139
msgctxt "RouterDescriptorView"
msgid "Location:"
msgstr ""
+#: routerdescriptorview.cpp:143
msgctxt "RouterDescriptorView"
msgid "IP Address:"
msgstr ""
+#: routerdescriptorview.cpp:144
msgctxt "RouterDescriptorView"
msgid "Platform:"
msgstr ""
+#: routerdescriptorview.cpp:148
msgctxt "RouterDescriptorView"
msgid "Bandwidth:"
msgstr ""
+#: routerdescriptorview.cpp:150
msgctxt "RouterDescriptorView"
msgid "Uptime:"
msgstr ""
+#: routerdescriptorview.cpp:156
msgctxt "RouterDescriptorView"
msgid "Last Updated:"
msgstr ""
+#: routerdescriptorview.cpp:100
msgctxt "RouterDescriptorView"
-msgid "Copy"
-msgstr ""
-
-msgctxt "RouterInfoDialog"
-msgid "Hibernating"
-msgstr ""
-
-msgctxt "RouterInfoDialog"
-msgid "Online"
-msgstr ""
-
-msgctxt "RouterInfoDialog"
-msgid "Offline"
+msgid "%1 days "
msgstr ""
-msgctxt "RouterInfoDialog"
-msgid "Unknown"
-msgstr ""
-
-msgctxt "RouterInfoDialog"
-msgid "Relay Details"
-msgstr ""
-
-msgctxt "RouterInfoDialog"
-msgid "Summary"
-msgstr ""
-
-msgctxt "RouterInfoDialog"
-msgid "Name:"
-msgstr ""
-
-msgctxt "RouterInfoDialog"
-msgid "Status:"
-msgstr ""
-
-msgctxt "RouterInfoDialog"
-msgid "Location:"
-msgstr ""
-
-msgctxt "RouterInfoDialog"
-msgid "IP Address:"
-msgstr ""
-
-msgctxt "RouterInfoDialog"
-msgid "Platform:"
-msgstr ""
-
-msgctxt "RouterInfoDialog"
-msgid "Bandwidth:"
-msgstr ""
-
-msgctxt "RouterInfoDialog"
-msgid "Uptime:"
+#: routerdescriptorview.cpp:103
+msgctxt "RouterDescriptorView"
+msgid "%1 hours "
msgstr ""
-msgctxt "RouterInfoDialog"
-msgid "Contact:"
+#: routerdescriptorview.cpp:106
+msgctxt "RouterDescriptorView"
+msgid "%1 mins "
msgstr ""
-msgctxt "RouterInfoDialog"
-msgid "Last Updated:"
+#: routerdescriptorview.cpp:109
+msgctxt "RouterDescriptorView"
+msgid "%1 secs"
msgstr ""
-msgctxt "RouterInfoDialog"
-msgid "Descriptor"
+#: routerdescriptorview.cpp:48
+msgctxt "RouterDescriptorView"
+msgid "Copy"
msgstr ""
+#: routerlistitem.cpp:67
msgctxt "RouterListItem"
msgid "Offline"
msgstr ""
+#: routerlistitem.cpp:71
msgctxt "RouterListItem"
msgid "Hibernating"
msgstr ""
+#: routerlistitem.cpp:83
msgctxt "RouterListItem"
msgid "%1 KB/s"
msgstr ""
+#: routerlistwidget.cpp:49
msgctxt "RouterListWidget"
msgid "Relay"
msgstr ""
+#: routerlistwidget.cpp:74
msgctxt "RouterListWidget"
msgid "Zoom to Relay"
msgstr ""
+#: routerlistwidget.cpp:220
msgctxt "RouterListWidget"
msgid "%1 relays online"
msgstr ""
+#: routerlistwidget.cpp:67
msgctxt "RouterListWidget"
msgid "Copy"
msgstr ""
+#: routerlistwidget.cpp:68
msgctxt "RouterListWidget"
msgid "Nickname"
msgstr ""
+#: routerlistwidget.cpp:71
msgctxt "RouterListWidget"
msgid "Fingerprint"
msgstr ""
+#: serverpage.cpp:140
msgctxt "ServerPage"
msgid "Bridge Support Unavailable"
msgstr ""
+#: serverpage.cpp:143
msgctxt "ServerPage"
-msgid ""
-"You have configured Tor to act as a bridge relay for censored users, but "
-"your version of Tor does not support bridges."
+msgid "You have configured Tor to act as a bridge relay for censored users, but your version of Tor does not support bridges."
msgstr ""
+#: serverpage.cpp:145
msgctxt "ServerPage"
-msgid ""
-"Please upgrade your Tor software or configure Tor to act as a normal Tor "
-"relay."
+msgid "Please upgrade your Tor software or configure Tor to act as a normal Tor relay."
msgstr ""
+#: serverpage.cpp:199
msgctxt "ServerPage"
msgid "Your bridge relay is not running."
msgstr ""
+#: serverpage.cpp:263
msgctxt "ServerPage"
msgid "You must specify at least a relay nickname and port."
msgstr ""
+#: serverpage.ui:25
msgctxt "ServerPage"
msgid "Run as a client only"
msgstr ""
+#: serverpage.ui:32
msgctxt "ServerPage"
msgid "Relay traffic for the Tor network"
msgstr ""
+#: serverpage.ui:39
+msgctxt "ServerPage"
+msgid "Help censored users reach the Tor network (Tor 0.2.0.8-alpha or newer)"
+msgstr ""
+
+#: serverpage.ui:91
msgctxt "ServerPage"
msgid "Relay Port:"
msgstr ""
+#: serverpage.ui:110
msgctxt "ServerPage"
msgid "Enable to mirror the relay directory"
msgstr ""
+#: serverpage.ui:113
+msgctxt "ServerPage"
+msgid "Mirror the Relay Directory "
+msgstr ""
+
+#: serverpage.ui:139
msgctxt "ServerPage"
msgid "Attempt to automatically configure port forwarding"
msgstr ""
+#: serverpage.ui:154
msgctxt "ServerPage"
msgid "Test"
msgstr ""
+#: serverpage.ui:164
msgctxt "ServerPage"
msgid "Show help topic on port forwarding"
msgstr ""
+#: serverpage.ui:204
+msgctxt "ServerPage"
+msgid "Email address at which you may be reached if there is a"
+"problem with your relay. You might also include your PGP or GPG fingerprint."
+msgstr ""
+
+#: serverpage.ui:234
msgctxt "ServerPage"
msgid "Directory Port:"
msgstr ""
+#: serverpage.ui:267
msgctxt "ServerPage"
msgid "Directory Port Number"
msgstr ""
+#: serverpage.ui:279
msgctxt "ServerPage"
msgid "Contact Info:"
msgstr ""
+#: serverpage.ui:337
msgctxt "ServerPage"
msgid "Name of your relay"
msgstr ""
+#: serverpage.ui:370
msgctxt "ServerPage"
msgid "Port on which users and other relays can communicate with your relay"
msgstr ""
+#: serverpage.ui:380
msgctxt "ServerPage"
msgid "Nickname:"
msgstr ""
+#: serverpage.ui:76
msgctxt "ServerPage"
msgid "Basic Settings"
msgstr ""
+#: serverpage.ui:435
msgctxt "ServerPage"
-msgid ""
-"For Internet connections with fast download speed but slow upload, please "
-"list your upload speed here."
+msgid "For Internet connections with fast download speed but slow upload, please list your upload speed here."
msgstr ""
+#: serverpage.ui:466
msgctxt "ServerPage"
msgid "Cable/DSL 256 Kbps"
msgstr ""
+#: serverpage.ui:471
msgctxt "ServerPage"
msgid "Cable/DSL 512 Kbps"
msgstr ""
+#: serverpage.ui:476
msgctxt "ServerPage"
msgid "Cable/DSL 768 Kbps"
msgstr ""
+#: serverpage.ui:481
msgctxt "ServerPage"
msgid "T1/Cable/DSL 1.5 Mbps"
msgstr ""
+#: serverpage.ui:486
msgctxt "ServerPage"
msgid "> 1.5 Mbps"
msgstr ""
+#: serverpage.ui:491
msgctxt "ServerPage"
msgid "Custom"
msgstr ""
+#: serverpage.ui:456
msgctxt "ServerPage"
msgid "Select the entry that most closely resembles your Internet connection"
msgstr ""
+#: serverpage.ui:502
msgctxt "ServerPage"
msgid "Show help topic on bandwidth rate limits"
msgstr ""
+#: serverpage.ui:591
msgctxt "ServerPage"
-msgid "Average Rate"
-msgstr ""
-
-msgctxt "ServerPage"
-msgid "Long-term average bandwidth limit"
-msgstr ""
-
-msgctxt "ServerPage"
-msgid "KB/s"
-msgstr ""
-
-msgctxt "ServerPage"
-msgid "Maximum Rate"
-msgstr ""
-
-msgctxt "ServerPage"
-msgid "Peak bandwidth rate limit"
-msgstr ""
-
-msgctxt "ServerPage"
-msgid ""
-"Your maximum bandwidth rate must be greater than or equal to your average "
-"bandwidth rate. Both values must be at least 20 KB/s."
-msgstr ""
-
-msgctxt "ServerPage"
-msgid "Bandwidth Limits"
-msgstr ""
-
-msgctxt "ServerPage"
-msgid "Ports 6660 - 6669 and 6697"
-msgstr ""
-
-msgctxt "ServerPage"
-msgid "Internet Relay Chat (IRC)"
-msgstr ""
-
-msgctxt "ServerPage"
-msgid "Ports 110, 143, 993 and 995"
-msgstr ""
-
-msgctxt "ServerPage"
-msgid "Retrieve Mail (POP, IMAP)"
-msgstr ""
-
-msgctxt "ServerPage"
-msgid "Ports unspecified by other checkboxes"
-msgstr ""
-
-msgctxt "ServerPage"
-msgid "Misc Other Services"
-msgstr ""
-
-msgctxt "ServerPage"
-msgid "Ports 706, 1863, 5050, 5190, 5222, 5223, 8300 and 8888"
+msgid "Average Rate"
msgstr ""
+#: serverpage.ui:620
msgctxt "ServerPage"
-msgid "Instant Messaging (IM)"
+msgid "Long-term average bandwidth limit"
msgstr ""
+#: serverpage.ui:708
msgctxt "ServerPage"
-msgid "Port 443"
+msgid "KB/s"
msgstr ""
+#: serverpage.ui:666
msgctxt "ServerPage"
-msgid "Secure Websites (SSL)"
+msgid "Maximum Rate"
msgstr ""
+#: serverpage.ui:695
msgctxt "ServerPage"
-msgid "Port 80"
+msgid "Peak bandwidth rate limit"
msgstr ""
+#: serverpage.ui:737
msgctxt "ServerPage"
-msgid "Websites"
+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 "Show help topic on exit policies"
+msgid "Bandwidth Limits"
msgstr ""
+#: serverpage.ui:802
msgctxt "ServerPage"
-msgid ""
-"What Internet resources should users be able to access from your relay?"
+msgid "Ports 6660 - 6669 and 6697"
msgstr ""
+#: serverpage.ui:805
msgctxt "ServerPage"
-msgid ""
-"Tor will still block some outgoing mail and file sharing applications by "
-"default to reduce spam and other abuse."
+msgid "Internet Relay Chat (IRC)"
msgstr ""
+#: serverpage.ui:815
msgctxt "ServerPage"
-msgid "Exit Policies"
+msgid "Ports 110, 143, 993 and 995"
msgstr ""
+#: serverpage.ui:818
msgctxt "ServerPage"
-msgid "Let others access your bridge by giving them this line:"
+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"
+msgid "Ports unspecified by other checkboxes"
msgstr ""
+#: serverpage.ui:831
msgctxt "ServerPage"
-msgid "Copy your bridge relay's identity to the clipboard"
+msgid "Misc Other Services"
msgstr ""
+#: serverpage.ui:841
msgctxt "ServerPage"
-msgid "No Recent Usage"
+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."
+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."
+msgid "Port 443"
msgstr ""
+#: serverpage.ui:857
msgctxt "ServerPage"
-msgid "Bridge History"
+msgid "Secure Websites (SSL)"
msgstr ""
+#: serverpage.ui:867
msgctxt "ServerPage"
-msgid "Vidalia was unable to retrieve your bridge's usage history."
+msgid "Port 80"
msgstr ""
+#: serverpage.ui:870
msgctxt "ServerPage"
-msgid ""
-"Tor returned an improperly formatted response when Vidalia requested your "
-"bridge's usage history."
+msgid "Websites"
msgstr ""
+#: serverpage.ui:896
msgctxt "ServerPage"
-msgid "The returned response was: %1"
+msgid "Show help topic on exit policies"
msgstr ""
+#: serverpage.ui:969
msgctxt "ServerPage"
-msgid "Help censored users reach the Tor network"
+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>"
+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>"
+msgid "Exit Policies"
msgstr ""
+#: serverpage.ui:1015
msgctxt "ServerPage"
-msgid "Automatically distribute my bridge address"
+msgid "Let others access your bridge by giving them this line:"
msgstr ""
+#: serverpage.ui:1039
msgctxt "ServerPage"
-msgid "Mirror the Relay Directory"
+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 ""
+#: servicepage.cpp:116
msgctxt "ServicePage"
msgid "Error while trying to unpublish all services"
msgstr ""
+#: servicepage.cpp:123
msgctxt "ServicePage"
-msgid ""
-"Please configure at least a service directory and a virtual port for each "
-"service you want to save. Remove the other ones."
+msgid "Please configure at least a service directory and a virtual port for each service you want to save. Remove the other ones."
msgstr ""
+#: servicepage.cpp:597
msgctxt "ServicePage"
msgid "Error"
msgstr ""
+#: servicepage.cpp:452
msgctxt "ServicePage"
msgid "Please select a Service."
msgstr ""
+#: servicepage.cpp:458
msgctxt "ServicePage"
msgid "Select Service Directory"
msgstr ""
+#: servicepage.cpp:547
msgctxt "ServicePage"
msgid "Virtual Port may only contain valid port numbers [1..65535]."
msgstr ""
+#: servicepage.cpp:578
msgctxt "ServicePage"
msgid "Target may only contain address:port, address, or port."
msgstr ""
+#: servicepage.cpp:598
msgctxt "ServicePage"
msgid "Directory already in use by another service."
msgstr ""
+#: servicepage.ui:19
msgctxt "ServicePage"
msgid "Form"
msgstr ""
+#: servicepage.ui:31
msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
+#: servicepage.ui:56
msgctxt "ServicePage"
msgid "Onion Address"
msgstr ""
+#: servicepage.ui:61
msgctxt "ServicePage"
msgid "Virtual Port"
msgstr ""
+#: servicepage.ui:66
msgctxt "ServicePage"
msgid "Target"
msgstr ""
+#: servicepage.ui:71
msgctxt "ServicePage"
msgid "Directory Path"
msgstr ""
+#: servicepage.ui:76
msgctxt "ServicePage"
msgid "Enabled"
msgstr ""
+#: servicepage.ui:84
msgctxt "ServicePage"
msgid "Add new service to list"
msgstr ""
+#: servicepage.ui:97
msgctxt "ServicePage"
msgid "Remove selected service from list"
msgstr ""
+#: servicepage.ui:110
msgctxt "ServicePage"
msgid "Copy onion address of selected service to clipboard"
msgstr ""
+#: servicepage.ui:123
msgctxt "ServicePage"
msgid "Browse in local file system and choose directory for selected service"
msgstr ""
+#: servicepage.cpp:384
msgctxt "ServicePage"
msgid "Created by Tor"
msgstr ""
-msgctxt "StatusEventWidget"
-msgid "Copy to Clipboard"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "The Tor Software is Running"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "You are currently running version \"%1\" of the Tor software."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "The Tor Software is not Running"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Click \"Start Tor\" in the Vidalia Control Panel to restart the Tor "
-"software. If Tor exited unexpectedly, select the \"Advanced\" tab above for "
-"details about any errors encountered."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"You are currently running version \"%1\" of the Tor software, which is no "
-"longer recommended. Please upgrade to the most recent version of the "
-"software, which may contain important security, reliability and performance "
-"fixes."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"You are currently running version \"%1\" of the Tor software, which may no "
-"longer work with the current Tor network. Please upgrade to the most recent "
-"version of the software, which may contain important security, reliability "
-"and performance fixes."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Your Tor Software is Out-of-date"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Connected to the Tor Network"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"We were able to successfully establish a connection to the Tor network. You "
-"can now configure your applications to use the Internet anonymously."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Tor Software Error"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"The Tor software encountered an internal bug. Please report the following "
-"error message to the Tor developers at bugs.torproject.org: \"%1\""
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Tor has determined that your computer's clock may be set to %1 seconds in "
-"the past compared to the source \"%2\". If your clock is not correct, Tor "
-"will not be able to function. Please verify your computer displays the "
-"correct time."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Tor has determined that your computer's clock may be set to %1 seconds in "
-"the future compared to the source \"%2\". If your clock is not correct, Tor "
-"will not be able to function. Please verify your computer displays the "
-"correct time."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Your Computer's Clock is Potentially Incorrect"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"One of the applications on your computer may have attempted to make an "
-"unencrypted connection through Tor to port %1. Sending unencrypted "
-"information over the Tor network is dangerous and not recommended. For your "
-"protection, Tor has automatically closed this connection."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"One of the applications on your computer may have attempted to make an "
-"unencrypted connection through Tor to port %1. Sending unencrypted "
-"information over the Tor network is dangerous and not recommended."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Potentially Dangerous Connection!"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"One of your applications established a connection through Tor to \"%1\" "
-"using a protocol that may leak information about your destination. Please "
-"ensure you configure your applications to use only SOCKS4a or SOCKS5 with "
-"remote hostname resolution."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Unknown SOCKS Protocol"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"One of your applications tried to establish a connection through Tor using a"
-" protocol that Tor does not understand. Please ensure you configure your "
-"applications to use only SOCKS4a or SOCKS5 with remote hostname resolution."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Invalid Destination Hostname"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"One of your applications tried to establish a connection through Tor to "
-"\"%1\", which Tor does not recognize as a valid hostname. Please check your "
-"application's configuration."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "External IP Address Changed"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Tor has determined your relay's public IP address is currently %1%2. If that"
-" is not correct, please consider setting the 'Address' option in your "
-"relay's configuration."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "DNS Hijacking Detected"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Tor detected that your DNS provider is providing false responses for domains"
-" that do not exist. Some ISPs and other DNS providers, such as OpenDNS, are "
-"known to do this in order to display their own search or advertising pages."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Tor detected that your DNS provider is providing false responses for well "
-"known domains. Since clients rely on Tor network relays to provide accurate "
-"DNS repsonses, your relay will not be configured as an exit relay."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Checking Server Port Reachability"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Tor is trying to determine if your relay's server port is reachable from the"
-" Tor network by connecting to itself at %1:%2. This test could take several "
-"minutes."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Server Port Reachability Test Successful!"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Your relay's server port is reachable from the Tor network!"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Server Port Reachability Test Failed"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Your relay's server port is not reachable by other Tor clients. This can "
-"happen if you are behind a router or firewall that requires you to set up "
-"port forwarding. If %1:%2 is not your correct IP address and server port, "
-"please check your relay's configuration."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Checking Directory Port Reachability"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Tor is trying to determine if your relay's directory port is reachable from "
-"the Tor network by connecting to itself at %1:%2. This test could take "
-"several minutes."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Directory Port Reachability Test Successful!"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Your relay's directory port is reachable from the Tor network!"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Directory Port Reachability Test Failed"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Your relay's directory port is not reachable by other Tor clients. This can "
-"happen if you are behind a router or firewall that requires you to set up "
-"port forwarding. If %1:%2 is not your correct IP address and directory port,"
-" please check your relay's configuration."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Relay Descriptor Rejected"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Your relay's descriptor, which enables clients to connect to your relay, was"
-" rejected by the directory server at %1:%2. The reason given was: %3"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Your Relay is Online"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Your relay is now online and available for Tor clients to use. You should "
-"see an increase in network traffic shown by the Bandwidth Graph within a few"
-" hours as more clients learn about your relay. Thank you for contributing to"
-" the Tor network!"
-msgstr ""
-
+#: stream.cpp:131
msgctxt "Stream"
msgid "New"
msgstr ""
+#: stream.cpp:133
msgctxt "Stream"
msgid "Resolving"
msgstr ""
+#: stream.cpp:134
msgctxt "Stream"
msgid "Connecting"
msgstr ""
+#: stream.cpp:135
msgctxt "Stream"
msgid "Open"
msgstr ""
+#: stream.cpp:136
msgctxt "Stream"
msgid "Failed"
msgstr ""
+#: stream.cpp:137
msgctxt "Stream"
msgid "Closed"
msgstr ""
+#: stream.cpp:138
msgctxt "Stream"
msgid "Retrying"
msgstr ""
+#: stream.cpp:139
msgctxt "Stream"
msgid "Remapped"
msgstr ""
+#: stream.cpp:140
msgctxt "Stream"
msgid "Unknown"
msgstr ""
+#: torprocess.cpp:107
msgctxt "TorProcess"
msgid "Process %1 failed to stop. [%2]"
msgstr ""
+#: torservice.cpp:143
msgctxt "TorService"
msgid "The Tor service is not installed."
msgstr ""
+#: torservice.cpp:161
msgctxt "TorService"
msgid "Unable to start the Tor service."
msgstr ""
+#: torsettings.cpp:103
msgctxt "TorSettings"
msgid "Failed to hash the control password."
msgstr ""
-msgctxt "TorrcDialog"
-msgid "Editing torrc"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid ""
-"Save settings. If unchecked it will only apply settings to the current Tor "
-"instance."
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Cut"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Copy"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Paste"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Undo"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Redo"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Select All"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Apply all"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Apply selection only"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Error connecting to Tor"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Selection is empty. Please select some text, or check \"Apply all\""
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Error at line %1: \"%2\""
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Error"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "An error ocurred while opening torrc file"
-msgstr ""
-
+#: upnpcontrol.cpp:139
msgctxt "UPNPControl"
msgid "Success"
msgstr ""
+#: upnpcontrol.cpp:141
msgctxt "UPNPControl"
msgid "No UPnP-enabled devices found"
msgstr ""
+#: upnpcontrol.cpp:143
msgctxt "UPNPControl"
msgid "No valid UPnP-enabled Internet gateway devices found"
msgstr ""
+#: upnpcontrol.cpp:145
msgctxt "UPNPControl"
msgid "WSAStartup failed"
msgstr ""
+#: upnpcontrol.cpp:147
msgctxt "UPNPControl"
msgid "Failed to add a port mapping"
msgstr ""
+#: upnpcontrol.cpp:149
msgctxt "UPNPControl"
msgid "Failed to retrieve a port mapping"
msgstr ""
+#: upnpcontrol.cpp:151
msgctxt "UPNPControl"
msgid "Failed to remove a port mapping"
msgstr ""
+#: upnpcontrol.cpp:153
msgctxt "UPNPControl"
msgid "Unknown error"
msgstr ""
+#: upnptestdialog.cpp:112
msgctxt "UPNPTestDialog"
msgid "Discovering UPnP-enabled devices"
msgstr ""
+#: upnptestdialog.cpp:117
msgctxt "UPNPTestDialog"
msgid "Updating directory port mapping"
msgstr ""
+#: upnptestdialog.cpp:122
msgctxt "UPNPTestDialog"
msgid "Updating relay port mapping"
msgstr ""
+#: upnptestdialog.cpp:127
msgctxt "UPNPTestDialog"
msgid "Test completed successfully!"
msgstr ""
+#: upnptestdialog.ui:13
msgctxt "UPNPTestDialog"
msgid "Testing UPnP Support"
msgstr ""
+#: upnptestdialog.ui:92
msgctxt "UPNPTestDialog"
msgid "Testing Universal Plug & Play Support"
msgstr ""
-msgctxt "UpdateProcess"
-msgid ""
-"Vidalia was unable to check for available software updates because it could "
-"not find '%1'."
-msgstr ""
-
-msgctxt "UpdateProcess"
-msgid ""
-"Vidalia was unable to check for available software updates because Tor's "
-"update process exited unexpectedly."
-msgstr ""
-
-msgctxt "UpdateProgressDialog"
-msgid "Checking for available updates..."
-msgstr ""
-
-msgctxt "UpdateProgressDialog"
-msgid "Hide"
-msgstr ""
-
-msgctxt "UpdateProgressDialog"
-msgid "Downloading updates..."
-msgstr ""
-
-msgctxt "UpdateProgressDialog"
-msgid "Installing updated software..."
-msgstr ""
-
-msgctxt "UpdateProgressDialog"
-msgid "Done! Your software is now up to date."
-msgstr ""
-
-msgctxt "UpdateProgressDialog"
-msgid "OK"
-msgstr ""
-
-msgctxt "UpdateProgressDialog"
-msgid "Software Updates"
-msgstr ""
-
-msgctxt "UpdateProgressDialog"
-msgid "Checking for updates..."
-msgstr ""
-
-msgctxt "UpdateProgressDialog"
-msgid "Cancel"
-msgstr ""
-
-msgctxt "UpdatesAvailableDialog"
-msgid "Software Updates Available"
-msgstr ""
-
-msgctxt "UpdatesAvailableDialog"
-msgid "Remind Me Later"
-msgstr ""
-
-msgctxt "UpdatesAvailableDialog"
-msgid "Install"
-msgstr ""
-
-msgctxt "UpdatesAvailableDialog"
-msgid "The following updated software packages are ready for installation:"
-msgstr ""
-
-msgctxt "UpdatesAvailableDialog"
-msgid "Package"
-msgstr ""
-
-msgctxt "UpdatesAvailableDialog"
-msgid "Version"
-msgstr ""
-
+#: vmessagebox.cpp:77
msgctxt "VMessageBox"
msgid "OK"
msgstr ""
+#: vmessagebox.cpp:78
msgctxt "VMessageBox"
msgid "Cancel"
msgstr ""
+#: vmessagebox.cpp:79
msgctxt "VMessageBox"
msgid "Yes"
msgstr ""
+#: vmessagebox.cpp:80
msgctxt "VMessageBox"
msgid "No"
msgstr ""
+#: vmessagebox.cpp:81
msgctxt "VMessageBox"
msgid "Help"
msgstr ""
+#: vmessagebox.cpp:82
msgctxt "VMessageBox"
msgid "Retry"
msgstr ""
+#: vmessagebox.cpp:83
msgctxt "VMessageBox"
msgid "Show Log"
msgstr ""
+#: vmessagebox.cpp:84
msgctxt "VMessageBox"
msgid "Show Settings"
msgstr ""
+#: vmessagebox.cpp:85
msgctxt "VMessageBox"
msgid "Continue"
msgstr ""
+#: vmessagebox.cpp:86
msgctxt "VMessageBox"
msgid "Quit"
msgstr ""
+#: vmessagebox.cpp:87
msgctxt "VMessageBox"
msgid "Browse"
msgstr ""
+#: main.cpp:75
msgctxt "Vidalia"
msgid "Invalid Argument"
msgstr ""
+#: main.cpp:89
msgctxt "Vidalia"
msgid "Vidalia is already running"
msgstr ""
+#: main.cpp:95
+msgctxt "Vidalia"
+msgid "Another Vidalia process is possibly already running. If there really is not another Vidalia process running, you can choose to continue anyway."
+""
+"Would you like to continue starting Vidalia?"
+msgstr ""
+
+#: vidalia.cpp:169
msgctxt "Vidalia"
msgid "Displays this usage message and exits."
msgstr ""
+#: vidalia.cpp:171
msgctxt "Vidalia"
msgid "Resets ALL stored Vidalia settings."
msgstr ""
+#: vidalia.cpp:173
msgctxt "Vidalia"
msgid "Sets the directory Vidalia uses for data files."
msgstr ""
+#: vidalia.cpp:175
msgctxt "Vidalia"
msgid "Sets the name and location of Vidalia's pidfile."
msgstr ""
+#: vidalia.cpp:177
msgctxt "Vidalia"
msgid "Sets the name and location of Vidalia's logfile."
msgstr ""
+#: vidalia.cpp:180
msgctxt "Vidalia"
msgid "Sets the verbosity of Vidalia's logging."
msgstr ""
+#: vidalia.cpp:183
msgctxt "Vidalia"
msgid "Sets Vidalia's interface style."
msgstr ""
+#: vidalia.cpp:186
msgctxt "Vidalia"
msgid "Sets Vidalia's language."
msgstr ""
+#: vidalia.cpp:190
msgctxt "Vidalia"
msgid "Vidalia Usage Information"
msgstr ""
+#: vidalia.cpp:238
msgctxt "Vidalia"
-msgid "Unable to open log file '%1': %2"
-msgstr ""
-
-msgctxt "Vidalia"
-msgid "Value required for parameter :"
-msgstr ""
-
-msgctxt "Vidalia"
-msgid "Invalid language code specified:"
+msgid "Invalid language code specified: "
msgstr ""
+#: vidalia.cpp:245
msgctxt "Vidalia"
-msgid "Invalid GUI style specified:"
+msgid "Invalid GUI style specified: "
msgstr ""
+#: vidalia.cpp:251
msgctxt "Vidalia"
-msgid "Invalid log level specified:"
+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?"
-msgstr ""
-
-msgctxt "stringutil.h"
-msgid "%1 secs"
-msgstr ""
-
-msgctxt "stringutil.h"
-msgid "%1 B/s"
-msgstr ""
-
-msgctxt "stringutil.h"
-msgid "%1 KB/s"
-msgstr ""
-
-msgctxt "stringutil.h"
-msgid "%1 MB/s"
-msgstr ""
-
-msgctxt "stringutil.h"
-msgid "%1 GB/s"
-msgstr ""
-
-msgctxt "stringutil.h"
-msgid "%1 days"
-msgstr ""
-
-msgctxt "stringutil.h"
-msgid "%1 hours"
-msgstr ""
-
-msgctxt "stringutil.h"
-msgid "%1 mins"
+msgid "Unable to open log file '%1': %2"
msgstr ""
-
-
diff --git a/src/vidalia/i18n/po/kn/qt_kn.po b/src/vidalia/i18n/po/kn/qt_kn.po
index 7c449df..9b47f9e 100644
--- a/src/vidalia/i18n/po/kn/qt_kn.po
+++ b/src/vidalia/i18n/po/kn/qt_kn.po
@@ -1,11 +1,10 @@
#
-# Translators:
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-08-20 03:25+0000\n"
-"PO-Revision-Date: 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"
@@ -431,5 +430,3 @@ msgstr ""
msgctxt "QFileSystemModel"
msgid "%1 bytes"
msgstr ""
-
-
diff --git a/src/vidalia/i18n/po/kn/vidalia_kn.po b/src/vidalia/i18n/po/kn/vidalia_kn.po
index c1c67e9..e8a4552 100644
--- a/src/vidalia/i18n/po/kn/vidalia_kn.po
+++ b/src/vidalia/i18n/po/kn/vidalia_kn.po
@@ -1,11 +1,10 @@
#
-# Translators:
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-09-07 14:40+0000\n"
-"PO-Revision-Date: 2010-12-05 20:03+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"
@@ -193,10 +192,6 @@ 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"
@@ -236,10 +231,6 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr ""
-
-msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -279,6 +270,10 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr ""
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -432,17 +427,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"
@@ -1266,44 +1270,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"
@@ -1331,10 +1342,6 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr ""
-
-msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1362,6 +1369,10 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr ""
+
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1644,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 ""
@@ -1680,10 +1663,6 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1796,10 +1775,6 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1882,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 ""
@@ -1934,82 +1897,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 ""
@@ -2057,19 +1949,39 @@ 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)"
+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"
@@ -2091,17 +2003,35 @@ msgid ""
msgstr ""
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"
@@ -2357,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"
@@ -2412,10 +2334,6 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2515,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 ""
@@ -2840,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 ""
@@ -3088,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 ""
@@ -3132,10 +3070,6 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
-msgid "Form"
-msgstr ""
-
-msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3424,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 ""
@@ -3460,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 ""
@@ -3538,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 ""
@@ -3666,6 +3646,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 ""
@@ -3759,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 ""
@@ -3812,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 1599c8d..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:
-# 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: 2012-02-14 09:47+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,168 +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 386085d..47fe8ec 100755
--- a/src/vidalia/i18n/po/ko/vidalia_ko.po
+++ b/src/vidalia/i18n/po/ko/vidalia_ko.po
@@ -1,3848 +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: 2012-03-21 17:52+0000\n"
-"PO-Revision-Date: 2012-03-22 08:51+0000\n"
-"Last-Translator: cwt96 <cwt967 at naver.com>\n"
-"Language-Team: translations at vidalia-project.net\n"
+"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 ""
-"You've checked the autoconfiguration option for the ControlPort, but "
-"provided no Data Directory. Please add one, or uncheck the \"Configure "
-"ControlPort automatically\" option."
msgstr ""
-msgctxt "AdvancedPage"
-msgid ""
-"Vidalia was unable to remove the Tor service.\n"
-"\n"
-"You may need to remove it manually."
-msgstr "Vidalia는 Tor 서비스를 제가하지 못했습니다.\n\n수동적으로 제거해 주십시오."
-
+#: appearancepage.ui:22
msgctxt "AppearancePage"
msgid "Language"
-msgstr "언어"
+msgstr ""
+#: appearancepage.ui:37
msgctxt "AppearancePage"
msgid "Choose the language used in Vidalia"
-msgstr "Vidalia에서 사용될 언어 선택"
-
-msgctxt "AppearancePage"
-msgid "Style"
-msgstr "스타일"
-
-msgctxt "AppearancePage"
-msgid "Choose Vidalia's interface style"
-msgstr "Vidalia의 인터페이스 스타일을 선택하십시오."
-
-msgctxt "AppearancePage"
-msgid "Vidalia was unable to load the selected language translation."
-msgstr "Vidalia는 선택된 언어 번역을 읽지 못했습니다."
-
-msgctxt "AppearancePage"
-msgid ""
-"System Icon Preferences (changes will take effect when you restart Vidalia)"
msgstr ""
+#: appearancepage.ui:75
msgctxt "AppearancePage"
-msgid "Show the Tray Icon and Dock Icon (default)"
+msgid "Style"
msgstr ""
+#: appearancepage.ui:103
msgctxt "AppearancePage"
-msgid "Hide the Tray Icon"
+msgid "Choose Vidalia's interface style"
msgstr ""
+#: appearancepage.cpp:67
msgctxt "AppearancePage"
-msgid "Hide the Dock Icon"
+msgid "Vidalia was unable to load the selected language translation."
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]"
-
-msgctxt "CountryInfo"
-msgid "Afghanistan"
-msgstr "아프가니스탄"
+msgstr ""
-msgctxt "CountryInfo"
-msgid "Andorra"
-msgstr "안도라"
+#: generalpage.cpp:62
+msgctxt "GeneralPage"
+msgid "Executables (*.exe)"
+msgstr ""
-msgctxt "CountryInfo"
-msgid "Angola"
-msgstr "앙골라"
+#: generalpage.cpp:75
+msgctxt "GeneralPage"
+msgid "Select Path to Tor"
+msgstr ""
-msgctxt "CountryInfo"
-msgid "Antigua & Barbuda"
-msgstr "Antigua & Barbuda"
+#: generalpage.cpp:85
+msgctxt "GeneralPage"
+msgid "Select Proxy Executable"
+msgstr ""
-msgctxt "CountryInfo"
-msgid "Argentina"
-msgstr "취소"
+#: generalpage.cpp:98
+msgctxt "GeneralPage"
+msgid "You must specify the name of your Tor executable."
+msgstr ""
-msgctxt "CountryInfo"
-msgid "Armenia"
-msgstr "아르메니아"
+#: generalpage.cpp:106
+msgctxt "GeneralPage"
+msgid "The proxy arguments specified are not properly formatted."
+msgstr ""
-msgctxt "CountryInfo"
-msgid "Australia"
-msgstr "호주"
+#: generalpage.ui:28
+msgctxt "GeneralPage"
+msgid "Start Vidalia when my system starts"
+msgstr ""
-msgctxt "CountryInfo"
-msgid "Azerbaijan"
-msgstr "아제르바 이잔"
+#: generalpage.ui:121
+msgctxt "GeneralPage"
+msgid "Browse"
+msgstr ""
-msgctxt "CountryInfo"
-msgid "Bahamas"
-msgstr "바하마"
+#: generalpage.ui:57
+msgctxt "GeneralPage"
+msgid "Start the Tor software when Vidalia starts"
+msgstr ""
-msgctxt "CountryInfo"
-msgid "Bangladesh"
-msgstr "방글라데쉬"
+#: generalpage.ui:51
+msgctxt "GeneralPage"
+msgid "Tor"
+msgstr ""
-msgctxt "CountryInfo"
-msgid "Barbados"
-msgstr "바베이도스"
+#: generalpage.ui:93
+msgctxt "GeneralPage"
+msgid "Proxy Application (optional)"
+msgstr ""
-msgctxt "CountryInfo"
-msgid "Belarus"
-msgstr "벨라루스"
+#: generalpage.ui:99
+msgctxt "GeneralPage"
+msgid "Start a proxy application when Tor starts"
+msgstr ""
-msgctxt "CountryInfo"
-msgid "Belgium"
-msgstr "벨기에"
+#: generalpage.ui:135
+msgctxt "GeneralPage"
+msgid "Proxy Application Arguments:"
+msgstr ""
-msgctxt "CountryInfo"
-msgid "Belize"
-msgstr "벨리즈"
+#: graphframe.cpp:238
+msgctxt "GraphFrame"
+msgid "Recv: "
+msgstr ""
-msgctxt "CountryInfo"
-msgid "Bhutan"
-msgstr "부탄"
+#: graphframe.cpp:298
+msgctxt "GraphFrame"
+msgid "%1 KB/s"
+msgstr ""
-msgctxt "CountryInfo"
-msgid "Bolivia"
-msgstr "볼리비아"
+#: graphframe.cpp:247
+msgctxt "GraphFrame"
+msgid "Sent: "
+msgstr ""
-msgctxt "CountryInfo"
-msgid "Bosnia & Herzegovina"
-msgstr "보스니아 헤르체고비나"
+#: graphframe.cpp:259
+msgctxt "GraphFrame"
+msgid "%1 KB"
+msgstr ""
-msgctxt "CountryInfo"
-msgid "Botswana"
-msgstr "보츠와나"
+#: graphframe.cpp:262
+msgctxt "GraphFrame"
+msgid "%1 MB"
+msgstr ""
-msgctxt "CountryInfo"
-msgid "Brazil"
-msgstr "브라질"
+#: graphframe.cpp:265
+msgctxt "GraphFrame"
+msgid "%1 GB"
+msgstr ""
-msgctxt "CountryInfo"
-msgid "Brunei Darussalam"
-msgstr "브루나이"
+#: helpbrowser.cpp:135
+msgctxt "HelpBrowser"
+msgid "Error Loading Help Contents: "
+msgstr ""
-msgctxt "CountryInfo"
-msgid "Bulgaria"
-msgstr "불가리아"
+#: helpbrowser.cpp:147
+msgctxt "HelpBrowser"
+msgid "Supplied XML file is not a valid Contents document."
+msgstr ""
-msgctxt "CountryInfo"
-msgid "Burkina Faso"
-msgstr "부르 키 나 파소"
+#: helpbrowser.cpp:396
+msgctxt "HelpBrowser"
+msgid "Search reached end of document"
+msgstr ""
-msgctxt "CountryInfo"
-msgid "Burundi"
-msgstr "부룬디"
+#: helpbrowser.cpp:398
+msgctxt "HelpBrowser"
+msgid "Search reached start of document"
+msgstr ""
-msgctxt "CountryInfo"
-msgid "Cambodia"
-msgstr "캄보디아"
+#: helpbrowser.cpp:400
+msgctxt "HelpBrowser"
+msgid "Text not found in document"
+msgstr ""
-msgctxt "CountryInfo"
-msgid "Cameroon"
-msgstr "카메룬"
+#: helpbrowser.cpp:445
+msgctxt "HelpBrowser"
+msgid "Found %1 results"
+msgstr ""
-msgctxt "CountryInfo"
-msgid "Canada"
-msgstr "캐나다"
+#: helpbrowser.ui:33
+msgctxt "HelpBrowser"
+msgid "Vidalia Help"
+msgstr ""
-msgctxt "CountryInfo"
-msgid "Cape Verde"
-msgstr "카보베르데"
+#: helpbrowser.ui:484
+msgctxt "HelpBrowser"
+msgid "Back"
+msgstr ""
-msgctxt "CountryInfo"
-msgid "Central African Republic"
-msgstr "중앙 아프리카 공화국"
+#: helpbrowser.ui:487
+msgctxt "HelpBrowser"
+msgid "Move to previous page (Backspace)"
+msgstr ""
-msgctxt "CountryInfo"
-msgid "Chad"
-msgstr "차드"
+#: helpbrowser.ui:490
+msgctxt "HelpBrowser"
+msgid "Backspace"
+msgstr ""
-msgctxt "CountryInfo"
-msgid "Chile"
-msgstr "칠레"
+#: helpbrowser.ui:498
+msgctxt "HelpBrowser"
+msgid "Forward"
+msgstr ""
-msgctxt "CountryInfo"
-msgid "China"
-msgstr "중국"
+#: helpbrowser.ui:501
+msgctxt "HelpBrowser"
+msgid "Move to next page (Shift+Backspace)"
+msgstr ""
-msgctxt "CountryInfo"
-msgid "Colombia"
-msgstr "콜롬비아"
+#: helpbrowser.ui:504
+msgctxt "HelpBrowser"
+msgid "Shift+Backspace"
+msgstr ""
-msgctxt "CountryInfo"
-msgid "Comoros"
-msgstr "코모로스"
+#: helpbrowser.ui:512
+msgctxt "HelpBrowser"
+msgid "Home"
+msgstr ""
-msgctxt "CountryInfo"
-msgid "Congo, The Democratic Republic of the"
-msgstr "콩고 민주 공화국"
+#: helpbrowser.ui:515
+msgctxt "HelpBrowser"
+msgid "Move to the Home page (Ctrl+H)"
+msgstr ""
-msgctxt "CountryInfo"
-msgid "Congo"
-msgstr "콩고"
+#: helpbrowser.ui:518
+msgctxt "HelpBrowser"
+msgid "Ctrl+H"
+msgstr ""
-msgctxt "CountryInfo"
-msgid "Costa Rica"
-msgstr "코스타리카"
+#: helpbrowser.ui:535
+msgctxt "HelpBrowser"
+msgid "Find"
+msgstr ""
-msgctxt "CountryInfo"
-msgid "Cote d’Ivoire"
-msgstr "코트디부아르"
+#: helpbrowser.ui:538
+msgctxt "HelpBrowser"
+msgid "Search for a word or phrase on current page (Ctrl+F)"
+msgstr ""
-msgctxt "CountryInfo"
-msgid "Croatia"
-msgstr "크로아티아"
-
-msgctxt "CountryInfo"
-msgid "Cuba"
-msgstr "쿠바"
-
-msgctxt "CountryInfo"
-msgid "Cyprus"
-msgstr "키프로스"
-
-msgctxt "CountryInfo"
-msgid "Czech Republic"
-msgstr "체코 공화국"
-
-msgctxt "CountryInfo"
-msgid "Denmark"
-msgstr "덴마크"
-
-msgctxt "CountryInfo"
-msgid "Djibouti"
-msgstr "지부티"
-
-msgctxt "CountryInfo"
-msgid "Dominica"
-msgstr "도미니카"
-
-msgctxt "CountryInfo"
-msgid "Dominican Republic"
-msgstr "도미니카 공화국"
-
-msgctxt "CountryInfo"
-msgid "Ecuador"
-msgstr "에콰도르"
-
-msgctxt "CountryInfo"
-msgid "Egypt"
-msgstr "이집트"
-
-msgctxt "CountryInfo"
-msgid "El Salvador"
-msgstr "엘살바도르"
-
-msgctxt "CountryInfo"
-msgid "Equatorial Guinea"
-msgstr "적도 기니"
-
-msgctxt "CountryInfo"
-msgid "Eritrea"
-msgstr "에리트레아"
-
-msgctxt "CountryInfo"
-msgid "Estonia"
-msgstr "에스토니아"
-
-msgctxt "CountryInfo"
-msgid "France"
-msgstr "프랑스"
-
-msgctxt "CountryInfo"
-msgid "Gabon"
-msgstr "가봉"
-
-msgctxt "CountryInfo"
-msgid "Gambia"
-msgstr "감비아"
-
-msgctxt "CountryInfo"
-msgid "Georgia"
-msgstr "그루지야"
-
-msgctxt "CountryInfo"
-msgid "Germany"
-msgstr "독일"
-
-msgctxt "CountryInfo"
-msgid "Ghana"
-msgstr "가나"
-
-msgctxt "CountryInfo"
-msgid "Grenada"
-msgstr "그레나다"
-
-msgctxt "CountryInfo"
-msgid "Guatemala"
-msgstr "과테말라"
-
-msgctxt "CountryInfo"
-msgid "Guinea"
-msgstr "기니"
-
-msgctxt "CountryInfo"
-msgid "Guinea-Bissau"
-msgstr "기니 비사우"
-
-msgctxt "CountryInfo"
-msgid "Guyana"
-msgstr "가이아나"
-
-msgctxt "CountryInfo"
-msgid "Hong Kong"
-msgstr "홍콩"
-
-msgctxt "CountryInfo"
-msgid "Haiti"
-msgstr "아이티"
-
-msgctxt "CountryInfo"
-msgid "Honduras"
-msgstr "온두라스"
-
-msgctxt "CountryInfo"
-msgid "Israel"
-msgstr "이스라엘"
-
-msgctxt "CountryInfo"
-msgid "Italy"
-msgstr "이탈리아"
-
-msgctxt "CountryInfo"
-msgid "Jamaica"
-msgstr "자마이카"
-
-msgctxt "CountryInfo"
-msgid "Japan"
-msgstr "일본"
-
-msgctxt "CountryInfo"
-msgid "Jordan"
-msgstr "요르단"
-
-msgctxt "CountryInfo"
-msgid "Kazakhstan"
-msgstr "카자흐스탄"
-
-msgctxt "CountryInfo"
-msgid "Kenya"
-msgstr "케냐"
-
-msgctxt "CountryInfo"
-msgid "Kiribati"
-msgstr "키리바시"
-
-msgctxt "CountryInfo"
-msgid "Kuwait"
-msgstr "쿠웨이트"
-
-msgctxt "CountryInfo"
-msgid "Kyrgyzstan"
-msgstr "키르 기스 스탄"
-
-msgctxt "CountryInfo"
-msgid "Laos"
-msgstr "라오스"
-
-msgctxt "CountryInfo"
-msgid "Latvia"
-msgstr "라트비아"
-
-msgctxt "CountryInfo"
-msgid "Lebanon"
-msgstr "레바논"
-
-msgctxt "CountryInfo"
-msgid "Lesotho"
-msgstr "레소토"
-
-msgctxt "CountryInfo"
-msgid "Liberia"
-msgstr "라이베리아"
-
-msgctxt "CountryInfo"
-msgid "Liechtenstein"
-msgstr "리히텐슈타인"
-
-msgctxt "CountryInfo"
-msgid "Lithuania"
-msgstr "리투아니아"
-
-msgctxt "CountryInfo"
-msgid "Luxembourg"
-msgstr "룩셈부르크"
-
-msgctxt "CountryInfo"
-msgid "Macedonia"
-msgstr "마케도니아"
-
-msgctxt "CountryInfo"
-msgid "Madagascar"
-msgstr "마다가스카"
-
-msgctxt "CountryInfo"
-msgid "Malawi"
-msgstr "말라위"
-
-msgctxt "CountryInfo"
-msgid "Malaysia"
-msgstr "말레이시아"
-
-msgctxt "CountryInfo"
-msgid "Mali"
-msgstr "말리"
-
-msgctxt "CountryInfo"
-msgid "Malta"
-msgstr "몰타"
-
-msgctxt "CountryInfo"
-msgid "Marshall Islands"
-msgstr "마샬 군도"
-
-msgctxt "CountryInfo"
-msgid "Mauritania"
-msgstr "모리 타니"
-
-msgctxt "CountryInfo"
-msgid "Mauritius"
-msgstr "모리셔스"
-
-msgctxt "CountryInfo"
-msgid "Micronesia"
-msgstr "미크로네시아"
-
-msgctxt "CountryInfo"
-msgid "Moldova"
-msgstr "몰르더바"
-
-msgctxt "CountryInfo"
-msgid "Monaco"
-msgstr "모나코"
-
-msgctxt "CountryInfo"
-msgid "Mongolia"
-msgstr "몽골"
-
-msgctxt "CountryInfo"
-msgid "Montenegro"
-msgstr "몬테네그로"
-
-msgctxt "CountryInfo"
-msgid "Morocco"
-msgstr "모로코"
-
-msgctxt "CountryInfo"
-msgid "Mozambique"
-msgstr "모잠비크"
-
-msgctxt "CountryInfo"
-msgid "Namibia"
-msgstr "나미비아"
-
-msgctxt "CountryInfo"
-msgid "Nauru"
-msgstr "나우루"
-
-msgctxt "CountryInfo"
-msgid "Nepal"
-msgstr "네팔"
-
-msgctxt "CountryInfo"
-msgid "Netherlands"
-msgstr "네덜란드"
-
-msgctxt "CountryInfo"
-msgid "New Zealand"
-msgstr "뉴질랜드"
-
-msgctxt "CountryInfo"
-msgid "Nicaragua"
-msgstr "니카라과"
-
-msgctxt "CountryInfo"
-msgid "Niger"
-msgstr "니제르"
-
-msgctxt "CountryInfo"
-msgid "Nigeria"
-msgstr "나이지리아"
-
-msgctxt "CountryInfo"
-msgid "Norway"
-msgstr "노르웨이"
-
-msgctxt "CountryInfo"
-msgid "Oman"
-msgstr "오만"
-
-msgctxt "CountryInfo"
-msgid "Pakistan"
-msgstr "파키스탄"
-
-msgctxt "CountryInfo"
-msgid "Palau"
-msgstr "팔라우"
-
-msgctxt "CountryInfo"
-msgid "Palestine"
-msgstr "팔레스타인"
-
-msgctxt "CountryInfo"
-msgid "Panama"
-msgstr "파나마"
-
-msgctxt "CountryInfo"
-msgid "Papua New Guinea"
-msgstr "파푸아 뉴 기니"
-
-msgctxt "CountryInfo"
-msgid "Paraguay"
-msgstr "파라과이"
-
-msgctxt "CountryInfo"
-msgid "Peru"
-msgstr "페루"
-
-msgctxt "CountryInfo"
-msgid "Philippines"
-msgstr "필리핀"
-
-msgctxt "CountryInfo"
-msgid "Poland"
-msgstr "폴란드"
-
-msgctxt "CountryInfo"
-msgid "Portugal"
-msgstr "포르투갈"
-
-msgctxt "CountryInfo"
-msgid "Qatar"
-msgstr "콰타르"
-
-msgctxt "CountryInfo"
-msgid "Romania"
-msgstr "로마니아"
-
-msgctxt "CountryInfo"
-msgid "Russia"
-msgstr "러시아"
-
-msgctxt "CountryInfo"
-msgid "Rwanda"
-msgstr "르완다"
-
-msgctxt "CountryInfo"
-msgid "Saint Kitts & Nevis"
-msgstr "세인트 키츠와 네이스"
-
-msgctxt "CountryInfo"
-msgid "Saint Lucia"
-msgstr "세인트 루시다"
-
-msgctxt "CountryInfo"
-msgid "Saint Vincent & the Grenadines"
-msgstr "세인트 빈센트와 그레나딘"
-
-msgctxt "CountryInfo"
-msgid "Samoa"
-msgstr "사모아"
-
-msgctxt "CountryInfo"
-msgid "San Marino"
-msgstr "산마리노"
-
-msgctxt "CountryInfo"
-msgid "Sao Tome & Principe"
-msgstr "상투메와 프린시페"
-
-msgctxt "CountryInfo"
-msgid "Saudi Arabia"
-msgstr "사우디 아라비아"
-
-msgctxt "CountryInfo"
-msgid "Senegal"
-msgstr "세네갈"
-
-msgctxt "CountryInfo"
-msgid "Serbia"
-msgstr "세르비아"
-
-msgctxt "CountryInfo"
-msgid "Seychelles"
-msgstr "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"
+#: helpbrowser.ui:541
+msgctxt "HelpBrowser"
+msgid "Ctrl+F"
+msgstr ""
+#: helpbrowser.ui:549
msgctxt "HelpBrowser"
msgid "Close"
-msgstr "닫기"
+msgstr ""
+#: helpbrowser.ui:552
msgctxt "HelpBrowser"
msgid "Close Vidalia Help"
-msgstr "Vidalia 도움말 닫기"
+msgstr ""
+#: helpbrowser.ui:555
msgctxt "HelpBrowser"
msgid "Esc"
-msgstr "Esc"
+msgstr ""
+#: helpbrowser.ui:152
msgctxt "HelpBrowser"
msgid "Find:"
-msgstr "찾기:"
+msgstr ""
+#: helpbrowser.ui:174
msgctxt "HelpBrowser"
msgid "Find Previous"
-msgstr "이전 찾기"
+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."
-msgstr "Vidalia는 당신의 기본 브라우저에서 선택한 링크를 열수 있습니다. 만약 당신의 브라우저가 Tor를 사용할 수 있게 설정되어있다 않다면 링크의 요청은 익명화가 안 되있을수 있습니다."
+msgid "Vidalia can open the link you selected in your default Web browser. If your browser is not currently configured to use Tor then the request will not be anonymous."
+msgstr ""
+#: helptextbrowser.cpp:78
msgctxt "HelpTextBrowser"
msgid "Do you want Vidalia to open the link in your Web browser?"
-msgstr "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을 복사하여 브라우저로 여실 수 있습니다"
+msgstr ""
+#: 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 ""
+#: 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."
-msgstr "지금 설치된 Tor의 버전은 날짜가 지나서 더이상 추천되지 않습니다. Tor 웹사이트에 접속하셔서 최신 버전을 받아 주십시오."
+msgid "The currently installed version of Tor is out of date or no longer recommended. Please visit the Tor website to download the latest version."
+msgstr ""
+#: mainwindow.cpp:1333
msgctxt "MainWindow"
msgid "Tor website: %1"
-msgstr "토르 웹사이트 : %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 "설치 실패"
-
-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."
-msgstr "이 연결을 통해 보낸 아무것이나 모니터링 할 수 있습니다. 가능하면 응용 프로그램의 설정을 확인 SSL (Secure Socket Layer)같은 암호화된 프로토콜 만을 사용하시기 바랍니다."
-
-msgctxt "MainWindow"
-msgid "Bootstrapping torrc from %1 to %2"
-msgstr "%1에서 %2로 부팅 "
-
-msgctxt "MainWindow"
-msgid "(probably Telnet)"
-msgstr "(probably Telnet)"
-
-msgctxt "MainWindow"
-msgid "(probably an email client)"
-msgstr "(아마 이메일 클라이언트)"
-
-msgctxt "MainWindow"
-msgid ""
-"One of your applications %1 appears to be making a potentially unencrypted "
-"and unsafe connection to port %2."
-msgstr "응용 프로그램 %1 중 하나는 포트 %2에 잠재적으로 암호화되지 않고 안전하지 않은 연결을 만드는 것 같습니다."
+msgstr ""
+#: mainwindow.cpp:1213
msgctxt "MainWindow"
-msgid "failed (%1)"
-msgstr "실패 (%1)"
+msgid "Vidalia tried to reset Tor's control 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 ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
-msgstr "현재 중계가 종료중입니다. 중계를 지금 종료하려면 멈춤 버튼을 다시 눌러주십시오."
+#: messagelog.cpp:126
+msgctxt "MessageLog"
+msgid "Messages that appear when something has "
+"gone very wrong and Tor cannot proceed."
+msgstr ""
-msgctxt "MainWindow"
-msgid ""
-"Vidalia can't find out how to talk to Tor because it can't access this file: %1\n"
-"\n"
-"Here's the last error message:\n"
-"%2"
+#: messagelog.cpp:128
+msgctxt "MessageLog"
+msgid "Messages that only appear when "
+"something has gone wrong with Tor."
msgstr ""
-msgctxt "MainWindow"
-msgid ""
-"It seems Tor has stopped running since Vidalia started it.\n"
-"\n"
-"See the Advanced Message Log for more information."
+#: 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 ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
-"\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
-msgstr "중계가 현재 작동중 입니다. 중계를 중단하시면 클라이언트와의 결이 끊어집니다. 클라이언트가 새로운 릴레이를 찾을 수 있게 시간을 주시겠습니까?"
+#: messagelog.cpp:134
+msgctxt "MessageLog"
+msgid "Messages that appear frequently "
+"during normal Tor operation."
+msgstr ""
-msgctxt "MainWindow"
-msgid ""
-"Vidalia detected that the Tor software exited unexpectedly.\n"
-"\n"
-"Please check the message log for recent warning or error messages."
-msgstr "Vidalia는 Tor가 예기치 못하게 종료된 것을 감지했습니다.\n\n최근의 경고나 오류 메시지를 확인하여 주십시오."
+#: 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 "중계가 현재 작동중 입니다. 중계를 중단하시면 클라이언트와의 결이 끊어집니다. 클라이언트가 새로운 릴레이를 찾을 수 있게 시간을 주시겠습니까?"
+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 "고급"
+msgstr ""
+#: messagelog.ui:356
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에 오류가 발생하면 나오는 메시지"
-
-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가 정상적으로 작동할 때 가끔 나오는 살펴볼 만한 메시지"
+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."
-msgstr "파일 %1를(을) 쓸 수 없습니다.\n\n%2."
+msgid "Automatically save new log messages to a file"
+msgstr ""
+#: 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 "전체 화면"
+msgstr ""
-msgctxt "NetViewer"
-msgid "View the network map as a full screen window"
-msgstr "네트워크 지도를 전체 화면으로 보기"
+#: networkpage.cpp:193
+msgctxt "NetworkPage"
+msgid "Invalid Bridge"
+msgstr ""
-msgctxt "NetViewer"
-msgid "Ctrl+F"
-msgstr "Ctrl+F"
+#: networkpage.cpp:194
+msgctxt "NetworkPage"
+msgid "The specified bridge identifier is not valid."
+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 / HTTPS"
-msgstr "HTTP / HTTPS"
+msgid "Remove the selected bridges from the list"
+msgstr ""
+#: networkpage.ui:399
msgctxt "NetworkPage"
-msgid "You must specify one or more bridges."
+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 ""
+
+#: 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번 포트"
+msgstr ""
+#: serverpage.ui:818
msgctxt "ServerPage"
msgid "Retrieve Mail (POP, IMAP)"
-msgstr "매일 수신 (POP. IMAP)"
+msgstr ""
+#: serverpage.ui:828
msgctxt "ServerPage"
msgid "Ports unspecified by other checkboxes"
-msgstr "체크박스에 없는 포트"
+msgstr ""
+#: serverpage.ui:831
msgctxt "ServerPage"
msgid "Misc Other Services"
-msgstr "기타 서비스"
+msgstr ""
+#: serverpage.ui:841
msgctxt "ServerPage"
msgid "Ports 706, 1863, 5050, 5190, 5222, 5223, 8300 and 8888"
-msgstr "706 및 1863, 5050, 5190, 5222, 5223, 8300, 8888 포트"
+msgstr ""
+#: serverpage.ui:844
msgctxt "ServerPage"
msgid "Instant Messaging (IM)"
-msgstr "인스턴트 메시징 (IM)"
+msgstr ""
+#: serverpage.ui:854
msgctxt "ServerPage"
msgid "Port 443"
-msgstr "포트번호 443"
+msgstr ""
+#: serverpage.ui:857
msgctxt "ServerPage"
msgid "Secure Websites (SSL)"
-msgstr "보안 연결된 웹사이트 (SSL)"
+msgstr ""
+#: serverpage.ui:867
msgctxt "ServerPage"
msgid "Port 80"
-msgstr "포트번호 80"
+msgstr ""
+#: serverpage.ui:870
msgctxt "ServerPage"
msgid "Websites"
-msgstr "일반적인 웹사이트"
+msgstr ""
+#: serverpage.ui:896
msgctxt "ServerPage"
msgid "Show help topic on exit policies"
-msgstr "출구 정책에 대한 도움말 보기"
+msgstr ""
+#: serverpage.ui:969
msgctxt "ServerPage"
-msgid ""
-"What Internet resources should users be able to access from your relay?"
-msgstr "귀하의 중계를 통하여 사용자가 어떤 인터넷 자원에 접근할 수 있도록 하시겠습니까?"
+msgid "What Internet resources should users be able to access from your relay?"
+msgstr ""
+#: serverpage.ui:979
msgctxt "ServerPage"
-msgid ""
-"Tor will still block some outgoing mail and file sharing applications by "
-"default to reduce spam and other abuse."
-msgstr "Tor는 악용과 스팸 방지를 위하여, 몇몇 메일 보내기와 파일 공유를 제한합니다."
+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 "Exit Policies"
-msgstr "출구 정책"
+msgstr ""
+#: serverpage.ui:1015
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 "이것은 다른 사람에게 줄 수 있는 귀하의 브릿지 중계의 신분입니다."
-
-msgctxt "ServerPage"
-msgid "Copy your bridge relay's identity to the clipboard"
-msgstr "귀하의 중계 신원을 클립보드로 복사합니다."
-
-msgctxt "ServerPage"
-msgid "No Recent Usage"
-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 "브릿지 내역"
-
-msgctxt "ServerPage"
-msgid "Vidalia was unable to retrieve your bridge's usage history."
-msgstr "Vidalia는 귀하의 브릿지 사용 내역을 불러올 수 없습니다."
-
-msgctxt "ServerPage"
-msgid ""
-"Tor returned an improperly formatted response when Vidalia requested your "
-"bridge's usage history."
-msgstr "Vidalia는 귀하 브릿지 사용 내역을 요청했지만, Tor가 잘못된 답신을 보내왔습니다."
-
-msgctxt "ServerPage"
-msgid "The returned response was: %1"
-msgstr "받아온 답신 : %1"
-
-msgctxt "ServerPage"
-msgid "Help censored users reach the Tor network"
-msgstr "검열된 유저들이 Tor 네트워키에 닿을 수 있도록 돕기"
-
-msgctxt "ServerPage"
-msgid "<a href=\"#bridgeUsage\">Who has used my bridge?</a>"
-msgstr "<a href=\"#bridgeUsage\">누가 제 브릿지를 썼나요?</a>"
-
-msgctxt "ServerPage"
-msgid "<a href=\"#bridgeHelp\">What's this?</a>"
-msgstr "<a href=\"#bridgeHelp\">이것이 무엇인가?</a>"
-
-msgctxt "ServerPage"
-msgid "Automatically distribute my bridge address"
-msgstr "자동적으로 나의 브릿지 주소 배포"
-
-msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network (exit relay)"
msgstr ""
+#: serverpage.ui:1039
msgctxt "ServerPage"
-msgid "Relay traffic inside the Tor network (non-exit relay)"
+msgid "This is the identity of your bridge relay that you can give to other people"
msgstr ""
+#: serverpage.ui:1061
msgctxt "ServerPage"
-msgid "Mirror the Relay Directory"
-msgstr "중계소 목록를 미러"
-
-msgctxt "ServerPage"
-msgid ""
-"Email address at which you may be reached if there is a\n"
-"problem with your relay. You might also include your PGP or GPG fingerprint."
-msgstr "귀하의 중계에 대한 문제가 있을 경우 연락을 받을 수 있는 이메일 주소:귀하는 또한 PGP나 GPG 인증번호를 포함할 수도 있습니다."
+msgid "Copy your bridge relay's identity to the clipboard"
+msgstr ""
+#: 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 "당신의 중계는 이제 온라인 상태이고 토르 클라이언트가 사용할 수 있습니다. 좀 더 클라이언트가 귀하의 중계에 대해 알게 됨으로 몇 시간 이내에 대역폭 그래프로 표시됨으로써 네트워크 트래픽의 증가가 나타납니다. 토르 네트워크에 기여해 주셔서 감사합니다!"
+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?"
-msgstr "다른 Vidalia 프로세스가 이미 작동중입니다. 만약 정말 다른 Vidalia 프로세스가 없다면, 계속하도록 선택할 수 있습니다.\n\nVidalia 시작을 계속하겠습니까?"
-
-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 분"
+msgid "Unable to open log file '%1': %2"
+msgstr ""
diff --git a/src/vidalia/i18n/po/ku/qt_ku.po b/src/vidalia/i18n/po/ku/qt_ku.po
index 534a059..0aae6a6 100644
--- a/src/vidalia/i18n/po/ku/qt_ku.po
+++ b/src/vidalia/i18n/po/ku/qt_ku.po
@@ -1,11 +1,10 @@
#
-# Translators:
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-08-20 03:25+0000\n"
-"PO-Revision-Date: 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"
@@ -431,5 +430,3 @@ msgstr ""
msgctxt "QFileSystemModel"
msgid "%1 bytes"
msgstr ""
-
-
diff --git a/src/vidalia/i18n/po/ku/vidalia_ku.po b/src/vidalia/i18n/po/ku/vidalia_ku.po
index 0176cf1..cd31a6d 100755
--- a/src/vidalia/i18n/po/ku/vidalia_ku.po
+++ b/src/vidalia/i18n/po/ku/vidalia_ku.po
@@ -1,3816 +1,2682 @@
-#
-# Translators:
+#, fuzzy
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: 2010-12-05 20:03+0000\n"
-"Last-Translator: \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: 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: ku\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
"X-Generator: Vidalia ts2po 0.2\n"
+#: aboutdialog.ui:16
msgctxt "AboutDialog"
msgid "About Vidalia"
msgstr ""
+#: aboutdialog.ui:53
msgctxt "AboutDialog"
-msgid "License"
+msgid "Vidalia"
+msgstr ""
+
+#: aboutdialog.ui:88
+msgctxt "AboutDialog"
+msgid "Qt"
+msgstr ""
+
+#: aboutdialog.ui:69
+msgctxt "AboutDialog"
+msgid "Tor"
+msgstr ""
+
+#: aboutdialog.cpp:53
+msgctxt "AboutDialog"
+msgid "Unavailable"
+msgstr ""
+
+#: aboutdialog.cpp:57
+msgctxt "AboutDialog"
+msgid "Not Running"
+msgstr ""
+
+#: aboutdialog.ui:81
+msgctxt "AboutDialog"
+msgid "0.2.0"
+msgstr ""
+
+#: aboutdialog.ui:106
+msgctxt "AboutDialog"
+msgid "0.2.0.31-alpha-dev (r123456)"
msgstr ""
+#: aboutdialog.ui:131
msgctxt "AboutDialog"
-msgid "Vidalia 0.2.0"
+msgid "4.4.2"
msgstr ""
+#: aboutdialog.ui:107
msgctxt "AboutDialog"
-msgid "Tor 0.2.0.32"
+msgid "License"
msgstr ""
+#: aboutdialog.ui:163
msgctxt "AboutDialog"
-msgid "Qt 4.4.2"
+msgid "version"
msgstr ""
+#: advancedpage.cpp:109
msgctxt "AdvancedPage"
msgid "'%1' is not a valid IP address."
msgstr ""
+#: advancedpage.cpp:120
msgctxt "AdvancedPage"
-msgid ""
-"You selected 'Password' authentication, but did not specify a password."
+msgid "You selected 'Password' authentication, but did not specify a password."
msgstr ""
+#: advancedpage.cpp:223
msgctxt "AdvancedPage"
msgid "Select Tor Configuration File"
msgstr ""
+#: advancedpage.cpp:236
msgctxt "AdvancedPage"
msgid "File Not Found"
msgstr ""
+#: advancedpage.cpp:238
msgctxt "AdvancedPage"
msgid "%1 does not exist. Would you like to create it?"
msgstr ""
+#: advancedpage.cpp:249
msgctxt "AdvancedPage"
msgid "Failed to Create File"
msgstr ""
+#: advancedpage.cpp:250
msgctxt "AdvancedPage"
msgid "Unable to create %1 [%2]"
msgstr ""
+#: advancedpage.cpp:265
msgctxt "AdvancedPage"
msgid "Select a Directory to Use for Tor Data"
msgstr ""
+#: advancedpage.cpp:287
msgctxt "AdvancedPage"
msgid "Unable to remove Tor Service"
msgstr ""
+#: advancedpage.cpp:289
+msgctxt "AdvancedPage"
+msgid "Vidalia was unable to remove the Tor service."
+""
+"You may need to remove it manually."
+msgstr ""
+
+#: advancedpage.cpp:298
msgctxt "AdvancedPage"
msgid "Unable to install Tor Service"
msgstr ""
+#: advancedpage.cpp:299
msgctxt "AdvancedPage"
msgid "Vidalia was unable to install the Tor service."
msgstr ""
+#: advancedpage.ui:28
+msgctxt "AdvancedPage"
+msgid "Control Port"
+msgstr ""
+
+#: advancedpage.ui:48
msgctxt "AdvancedPage"
msgid "Authentication:"
msgstr ""
+#: advancedpage.ui:58
msgctxt "AdvancedPage"
msgid "Address:"
msgstr ""
+#: advancedpage.ui:86
msgctxt "AdvancedPage"
msgid "None"
msgstr ""
+#: advancedpage.ui:91
msgctxt "AdvancedPage"
msgid "Cookie"
msgstr ""
+#: advancedpage.ui:96
msgctxt "AdvancedPage"
msgid "Password"
msgstr ""
+#: advancedpage.ui:111
msgctxt "AdvancedPage"
msgid "Randomly Generate"
msgstr ""
+#: advancedpage.ui:157
msgctxt "AdvancedPage"
msgid ":"
msgstr ""
+#: advancedpage.ui:219
msgctxt "AdvancedPage"
msgid "Tor Configuration File"
msgstr ""
+#: advancedpage.ui:240
msgctxt "AdvancedPage"
msgid "Start the Tor software with the specified configuration file (torrc)"
msgstr ""
+#: advancedpage.ui:259
msgctxt "AdvancedPage"
msgid "Select path to your configuration file"
msgstr ""
+#: advancedpage.ui:318
msgctxt "AdvancedPage"
msgid "Browse"
msgstr ""
+#: advancedpage.ui:275
msgctxt "AdvancedPage"
msgid "Data Directory"
msgstr ""
+#: advancedpage.ui:296
msgctxt "AdvancedPage"
msgid "Store data for the Tor software in the following directory"
msgstr ""
+#: advancedpage.ui:315
msgctxt "AdvancedPage"
msgid "Select the directory used to store data for the Tor software"
msgstr ""
-msgctxt "AdvancedPage"
-msgid "Tor Control"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "Use TCP connection (ControlPort)"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "Path:"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "Use Unix domain socket (ControlSocket)"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "Edit current torrc"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "NOTE: this will edit the currently loaded torrc"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "ControlSocket path doesn't exist."
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid ""
-"The specified Tor configuration file location contains characters that "
-"cannot be represented in your system's current 8-bit character encoding."
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid ""
-"The specified Tor data directory location contains characters that cannot be"
-" represented in your system's current 8-bit character encoding."
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "Warning"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "You changed torrc path, would you like to restart Tor?"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "Tor Configuration File (torrc);;All Files (*)"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "Select a file to use for Tor socket path"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "Configure ControlPort automatically"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid ""
-"Vidalia was unable to remove the Tor service.\n"
-"\n"
-"You may need to remove it manually."
-msgstr ""
-
+#: appearancepage.ui:22
msgctxt "AppearancePage"
msgid "Language"
msgstr ""
+#: appearancepage.ui:37
msgctxt "AppearancePage"
msgid "Choose the language used in Vidalia"
msgstr ""
+#: appearancepage.ui:75
msgctxt "AppearancePage"
msgid "Style"
msgstr ""
+#: appearancepage.ui:103
msgctxt "AppearancePage"
msgid "Choose Vidalia's interface style"
msgstr ""
+#: appearancepage.cpp:67
msgctxt "AppearancePage"
msgid "Vidalia was unable to load the selected language translation."
msgstr ""
+#: bwgraph.cpp:166
msgctxt "BandwidthGraph"
msgid "Since:"
msgstr ""
+#: bwgraph.cpp:232
msgctxt "BandwidthGraph"
msgid "Hide Settings"
msgstr ""
+#: bwgraph.ui:40
msgctxt "BandwidthGraph"
msgid "Show Settings"
msgstr ""
+#: bwgraph.ui:16
msgctxt "BandwidthGraph"
msgid "Tor Bandwidth Usage"
msgstr ""
+#: bwgraph.ui:63
msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
+#: bwgraph.ui:151
msgctxt "BandwidthGraph"
msgid "Receive Rate"
msgstr ""
+#: bwgraph.ui:170
msgctxt "BandwidthGraph"
msgid "Send Rate"
msgstr ""
+#: bwgraph.ui:183
msgctxt "BandwidthGraph"
msgid "Always on Top"
msgstr ""
+#: bwgraph.ui:234
msgctxt "BandwidthGraph"
msgid "Style"
msgstr ""
+#: bwgraph.ui:284
msgctxt "BandwidthGraph"
msgid "Changes the transparency of the Bandwidth Graph"
msgstr ""
+#: bwgraph.ui:368
msgctxt "BandwidthGraph"
msgid "100"
msgstr ""
+#: bwgraph.ui:383
msgctxt "BandwidthGraph"
msgid "% Opaque"
msgstr ""
+#: bwgraph.ui:443
msgctxt "BandwidthGraph"
msgid "Save"
msgstr ""
+#: bwgraph.ui:450
msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
-msgctxt "BridgeDownloader"
-msgid "Starting HTTPS bridge request..."
-msgstr ""
-
-msgctxt "BridgeDownloader"
-msgid "Connecting to %1:%2..."
-msgstr ""
-
-msgctxt "BridgeDownloader"
-msgid "Sending an HTTPS request for bridges..."
-msgstr ""
-
-msgctxt "BridgeDownloader"
-msgid "Downloading a list of bridges..."
-msgstr ""
-
-msgctxt "BridgeDownloaderProgressDialog"
-msgid "Downloading Bridges"
-msgstr ""
-
-msgctxt "BridgeDownloaderProgressDialog"
-msgid "Unable to download bridges: %1"
-msgstr ""
-
-msgctxt "BridgeDownloaderProgressDialog"
-msgid "Retrying bridge request..."
-msgstr ""
-
-msgctxt "BridgeUsageDialog"
-msgid "Country"
-msgstr ""
-
-msgctxt "BridgeUsageDialog"
-msgid "# Clients"
-msgstr ""
-
-msgctxt "BridgeUsageDialog"
-msgid "Clients from the following countries have used your relay since %1"
-msgstr ""
-
-msgctxt "BridgeUsageDialog"
-msgid "Bridge Usage Summary"
-msgstr ""
-
-msgctxt "BridgeUsageDialog"
-msgid "Client Summary"
-msgstr ""
-
+#: circuit.cpp:112
msgctxt "Circuit"
msgid "New"
msgstr ""
+#: circuit.cpp:113
msgctxt "Circuit"
msgid "Open"
msgstr ""
+#: circuit.cpp:114
msgctxt "Circuit"
msgid "Building"
msgstr ""
+#: circuit.cpp:115
msgctxt "Circuit"
msgid "Failed"
msgstr ""
+#: circuit.cpp:116
msgctxt "Circuit"
msgid "Closed"
msgstr ""
+#: circuit.cpp:117
msgctxt "Circuit"
msgid "Unknown"
msgstr ""
+#: circuititem.cpp:39
msgctxt "CircuitItem"
msgid "<Path Empty>"
msgstr ""
+#: circuitlistwidget.cpp:55
msgctxt "CircuitListWidget"
msgid "Connection"
msgstr ""
+#: circuitlistwidget.cpp:55
msgctxt "CircuitListWidget"
msgid "Status"
msgstr ""
+#: circuitlistwidget.cpp:87
msgctxt "CircuitListWidget"
msgid "Zoom to Circuit"
msgstr ""
+#: circuitlistwidget.cpp:89
msgctxt "CircuitListWidget"
msgid "Close Circuit (Del)"
msgstr ""
+#: circuitlistwidget.cpp:110
msgctxt "CircuitListWidget"
msgid "Close Stream (Del)"
msgstr ""
+#: configdialog.cpp:77
msgctxt "ConfigDialog"
msgid "General"
msgstr ""
+#: configdialog.cpp:81
msgctxt "ConfigDialog"
msgid "Network"
msgstr ""
+#: configdialog.cpp:85
msgctxt "ConfigDialog"
msgid "Sharing"
msgstr ""
+#: configdialog.cpp:89
msgctxt "ConfigDialog"
msgid "Services"
msgstr ""
+#: configdialog.cpp:93
msgctxt "ConfigDialog"
msgid "Appearance"
msgstr ""
+#: configdialog.cpp:97
msgctxt "ConfigDialog"
msgid "Advanced"
msgstr ""
+#: configdialog.cpp:111
msgctxt "ConfigDialog"
msgid "Help"
msgstr ""
+#: configdialog.cpp:196
msgctxt "ConfigDialog"
msgid "Error Saving Settings"
msgstr ""
+#: configdialog.cpp:198
msgctxt "ConfigDialog"
msgid "Vidalia was unable to save your %1 settings."
msgstr ""
+#: configdialog.cpp:225
msgctxt "ConfigDialog"
msgid "Error Applying Settings"
msgstr ""
+#: configdialog.cpp:227
msgctxt "ConfigDialog"
msgid "Vidalia was unable to apply your %1 settings to Tor."
msgstr ""
+#: configdialog.ui:16
msgctxt "ConfigDialog"
msgid "Settings"
msgstr ""
+#: controlconnection.cpp:134
msgctxt "ControlConnection"
msgid "Vidalia was unable to connect to Tor. (%1)"
msgstr ""
+#: controlconnection.cpp:331
msgctxt "ControlConnection"
msgid "Control socket is not connected."
msgstr ""
+#: controlpasswordinputdialog.ui:28
msgctxt "ControlPasswordInputDialog"
msgid "Password Required"
msgstr ""
+#: controlpasswordinputdialog.ui:80
msgctxt "ControlPasswordInputDialog"
-msgid "Remember my password"
+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:"
+msgid "Remember my password"
msgstr ""
+#: controlsocket.cpp:70
msgctxt "ControlSocket"
msgid "Control socket is not connected."
msgstr ""
+#: controlsocket.cpp:80
msgctxt "ControlSocket"
msgid "Error sending control command. [%1]"
msgstr ""
+#: controlsocket.cpp:117
msgctxt "ControlSocket"
msgid "Socket disconnected while attempting to read a line of data."
msgstr ""
+#: controlsocket.cpp:156
msgctxt "ControlSocket"
msgid "Invalid control reply. [%1]"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Afghanistan"
+#: generalpage.cpp:62
+msgctxt "GeneralPage"
+msgid "Executables (*.exe)"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Andorra"
+#: generalpage.cpp:75
+msgctxt "GeneralPage"
+msgid "Select Path to Tor"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Angola"
+#: generalpage.cpp:85
+msgctxt "GeneralPage"
+msgid "Select Proxy Executable"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Antigua & Barbuda"
+#: generalpage.cpp:98
+msgctxt "GeneralPage"
+msgid "You must specify the name of your Tor executable."
msgstr ""
-msgctxt "CountryInfo"
-msgid "Argentina"
+#: generalpage.cpp:106
+msgctxt "GeneralPage"
+msgid "The proxy arguments specified are not properly formatted."
msgstr ""
-msgctxt "CountryInfo"
-msgid "Armenia"
+#: generalpage.ui:28
+msgctxt "GeneralPage"
+msgid "Start Vidalia when my system starts"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Australia"
+#: generalpage.ui:121
+msgctxt "GeneralPage"
+msgid "Browse"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Azerbaijan"
+#: generalpage.ui:57
+msgctxt "GeneralPage"
+msgid "Start the Tor software when Vidalia starts"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Bahamas"
+#: generalpage.ui:51
+msgctxt "GeneralPage"
+msgid "Tor"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Bangladesh"
+#: generalpage.ui:93
+msgctxt "GeneralPage"
+msgid "Proxy Application (optional)"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Barbados"
+#: generalpage.ui:99
+msgctxt "GeneralPage"
+msgid "Start a proxy application when Tor starts"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Belarus"
+#: generalpage.ui:135
+msgctxt "GeneralPage"
+msgid "Proxy Application Arguments:"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Belgium"
+#: graphframe.cpp:238
+msgctxt "GraphFrame"
+msgid "Recv: "
msgstr ""
-msgctxt "CountryInfo"
-msgid "Belize"
+#: graphframe.cpp:298
+msgctxt "GraphFrame"
+msgid "%1 KB/s"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Bhutan"
+#: graphframe.cpp:247
+msgctxt "GraphFrame"
+msgid "Sent: "
msgstr ""
-msgctxt "CountryInfo"
-msgid "Bolivia"
+#: graphframe.cpp:259
+msgctxt "GraphFrame"
+msgid "%1 KB"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Bosnia & Herzegovina"
+#: graphframe.cpp:262
+msgctxt "GraphFrame"
+msgid "%1 MB"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Botswana"
+#: graphframe.cpp:265
+msgctxt "GraphFrame"
+msgid "%1 GB"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Brazil"
+#: helpbrowser.cpp:135
+msgctxt "HelpBrowser"
+msgid "Error Loading Help Contents: "
msgstr ""
-msgctxt "CountryInfo"
-msgid "Brunei Darussalam"
+#: helpbrowser.cpp:147
+msgctxt "HelpBrowser"
+msgid "Supplied XML file is not a valid Contents document."
msgstr ""
-msgctxt "CountryInfo"
-msgid "Bulgaria"
+#: helpbrowser.cpp:396
+msgctxt "HelpBrowser"
+msgid "Search reached end of document"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Burkina Faso"
+#: helpbrowser.cpp:398
+msgctxt "HelpBrowser"
+msgid "Search reached start of document"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Burundi"
+#: helpbrowser.cpp:400
+msgctxt "HelpBrowser"
+msgid "Text not found in document"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Cambodia"
+#: helpbrowser.cpp:445
+msgctxt "HelpBrowser"
+msgid "Found %1 results"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Cameroon"
+#: helpbrowser.ui:33
+msgctxt "HelpBrowser"
+msgid "Vidalia Help"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Canada"
+#: helpbrowser.ui:484
+msgctxt "HelpBrowser"
+msgid "Back"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Cape Verde"
+#: helpbrowser.ui:487
+msgctxt "HelpBrowser"
+msgid "Move to previous page (Backspace)"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Central African Republic"
+#: helpbrowser.ui:490
+msgctxt "HelpBrowser"
+msgid "Backspace"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Chad"
+#: helpbrowser.ui:498
+msgctxt "HelpBrowser"
+msgid "Forward"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Chile"
+#: helpbrowser.ui:501
+msgctxt "HelpBrowser"
+msgid "Move to next page (Shift+Backspace)"
msgstr ""
-msgctxt "CountryInfo"
-msgid "China"
+#: helpbrowser.ui:504
+msgctxt "HelpBrowser"
+msgid "Shift+Backspace"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Colombia"
+#: helpbrowser.ui:512
+msgctxt "HelpBrowser"
+msgid "Home"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Comoros"
+#: helpbrowser.ui:515
+msgctxt "HelpBrowser"
+msgid "Move to the Home page (Ctrl+H)"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Congo, The Democratic Republic of the"
+#: helpbrowser.ui:518
+msgctxt "HelpBrowser"
+msgid "Ctrl+H"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Congo"
+#: helpbrowser.ui:535
+msgctxt "HelpBrowser"
+msgid "Find"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Costa Rica"
+#: helpbrowser.ui:538
+msgctxt "HelpBrowser"
+msgid "Search for a word or phrase on current page (Ctrl+F)"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Cote d’Ivoire"
+#: helpbrowser.ui:541
+msgctxt "HelpBrowser"
+msgid "Ctrl+F"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Croatia"
+#: helpbrowser.ui:549
+msgctxt "HelpBrowser"
+msgid "Close"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Cuba"
+#: helpbrowser.ui:552
+msgctxt "HelpBrowser"
+msgid "Close Vidalia Help"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Cyprus"
+#: helpbrowser.ui:555
+msgctxt "HelpBrowser"
+msgid "Esc"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Czech Republic"
+#: helpbrowser.ui:152
+msgctxt "HelpBrowser"
+msgid "Find:"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Denmark"
+#: helpbrowser.ui:174
+msgctxt "HelpBrowser"
+msgid "Find Previous"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Djibouti"
+#: helpbrowser.ui:187
+msgctxt "HelpBrowser"
+msgid "Find Next"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Dominica"
+#: helpbrowser.ui:221
+msgctxt "HelpBrowser"
+msgid "Case sensitive"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Dominican Republic"
+#: helpbrowser.ui:231
+msgctxt "HelpBrowser"
+msgid "Whole words only"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Ecuador"
+#: helpbrowser.ui:305
+msgctxt "HelpBrowser"
+msgid "Help Topics"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Egypt"
+#: helpbrowser.ui:260
+msgctxt "HelpBrowser"
+msgid "Contents"
msgstr ""
-msgctxt "CountryInfo"
-msgid "El Salvador"
+#: helpbrowser.ui:350
+msgctxt "HelpBrowser"
+msgid "Search"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Equatorial Guinea"
+#: helpbrowser.ui:362
+msgctxt "HelpBrowser"
+msgid "Searching for:"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Eritrea"
+#: helpbrowser.ui:405
+msgctxt "HelpBrowser"
+msgid "Found Documents"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Estonia"
+#: helptextbrowser.cpp:54
+msgctxt "HelpTextBrowser"
+msgid "Error opening help file: "
msgstr ""
-msgctxt "CountryInfo"
-msgid "France"
+#: helptextbrowser.cpp:72
+msgctxt "HelpTextBrowser"
+msgid "Opening External Link"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Gabon"
+#: 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."
msgstr ""
-msgctxt "CountryInfo"
-msgid "Gambia"
+#: helptextbrowser.cpp:78
+msgctxt "HelpTextBrowser"
+msgid "Do you want Vidalia to open the link in your Web browser?"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Georgia"
+#: helptextbrowser.cpp:88
+msgctxt "HelpTextBrowser"
+msgid "Unable to Open Link"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Germany"
+#: helptextbrowser.cpp:90
+msgctxt "HelpTextBrowser"
+msgid "Vidalia was unable to open the selected link in your Web browser. You can still copy the URL and paste it into your browser."
msgstr ""
-msgctxt "CountryInfo"
-msgid "Ghana"
+#: licensedialog.ui:13
+msgctxt "LicenseDialog"
+msgid "License Information"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Grenada"
+#: licensedialog.ui:43
+msgctxt "LicenseDialog"
+msgid "License"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Guatemala"
+#: licensedialog.ui:76
+msgctxt "LicenseDialog"
+msgid "Credits"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Guinea"
+#: logevent.cpp:57
+msgctxt "LogEvent"
+msgid "Debug"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Guinea-Bissau"
+#: logevent.cpp:58
+msgctxt "LogEvent"
+msgid "Info"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Guyana"
+#: logevent.cpp:59
+msgctxt "LogEvent"
+msgid "Notice"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Hong Kong"
+#: logevent.cpp:60
+msgctxt "LogEvent"
+msgid "Warning"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Haiti"
+#: logevent.cpp:61
+msgctxt "LogEvent"
+msgid "Error"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Honduras"
+#: logevent.cpp:62
+msgctxt "LogEvent"
+msgid "Unknown"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Israel"
+#: mainwindow.ui:233
+msgctxt "MainWindow"
+msgid "Start Tor"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Italy"
+#: mainwindow.ui:443
+msgctxt "MainWindow"
+msgid "Exit"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Jamaica"
+#: mainwindow.ui:304
+msgctxt "MainWindow"
+msgid "Bandwidth Graph"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Japan"
+#: mainwindow.ui:317
+msgctxt "MainWindow"
+msgid "Message Log"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Jordan"
+#: mainwindow.cpp:348
+msgctxt "MainWindow"
+msgid "Network Map"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Kazakhstan"
+#: mainwindow.cpp:354
+msgctxt "MainWindow"
+msgid "Control Panel"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Kenya"
+#: mainwindow.ui:380
+msgctxt "MainWindow"
+msgid "Settings"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Kiribati"
+#: mainwindow.ui:430
+msgctxt "MainWindow"
+msgid "About"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Kuwait"
+#: mainwindow.ui:367
+msgctxt "MainWindow"
+msgid "Help"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Kyrgyzstan"
+#: mainwindow.cpp:1391
+msgctxt "MainWindow"
+msgid "New Identity"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Laos"
+#: mainwindow.cpp:437
+msgctxt "MainWindow"
+msgid "Ctrl+T"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Latvia"
+#: mainwindow.cpp:438
+msgctxt "MainWindow"
+msgid "Ctrl+B"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Lebanon"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Lesotho"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Liberia"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Liechtenstein"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Lithuania"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Luxembourg"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Macedonia"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Madagascar"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Malawi"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Malaysia"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Mali"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Malta"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Marshall Islands"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Mauritania"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Mauritius"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Micronesia"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Moldova"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Monaco"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Mongolia"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Montenegro"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Morocco"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Mozambique"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Namibia"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Nauru"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Nepal"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Netherlands"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "New Zealand"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Nicaragua"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Niger"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Nigeria"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Norway"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Oman"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Pakistan"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Palau"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Palestine"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Panama"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Papua New Guinea"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Paraguay"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Peru"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Philippines"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Poland"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Portugal"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Qatar"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Romania"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Russia"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Rwanda"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Saint Kitts & Nevis"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Saint Lucia"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Saint Vincent & the Grenadines"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Samoa"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "San Marino"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Sao Tome & Principe"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Saudi Arabia"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Senegal"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Serbia"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Seychelles"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Sierra Leone"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Singapore"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Slovakia"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Slovenia"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Solomon Islands"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Somalia"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "South Africa"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Spain"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Sri Lanka"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Sudan"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Suriname"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Swaziland"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Sweden"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Switzerland"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Syria"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Tajikistan"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Tanzania"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Thailand"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Timor-Leste (East Timor)"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Togo"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Tonga"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Trinidad & Tobago"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Tunisia"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Turkey"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Turkmenistan"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Tuvalu"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Uganda"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Ukraine"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "United Arab Emirates"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "United Kingdom"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "United States"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Uruguay"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Uzbekistan"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Vanuatu"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Vatican"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Venezuela"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Vietnam"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Western Sahara"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Yemen"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Zambia"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Zimbabwe"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Zaire"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Albania"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Algeria"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Austria"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Bahrain"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Benin"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Ethiopia"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Fiji"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Finland"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Greece"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Guam"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Hungary"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Iceland"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "India"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Indonesia"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Iran"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Iraq"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Ireland"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Korea, North"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Korea, South"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Libya"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Maldives"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Mexico"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Myanmar"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Taiwan"
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid "Submit a Crash Report"
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid "Vidalia encountered an error and needed to close"
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid "Restart Vidalia"
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid "Don't Restart"
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid "Unable to restart Vidalia"
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid ""
-"We were unable to automatically restart Vidalia. Please restart Vidalia "
-"manually."
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid "Please fill a ticket in:"
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid ""
-"<a "
-"href=\"https://trac.torproject.org/projects/tor/newticket\">https://trac.torproject.org/projects/tor/newticket</a>"
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid ""
-"A crash report has been created that you can send to the Vidalia developers "
-"to help identify and fix the problem. The submitted report does not contain "
-"any personally identifying information."
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid ""
-"with a description of what you were doing before the application crashed, "
-"along with the following files corresponding to the crash report:"
-msgstr ""
-
-msgctxt "GeneralPage"
-msgid "Executables (*.exe)"
-msgstr ""
-
-msgctxt "GeneralPage"
-msgid "Select Path to Tor"
-msgstr ""
-
-msgctxt "GeneralPage"
-msgid "Select Proxy Executable"
-msgstr ""
-
-msgctxt "GeneralPage"
-msgid "You must specify the name of your Tor executable."
-msgstr ""
-
-msgctxt "GeneralPage"
-msgid "Start Vidalia when my system starts"
-msgstr ""
-
-msgctxt "GeneralPage"
-msgid "Browse"
-msgstr ""
-
-msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr ""
-
-msgctxt "GeneralPage"
-msgid "Tor"
-msgstr ""
-
-msgctxt "GeneralPage"
-msgid "Proxy Application (optional)"
-msgstr ""
-
-msgctxt "GeneralPage"
-msgid "Start a proxy application when Tor starts"
-msgstr ""
-
-msgctxt "GeneralPage"
-msgid "Proxy Application Arguments:"
-msgstr ""
-
-msgctxt "GeneralPage"
-msgid "Software Updates"
-msgstr ""
-
-msgctxt "GeneralPage"
-msgid "Check for new software updates automatically"
-msgstr ""
-
-msgctxt "GeneralPage"
-msgid "Check Now"
-msgstr ""
-
-msgctxt "GraphFrame"
-msgid "%1 KB/s"
-msgstr ""
-
-msgctxt "GraphFrame"
-msgid "%1 KB"
-msgstr ""
-
-msgctxt "GraphFrame"
-msgid "%1 MB"
-msgstr ""
-
-msgctxt "GraphFrame"
-msgid "%1 GB"
-msgstr ""
-
-msgctxt "GraphFrame"
-msgid "Recv:"
-msgstr ""
-
-msgctxt "GraphFrame"
-msgid "Sent:"
-msgstr ""
-
-msgctxt "HelpBrowser"
-msgid "Supplied XML file is not a valid Contents document."
-msgstr ""
-
-msgctxt "HelpBrowser"
-msgid "Search reached end of document"
-msgstr ""
-
-msgctxt "HelpBrowser"
-msgid "Search reached start of document"
-msgstr ""
-
-msgctxt "HelpBrowser"
-msgid "Text not found in document"
-msgstr ""
-
-msgctxt "HelpBrowser"
-msgid "Found %1 results"
-msgstr ""
-
-msgctxt "HelpBrowser"
-msgid "Vidalia Help"
-msgstr ""
-
-msgctxt "HelpBrowser"
-msgid "Back"
-msgstr ""
-
-msgctxt "HelpBrowser"
-msgid "Move to previous page (Backspace)"
-msgstr ""
-
-msgctxt "HelpBrowser"
-msgid "Backspace"
-msgstr ""
-
-msgctxt "HelpBrowser"
-msgid "Forward"
-msgstr ""
-
-msgctxt "HelpBrowser"
-msgid "Move to next page (Shift+Backspace)"
-msgstr ""
-
-msgctxt "HelpBrowser"
-msgid "Shift+Backspace"
-msgstr ""
-
-msgctxt "HelpBrowser"
-msgid "Home"
-msgstr ""
-
-msgctxt "HelpBrowser"
-msgid "Move to the Home page (Ctrl+H)"
-msgstr ""
-
-msgctxt "HelpBrowser"
-msgid "Ctrl+H"
-msgstr ""
-
-msgctxt "HelpBrowser"
-msgid "Find"
-msgstr ""
-
-msgctxt "HelpBrowser"
-msgid "Search for a word or phrase on current page (Ctrl+F)"
-msgstr ""
-
-msgctxt "HelpBrowser"
-msgid "Ctrl+F"
-msgstr ""
-
-msgctxt "HelpBrowser"
-msgid "Close"
-msgstr ""
-
-msgctxt "HelpBrowser"
-msgid "Close Vidalia Help"
-msgstr ""
-
-msgctxt "HelpBrowser"
-msgid "Esc"
-msgstr ""
-
-msgctxt "HelpBrowser"
-msgid "Find:"
-msgstr ""
-
-msgctxt "HelpBrowser"
-msgid "Find Previous"
-msgstr ""
-
-msgctxt "HelpBrowser"
-msgid "Find Next"
-msgstr ""
-
-msgctxt "HelpBrowser"
-msgid "Case sensitive"
-msgstr ""
-
-msgctxt "HelpBrowser"
-msgid "Whole words only"
-msgstr ""
-
-msgctxt "HelpBrowser"
-msgid "Help Topics"
-msgstr ""
-
-msgctxt "HelpBrowser"
-msgid "Contents"
-msgstr ""
-
-msgctxt "HelpBrowser"
-msgid "Search"
-msgstr ""
-
-msgctxt "HelpBrowser"
-msgid "Searching for:"
-msgstr ""
-
-msgctxt "HelpBrowser"
-msgid "Found Documents"
-msgstr ""
-
-msgctxt "HelpBrowser"
-msgid "Error Loading Help Contents:"
-msgstr ""
-
-msgctxt "HelpTextBrowser"
-msgid "Opening External Link"
-msgstr ""
-
-msgctxt "HelpTextBrowser"
-msgid ""
-"Vidalia can open the link you selected in your default Web browser. If your "
-"browser is not currently configured to use Tor then the request will not be "
-"anonymous."
-msgstr ""
-
-msgctxt "HelpTextBrowser"
-msgid "Do you want Vidalia to open the link in your Web browser?"
-msgstr ""
-
-msgctxt "HelpTextBrowser"
-msgid "Unable to Open Link"
-msgstr ""
-
-msgctxt "HelpTextBrowser"
-msgid ""
-"Vidalia was unable to open the selected link in your Web browser. You can "
-"still copy the URL and paste it into your browser."
-msgstr ""
-
-msgctxt "HelpTextBrowser"
-msgid "Error opening help file:"
-msgstr ""
-
-msgctxt "LicenseDialog"
-msgid "License Information"
-msgstr ""
-
-msgctxt "LicenseDialog"
-msgid "License"
-msgstr ""
-
-msgctxt "LicenseDialog"
-msgid "Credits"
-msgstr ""
-
-msgctxt "LogEvent"
-msgid "Debug"
-msgstr ""
-
-msgctxt "LogEvent"
-msgid "Info"
-msgstr ""
-
-msgctxt "LogEvent"
-msgid "Notice"
-msgstr ""
-
-msgctxt "LogEvent"
-msgid "Warning"
-msgstr ""
-
-msgctxt "LogEvent"
-msgid "Error"
-msgstr ""
-
-msgctxt "LogEvent"
-msgid "Unknown"
-msgstr ""
-
-msgctxt "LogTreeItem"
-msgid "Debug"
-msgstr ""
-
-msgctxt "LogTreeItem"
-msgid "Info"
-msgstr ""
-
-msgctxt "LogTreeItem"
-msgid "Notice"
-msgstr ""
-
-msgctxt "LogTreeItem"
-msgid "Warning"
-msgstr ""
-
-msgctxt "LogTreeItem"
-msgid "Error"
-msgstr ""
-
-msgctxt "LogTreeItem"
-msgid "Unknown"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Start Tor"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Exit"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Bandwidth Graph"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Message Log"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Network Map"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Control Panel"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Settings"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "About"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Help"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "New Identity"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+T"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+B"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+L"
+#: mainwindow.cpp:439
+msgctxt "MainWindow"
+msgid "Ctrl+L"
msgstr ""
+#: mainwindow.cpp:440
msgctxt "MainWindow"
msgid "Ctrl+N"
msgstr ""
+#: mainwindow.cpp:441
msgctxt "MainWindow"
msgid "Ctrl+?"
msgstr ""
+#: mainwindow.cpp:442
msgctxt "MainWindow"
msgid "Ctrl+I"
msgstr ""
+#: mainwindow.cpp:443
msgctxt "MainWindow"
msgid "Ctrl+P"
msgstr ""
+#: mainwindow.cpp:463
msgctxt "MainWindow"
msgid "Tor"
msgstr ""
+#: mainwindow.cpp:468
msgctxt "MainWindow"
msgid "View"
msgstr ""
+#: mainwindow.cpp:476
msgctxt "MainWindow"
msgid "Vidalia Help"
msgstr ""
+#: mainwindow.cpp:527
msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
+#: mainwindow.cpp:528
msgctxt "MainWindow"
msgid "Vidalia was unable to start the configured web browser"
msgstr ""
+#: mainwindow.cpp:540
msgctxt "MainWindow"
msgid "Error starting IM client"
msgstr ""
+#: mainwindow.cpp:541
msgctxt "MainWindow"
msgid "Vidalia was unable to start the configured IM client"
msgstr ""
+#: mainwindow.cpp:562
msgctxt "MainWindow"
msgid "Error starting proxy server"
msgstr ""
+#: mainwindow.cpp:563
msgctxt "MainWindow"
msgid "Vidalia was unable to start the configured proxy server"
msgstr ""
+#: mainwindow.cpp:579
msgctxt "MainWindow"
msgid "Connecting to a relay directory"
msgstr ""
+#: mainwindow.cpp:583
msgctxt "MainWindow"
msgid "Establishing an encrypted directory connection"
msgstr ""
+#: mainwindow.cpp:586
msgctxt "MainWindow"
msgid "Retrieving network status"
msgstr ""
+#: mainwindow.cpp:589
msgctxt "MainWindow"
msgid "Loading network status"
msgstr ""
+#: mainwindow.cpp:592
msgctxt "MainWindow"
msgid "Loading authority certificates"
msgstr ""
+#: mainwindow.cpp:595
msgctxt "MainWindow"
msgid "Requesting relay information"
msgstr ""
+#: mainwindow.cpp:598
msgctxt "MainWindow"
msgid "Loading relay information"
msgstr ""
+#: mainwindow.cpp:1132
msgctxt "MainWindow"
msgid "Connecting to the Tor network"
msgstr ""
+#: mainwindow.cpp:605
msgctxt "MainWindow"
msgid "Establishing a Tor circuit"
msgstr ""
+#: mainwindow.cpp:1297
msgctxt "MainWindow"
msgid "Connected to the Tor network!"
msgstr ""
+#: mainwindow.cpp:612
msgctxt "MainWindow"
msgid "Unrecognized startup status"
msgstr ""
+#: mainwindow.cpp:619
msgctxt "MainWindow"
msgid "miscellaneous"
msgstr ""
+#: mainwindow.cpp:622
msgctxt "MainWindow"
msgid "identity mismatch"
msgstr ""
+#: mainwindow.cpp:625
msgctxt "MainWindow"
msgid "done"
msgstr ""
+#: mainwindow.cpp:628
msgctxt "MainWindow"
msgid "connection refused"
msgstr ""
+#: mainwindow.cpp:631
msgctxt "MainWindow"
msgid "connection timeout"
msgstr ""
+#: mainwindow.cpp:634
msgctxt "MainWindow"
msgid "read/write error"
msgstr ""
+#: mainwindow.cpp:637
msgctxt "MainWindow"
msgid "no route to host"
msgstr ""
+#: mainwindow.cpp:640
msgctxt "MainWindow"
msgid "insufficient resources"
msgstr ""
+#: mainwindow.cpp:643
msgctxt "MainWindow"
msgid "unknown"
msgstr ""
+#: mainwindow.cpp:645
+msgctxt "MainWindow"
+msgid " failed (%1)"
+msgstr ""
+
+#: mainwindow.ui:168
msgctxt "MainWindow"
msgid "Tor is not running"
msgstr ""
+#: mainwindow.cpp:686
+msgctxt "MainWindow"
+msgid "Your relay is shutting down."
+"Click 'Stop' again to stop your relay now."
+msgstr ""
+
+#: mainwindow.cpp:688
msgctxt "MainWindow"
msgid "Tor is shutting down"
msgstr ""
+#: mainwindow.cpp:693
msgctxt "MainWindow"
msgid "Stop Tor Now"
msgstr ""
+#: mainwindow.cpp:695
msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
+#: mainwindow.cpp:711
msgctxt "MainWindow"
msgid "Starting the Tor software"
msgstr ""
+#: mainwindow.ui:75
msgctxt "MainWindow"
msgid "Starting Tor"
msgstr ""
+#: mainwindow.cpp:859
msgctxt "MainWindow"
msgid "Error Starting Tor"
msgstr ""
+#: mainwindow.cpp:862
msgctxt "MainWindow"
-msgid ""
-"Vidalia was unable to start Tor. Check your settings to ensure the correct "
-"name and location of your Tor executable is specified."
+msgid "Vidalia was unable to start Tor. Check your settings to ensure the correct name and location of your Tor executable is specified."
msgstr ""
+#: mainwindow.cpp:896
msgctxt "MainWindow"
msgid "Connecting to Tor"
msgstr ""
+#: mainwindow.cpp:906
msgctxt "MainWindow"
msgid "Connection Error"
msgstr ""
+#: mainwindow.cpp:938
msgctxt "MainWindow"
msgid "Relaying is Enabled"
msgstr ""
+#: mainwindow.cpp:943
+msgctxt "MainWindow"
+msgid "You are currently running a relay. Terminating your relay will interrupt any open connections from clients."
+""
+"Would you like to shutdown gracefully and give clients time to find a new relay?"
+msgstr ""
+
+#: mainwindow.cpp:965
msgctxt "MainWindow"
msgid "Error Shutting Down"
msgstr ""
+#: mainwindow.cpp:966
msgctxt "MainWindow"
msgid "Vidalia was unable to stop the Tor software."
msgstr ""
+#: mainwindow.cpp:997
msgctxt "MainWindow"
msgid "Unexpected Error"
msgstr ""
+#: mainwindow.cpp:1001
+msgctxt "MainWindow"
+msgid "Vidalia detected that the Tor software exited unexpectedly."
+""
+"Please check the message log for recent warning or error messages."
+msgstr ""
+
+#: mainwindow.cpp:1055
msgctxt "MainWindow"
msgid "Authenticating to Tor"
msgstr ""
+#: mainwindow.cpp:1075
msgctxt "MainWindow"
msgid "Cookie Authentication Required"
msgstr ""
+#: mainwindow.cpp:1078
msgctxt "MainWindow"
-msgid ""
-"The Tor software requires Vidalia to send the contents of an authentication "
-"cookie, but Vidalia was unable to find one."
+msgid "The Tor software requires Vidalia to send the contents of an authentication cookie, but Vidalia was unable to find one."
msgstr ""
+#: mainwindow.cpp:1080
msgctxt "MainWindow"
msgid "Would you like to browse for the file 'control_auth_cookie' yourself?"
msgstr ""
+#: mainwindow.cpp:1087
msgctxt "MainWindow"
msgid "Data Directory"
msgstr ""
+#: mainwindow.cpp:1089
msgctxt "MainWindow"
msgid "Control Cookie (control_auth_cookie)"
msgstr ""
+#: mainwindow.cpp:1141
msgctxt "MainWindow"
msgid "Error Registering for Events"
msgstr ""
+#: mainwindow.cpp:1143
msgctxt "MainWindow"
-msgid ""
-"Vidalia was unable to register for some events. Many of Vidalia's features "
-"may be unavailable."
+msgid "Vidalia was unable to register for some events. Many of Vidalia's features may be unavailable."
msgstr ""
+#: mainwindow.cpp:1222
msgctxt "MainWindow"
msgid "Authentication Error"
msgstr ""
+#: mainwindow.cpp:1224
msgctxt "MainWindow"
msgid "Vidalia was unable to authenticate to the Tor software. (%1)"
msgstr ""
+#: mainwindow.cpp:1226
msgctxt "MainWindow"
msgid "Please check your control port authentication settings."
msgstr ""
+#: mainwindow.cpp:1330
msgctxt "MainWindow"
msgid "Tor Update Available"
msgstr ""
+#: mainwindow.cpp:1333
msgctxt "MainWindow"
-msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended. Please visit the Tor website to download the latest version."
+msgid "The currently installed version of Tor is out of date or no longer recommended. Please visit the Tor website to download the latest version."
msgstr ""
+#: mainwindow.cpp:1333
msgctxt "MainWindow"
msgid "Tor website: %1"
msgstr ""
+#: mainwindow.cpp:1394
msgctxt "MainWindow"
-msgid ""
-"All subsequent connections will appear to be different than your old "
-"connections."
+msgid "All subsequent connections will appear to be different than your old connections."
msgstr ""
+#: mainwindow.cpp:1409
msgctxt "MainWindow"
msgid "Failed to Create New Identity"
msgstr ""
+#: mainwindow.cpp:1458
msgctxt "MainWindow"
msgid "Port Forwarding Failed"
msgstr ""
+#: mainwindow.cpp:1459
msgctxt "MainWindow"
msgid "Vidalia was unable to configure automatic port forwarding."
msgstr ""
+#: mainwindow.ui:19
msgctxt "MainWindow"
msgid "Vidalia Control Panel"
msgstr ""
+#: mainwindow.ui:49
msgctxt "MainWindow"
msgid "Status"
msgstr ""
+#: mainwindow.ui:218
msgctxt "MainWindow"
msgid "Vidalia Shortcuts"
msgstr ""
+#: mainwindow.ui:243
msgctxt "MainWindow"
msgid "Setup Relaying"
msgstr ""
+#: mainwindow.ui:246
msgctxt "MainWindow"
msgid "Set up a relay and help the network grow"
msgstr ""
+#: mainwindow.ui:256
msgctxt "MainWindow"
msgid "View the Network"
msgstr ""
+#: mainwindow.ui:259
msgctxt "MainWindow"
msgid "View a map of the Tor network"
msgstr ""
+#: mainwindow.ui:272
msgctxt "MainWindow"
msgid "Use a New Identity"
msgstr ""
+#: mainwindow.ui:275
msgctxt "MainWindow"
msgid "Make subsequent connections appear new"
msgstr ""
+#: mainwindow.ui:307
msgctxt "MainWindow"
msgid "View recent bandwidth usage"
msgstr ""
+#: mainwindow.ui:320
msgctxt "MainWindow"
-msgid "View log message history"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "View help documentation"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Configure Vidalia"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "View version and license information"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Exit Vidalia"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Show this window on startup"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Hide"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Hide this window"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Password Reset Failed"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid ""
-"Vidalia tried to reset Tor's control password, but was not able to restart "
-"the Tor software. Please check your Task Manager to ensure there are no "
-"other Tor processes running."
-msgstr ""
-
-msgctxt "MainWindow"
-msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended."
-msgstr ""
-
-msgctxt "MainWindow"
-msgid ""
-"Would you like to check if a newer package is available for installation?"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Potentially Unsafe Connection"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid ""
-"Tor has automatically closed your connection in order to protect your "
-"anonymity."
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Update Failed"
+msgid "View log message history"
msgstr ""
+#: mainwindow.ui:370
msgctxt "MainWindow"
-msgid "Your software is up to date"
+msgid "View help documentation"
msgstr ""
+#: mainwindow.ui:383
msgctxt "MainWindow"
-msgid ""
-"There are no new Tor software packages available for your computer at this "
-"time."
+msgid "Configure Vidalia"
msgstr ""
+#: mainwindow.ui:433
msgctxt "MainWindow"
-msgid "Installation Failed"
+msgid "View version and license information"
msgstr ""
+#: mainwindow.ui:446
msgctxt "MainWindow"
-msgid "Vidalia was unable to install your software updates."
+msgid "Exit Vidalia"
msgstr ""
+#: mainwindow.ui:498
msgctxt "MainWindow"
-msgid "The following error occurred:"
+msgid "Show this window on startup"
msgstr ""
+#: mainwindow.ui:517
msgctxt "MainWindow"
-msgid ""
-"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 "Hide"
msgstr ""
+#: mainwindow.ui:520
msgctxt "MainWindow"
-msgid "failed (%1)"
+msgid "Hide this window"
msgstr ""
+#: mainwindow.cpp:1210
msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+msgid "Password Reset Failed"
msgstr ""
+#: mainwindow.cpp:1213
msgctxt "MainWindow"
-msgid "Bootstrapping torrc from %1 to %2"
+msgid "Vidalia tried to reset Tor's control 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 ""
-"You are currently running a relay. Terminating your relay 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 ""
-msgctxt "MainWindow"
-msgid "(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)"
+#: 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."
+#: 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 ""
+#: messagelog.cpp:190
msgctxt "MessageLog"
msgid "Vidalia was unable to register for Tor's log events."
msgstr ""
+#: messagelog.cpp:205
msgctxt "MessageLog"
msgid "Error Opening Log File"
msgstr ""
+#: messagelog.cpp:206
msgctxt "MessageLog"
msgid "Vidalia was unable to open the specified log file."
msgstr ""
+#: messagelog.cpp:227
msgctxt "MessageLog"
msgid "Log Filename Required"
msgstr ""
+#: messagelog.cpp:229
msgctxt "MessageLog"
msgid "You must enter a filename to be able to save log messages to a file."
msgstr ""
+#: messagelog.cpp:280
msgctxt "MessageLog"
msgid "Select Log File"
msgstr ""
+#: messagelog.cpp:297
msgctxt "MessageLog"
msgid "Save Log Messages"
msgstr ""
+#: messagelog.cpp:300
msgctxt "MessageLog"
msgid "Text Files (*.txt)"
msgstr ""
+#: messagelog.cpp:309
msgctxt "MessageLog"
msgid "Vidalia"
msgstr ""
+#: messagelog.cpp:310
+msgctxt "MessageLog"
+msgid "Cannot write file %1"
+""
+"%2."
+msgstr ""
+
+#: messagelog.cpp:360
msgctxt "MessageLog"
msgid "Find in Message Log"
msgstr ""
+#: messagelog.cpp:361
msgctxt "MessageLog"
msgid "Find:"
msgstr ""
+#: messagelog.cpp:367
msgctxt "MessageLog"
msgid "Not Found"
msgstr ""
+#: messagelog.cpp:368
msgctxt "MessageLog"
msgid "Search found 0 matches."
msgstr ""
+#: messagelog.ui:19
msgctxt "MessageLog"
msgid "Message Log"
msgstr ""
+#: messagelog.ui:452
msgctxt "MessageLog"
msgid "Message Filters..."
msgstr ""
+#: messagelog.ui:455
msgctxt "MessageLog"
msgid "Set message filters"
msgstr ""
+#: messagelog.ui:463
msgctxt "MessageLog"
msgid "History Size..."
msgstr ""
+#: messagelog.ui:466
msgctxt "MessageLog"
msgid "Set maximum number of messages to display"
msgstr ""
+#: messagelog.ui:477
msgctxt "MessageLog"
msgid "Clear"
msgstr ""
+#: messagelog.ui:480
msgctxt "MessageLog"
msgid "Clear all messages from the Message Log (Ctrl+E)"
msgstr ""
+#: messagelog.ui:483
msgctxt "MessageLog"
msgid "Ctrl+E"
msgstr ""
+#: messagelog.ui:497
msgctxt "MessageLog"
msgid "Copy"
msgstr ""
+#: messagelog.ui:500
msgctxt "MessageLog"
msgid "Copy the selected messages to the clipboard (Ctrl+C)"
msgstr ""
+#: messagelog.ui:503
msgctxt "MessageLog"
msgid "Ctrl+C"
msgstr ""
+#: messagelog.ui:514
msgctxt "MessageLog"
msgid "Select All"
msgstr ""
+#: messagelog.ui:517
msgctxt "MessageLog"
msgid "Select all messages (Ctrl+A)"
msgstr ""
+#: messagelog.ui:520
msgctxt "MessageLog"
msgid "Ctrl+A"
msgstr ""
+#: messagelog.ui:528
msgctxt "MessageLog"
msgid "Save All"
msgstr ""
+#: messagelog.ui:531
msgctxt "MessageLog"
msgid "Save all messages to a file"
msgstr ""
+#: messagelog.ui:539
msgctxt "MessageLog"
msgid "Save Selected"
msgstr ""
+#: messagelog.ui:542
msgctxt "MessageLog"
msgid "Save selected messages to a file"
msgstr ""
+#: messagelog.ui:553
msgctxt "MessageLog"
msgid "Settings"
msgstr ""
+#: messagelog.ui:556
msgctxt "MessageLog"
msgid "Adjust Message Log Settings"
msgstr ""
+#: messagelog.ui:559
msgctxt "MessageLog"
msgid "Ctrl+T"
msgstr ""
+#: messagelog.ui:567
msgctxt "MessageLog"
msgid "Help"
msgstr ""
+#: messagelog.ui:570
msgctxt "MessageLog"
msgid "Show the help browser"
msgstr ""
+#: messagelog.ui:573
msgctxt "MessageLog"
msgid "F1"
msgstr ""
+#: messagelog.ui:581
msgctxt "MessageLog"
msgid "Close"
msgstr ""
+#: messagelog.ui:584
msgctxt "MessageLog"
msgid "Close the Message Log"
msgstr ""
+#: messagelog.ui:587
msgctxt "MessageLog"
msgid "Esc"
msgstr ""
+#: messagelog.ui:598
msgctxt "MessageLog"
msgid "Find"
msgstr ""
+#: messagelog.ui:601
msgctxt "MessageLog"
msgid "Find all messages containing the search text (Ctrl+F)"
msgstr ""
+#: messagelog.ui:604
msgctxt "MessageLog"
msgid "Ctrl+F"
msgstr ""
+#: messagelog.ui:66
msgctxt "MessageLog"
msgid "Time"
msgstr ""
+#: messagelog.ui:71
msgctxt "MessageLog"
msgid "Type"
msgstr ""
+#: messagelog.ui:76
msgctxt "MessageLog"
msgid "Message"
msgstr ""
+#: messagelog.ui:160
msgctxt "MessageLog"
msgid "Saves the current Message Log settings"
msgstr ""
+#: messagelog.ui:163
msgctxt "MessageLog"
msgid "Save Settings"
msgstr ""
+#: messagelog.ui:179
msgctxt "MessageLog"
msgid "Cancels changes made to settings"
msgstr ""
+#: messagelog.ui:182
msgctxt "MessageLog"
msgid "Cancel"
msgstr ""
+#: messagelog.ui:196
msgctxt "MessageLog"
msgid "Message Filter"
msgstr ""
+#: messagelog.ui:217
msgctxt "MessageLog"
msgid "Error"
msgstr ""
+#: messagelog.ui:233
msgctxt "MessageLog"
msgid "Warning"
msgstr ""
+#: messagelog.ui:249
msgctxt "MessageLog"
msgid "Notice"
msgstr ""
+#: messagelog.ui:265
msgctxt "MessageLog"
msgid "Info"
msgstr ""
+#: messagelog.ui:281
msgctxt "MessageLog"
msgid "Debug"
msgstr ""
+#: messagelog.ui:297
msgctxt "MessageLog"
msgid "Message Log History"
msgstr ""
+#: messagelog.ui:318
msgctxt "MessageLog"
msgid "Number of messages to display in the message log window"
msgstr ""
+#: messagelog.ui:337
msgctxt "MessageLog"
msgid "messages"
msgstr ""
-msgctxt "MessageLog"
-msgid "Browse"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Enable automatically saving all new log messages to a file"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Automatically save new log messages to a file"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Basic"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Tor Status"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Advanced"
-msgstr ""
-
+#: messagelog.ui:356
msgctxt "MessageLog"
msgid "Always Save New Log Messages"
msgstr ""
+#: messagelog.ui:371
msgctxt "MessageLog"
-msgid ""
-"Messages that appear when something has \n"
-"gone very wrong and Tor cannot proceed."
-msgstr ""
-
-msgctxt "MessageLog"
-msgid ""
-"Messages that only appear when \n"
-"something has gone wrong with Tor."
-msgstr ""
-
-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 ""
-
-msgctxt "MessageLog"
-msgid ""
-"Messages that appear frequently \n"
-"during normal Tor operation."
+msgid "Browse"
msgstr ""
+#: messagelog.ui:394
msgctxt "MessageLog"
-msgid ""
-"Hyper-verbose messages primarily of \n"
-"interest to Tor developers."
+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 ""
+#: netviewer.ui:24
msgctxt "NetViewer"
msgid "Tor Network Map"
msgstr ""
+#: netviewer.ui:239
msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
+#: netviewer.ui:245
msgctxt "NetViewer"
msgid "Refresh the list of Tor relays and connections"
msgstr ""
+#: netviewer.ui:248
msgctxt "NetViewer"
msgid "Ctrl+R"
msgstr ""
+#: netviewer.ui:256
msgctxt "NetViewer"
msgid "Help"
msgstr ""
+#: netviewer.ui:259
msgctxt "NetViewer"
msgid "Show the network map help"
msgstr ""
+#: netviewer.ui:262
msgctxt "NetViewer"
msgid "Show network map help"
msgstr ""
+#: netviewer.ui:265
msgctxt "NetViewer"
msgid "F1"
msgstr ""
+#: netviewer.ui:273
msgctxt "NetViewer"
msgid "Close"
msgstr ""
+#: netviewer.ui:279
msgctxt "NetViewer"
msgid "Close the network map"
msgstr ""
+#: netviewer.ui:282
msgctxt "NetViewer"
msgid "Esc"
msgstr ""
+#: netviewer.ui:290
msgctxt "NetViewer"
msgid "Zoom In"
msgstr ""
+#: netviewer.ui:296
msgctxt "NetViewer"
msgid "Zoom in on the network map"
msgstr ""
+#: netviewer.ui:299
msgctxt "NetViewer"
msgid "+"
msgstr ""
+#: netviewer.ui:307
msgctxt "NetViewer"
msgid "Zoom Out"
msgstr ""
+#: netviewer.ui:313
msgctxt "NetViewer"
msgid "Zoom out on the network map"
msgstr ""
+#: netviewer.ui:316
msgctxt "NetViewer"
msgid "-"
msgstr ""
+#: netviewer.ui:324
msgctxt "NetViewer"
msgid "Zoom To Fit"
msgstr ""
+#: netviewer.ui:330
msgctxt "NetViewer"
msgid "Zooms to fit all currently displayed circuits"
msgstr ""
+#: netviewer.ui:333
msgctxt "NetViewer"
msgid "Ctrl+Z"
msgstr ""
-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 ""
-
+#: networkpage.cpp:193
msgctxt "NetworkPage"
msgid "Invalid Bridge"
msgstr ""
+#: networkpage.cpp:194
msgctxt "NetworkPage"
msgid "The specified bridge identifier is not valid."
msgstr ""
+#: networkpage.cpp:241
msgctxt "NetworkPage"
msgid "Copy (Ctrl+C)"
msgstr ""
+#: networkpage.cpp:272
msgctxt "NetworkPage"
-msgid ""
-"You must specify both an IP address or hostname and a port number to "
-"configure Tor to use a proxy to access the Internet."
+msgid "You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet."
msgstr ""
+#: networkpage.cpp:278
msgctxt "NetworkPage"
-msgid ""
-"You must specify one or more ports to which your firewall allows you to "
-"connect."
+msgid "You must specify one or more ports to which your firewall allows you to connect."
msgstr ""
+#: networkpage.cpp:314
msgctxt "NetworkPage"
msgid "'%1' is not a valid port number."
msgstr ""
+#: networkpage.ui:25
msgctxt "NetworkPage"
msgid "Check if your local network requires a proxy to access the Internet"
msgstr ""
+#: networkpage.ui:28
msgctxt "NetworkPage"
msgid "I use a proxy to access the Internet"
msgstr ""
+#: networkpage.ui:58
msgctxt "NetworkPage"
msgid "Proxy Settings"
msgstr ""
+#: networkpage.ui:70
+msgctxt "NetworkPage"
+msgid "HTTP Proxy:"
+msgstr ""
+
+#: networkpage.ui:80
msgctxt "NetworkPage"
msgid "Username:"
msgstr ""
+#: networkpage.ui:90
+msgctxt "NetworkPage"
+msgid "Use this proxy for HTTPS also"
+msgstr ""
+
+#: networkpage.ui:108
msgctxt "NetworkPage"
msgid "Password:"
msgstr ""
+#: networkpage.ui:135
msgctxt "NetworkPage"
msgid "Port:"
msgstr ""
+#: networkpage.ui:176
msgctxt "NetworkPage"
msgid "Check to only connect to relays using ports allowed by your firewall"
msgstr ""
+#: networkpage.ui:179
msgctxt "NetworkPage"
msgid "My firewall only lets me connect to certain ports"
msgstr ""
+#: networkpage.ui:203
msgctxt "NetworkPage"
msgid "Firewall Settings"
msgstr ""
+#: networkpage.ui:215
msgctxt "NetworkPage"
msgid "Allowed Ports:"
msgstr ""
+#: networkpage.ui:225
msgctxt "NetworkPage"
msgid "80, 443"
msgstr ""
+#: networkpage.ui:235
msgctxt "NetworkPage"
-msgid ""
-"Check to encrypt directory requests and, optionally, use bridge relays to "
-"access the Tor network"
+msgid "Check to encrypt directory requests and, optionally, use bridge relays to access the Tor network"
msgstr ""
+#: networkpage.ui:238
msgctxt "NetworkPage"
msgid "My ISP blocks connections to the Tor network"
msgstr ""
+#: networkpage.ui:262
msgctxt "NetworkPage"
msgid "Bridge Settings"
msgstr ""
+#: networkpage.ui:274
msgctxt "NetworkPage"
-msgid "Add a Bridge:"
-msgstr ""
-
-msgctxt "NetworkPage"
-msgid "Remove the selected bridges from the list"
-msgstr ""
-
-msgctxt "NetworkPage"
-msgid "Copy the selected bridges to the clipboard"
-msgstr ""
-
-msgctxt "NetworkPage"
-msgid "Find Bridges Now"
-msgstr ""
-
-msgctxt "NetworkPage"
-msgid "<a href=\"bridges.finding\">How else can I find bridges?</a>"
-msgstr ""
-
-msgctxt "NetworkPage"
-msgid "<a href=\"bridges.finding\">How can I find bridges?</a>"
-msgstr ""
-
-msgctxt "NetworkPage"
-msgid ""
-"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:"
+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 "You must select the proxy type."
-msgstr ""
-
-msgctxt "NetworkPage"
-msgid "SOCKS 4"
+msgid "Add a Bridge:"
msgstr ""
+#: networkpage.ui:318
msgctxt "NetworkPage"
-msgid "SOCKS 5"
+msgid "<a href=\"bridges.finding\">How do I find a bridge?</a>"
msgstr ""
+#: networkpage.ui:383
msgctxt "NetworkPage"
-msgid "HTTP"
+msgid "Remove the selected bridges from the list"
msgstr ""
+#: networkpage.ui:399
msgctxt "NetworkPage"
-msgid "HTTP / HTTPS"
+msgid "Copy the selected bridges to the clipboard"
msgstr ""
+#: policy.cpp:167
msgctxt "Policy"
msgid "accept"
msgstr ""
+#: policy.cpp:167
msgctxt "Policy"
msgid "reject"
msgstr ""
+#: routerdescriptor.cpp:76
msgctxt "RouterDescriptor"
msgid "Online"
msgstr ""
+#: routerdescriptor.cpp:78
msgctxt "RouterDescriptor"
msgid "Hibernating"
msgstr ""
+#: routerdescriptor.cpp:80
msgctxt "RouterDescriptor"
msgid "Offline"
msgstr ""
+#: routerdescriptorview.cpp:139
msgctxt "RouterDescriptorView"
msgid "Location:"
msgstr ""
+#: routerdescriptorview.cpp:143
msgctxt "RouterDescriptorView"
msgid "IP Address:"
msgstr ""
+#: routerdescriptorview.cpp:144
msgctxt "RouterDescriptorView"
msgid "Platform:"
msgstr ""
+#: routerdescriptorview.cpp:148
msgctxt "RouterDescriptorView"
msgid "Bandwidth:"
msgstr ""
+#: routerdescriptorview.cpp:150
msgctxt "RouterDescriptorView"
msgid "Uptime:"
msgstr ""
+#: routerdescriptorview.cpp:156
msgctxt "RouterDescriptorView"
msgid "Last Updated:"
msgstr ""
+#: routerdescriptorview.cpp:100
msgctxt "RouterDescriptorView"
-msgid "Copy"
-msgstr ""
-
-msgctxt "RouterInfoDialog"
-msgid "Hibernating"
-msgstr ""
-
-msgctxt "RouterInfoDialog"
-msgid "Online"
-msgstr ""
-
-msgctxt "RouterInfoDialog"
-msgid "Offline"
+msgid "%1 days "
msgstr ""
-msgctxt "RouterInfoDialog"
-msgid "Unknown"
-msgstr ""
-
-msgctxt "RouterInfoDialog"
-msgid "Relay Details"
-msgstr ""
-
-msgctxt "RouterInfoDialog"
-msgid "Summary"
-msgstr ""
-
-msgctxt "RouterInfoDialog"
-msgid "Name:"
-msgstr ""
-
-msgctxt "RouterInfoDialog"
-msgid "Status:"
-msgstr ""
-
-msgctxt "RouterInfoDialog"
-msgid "Location:"
-msgstr ""
-
-msgctxt "RouterInfoDialog"
-msgid "IP Address:"
-msgstr ""
-
-msgctxt "RouterInfoDialog"
-msgid "Platform:"
-msgstr ""
-
-msgctxt "RouterInfoDialog"
-msgid "Bandwidth:"
-msgstr ""
-
-msgctxt "RouterInfoDialog"
-msgid "Uptime:"
+#: routerdescriptorview.cpp:103
+msgctxt "RouterDescriptorView"
+msgid "%1 hours "
msgstr ""
-msgctxt "RouterInfoDialog"
-msgid "Contact:"
+#: routerdescriptorview.cpp:106
+msgctxt "RouterDescriptorView"
+msgid "%1 mins "
msgstr ""
-msgctxt "RouterInfoDialog"
-msgid "Last Updated:"
+#: routerdescriptorview.cpp:109
+msgctxt "RouterDescriptorView"
+msgid "%1 secs"
msgstr ""
-msgctxt "RouterInfoDialog"
-msgid "Descriptor"
+#: routerdescriptorview.cpp:48
+msgctxt "RouterDescriptorView"
+msgid "Copy"
msgstr ""
+#: routerlistitem.cpp:67
msgctxt "RouterListItem"
msgid "Offline"
msgstr ""
+#: routerlistitem.cpp:71
msgctxt "RouterListItem"
msgid "Hibernating"
msgstr ""
+#: routerlistitem.cpp:83
msgctxt "RouterListItem"
msgid "%1 KB/s"
msgstr ""
+#: routerlistwidget.cpp:49
msgctxt "RouterListWidget"
msgid "Relay"
msgstr ""
+#: routerlistwidget.cpp:74
msgctxt "RouterListWidget"
msgid "Zoom to Relay"
msgstr ""
+#: routerlistwidget.cpp:220
msgctxt "RouterListWidget"
msgid "%1 relays online"
msgstr ""
+#: routerlistwidget.cpp:67
msgctxt "RouterListWidget"
msgid "Copy"
msgstr ""
+#: routerlistwidget.cpp:68
msgctxt "RouterListWidget"
msgid "Nickname"
msgstr ""
+#: routerlistwidget.cpp:71
msgctxt "RouterListWidget"
msgid "Fingerprint"
msgstr ""
+#: serverpage.cpp:140
msgctxt "ServerPage"
msgid "Bridge Support Unavailable"
msgstr ""
+#: serverpage.cpp:143
msgctxt "ServerPage"
-msgid ""
-"You have configured Tor to act as a bridge relay for censored users, but "
-"your version of Tor does not support bridges."
+msgid "You have configured Tor to act as a bridge relay for censored users, but your version of Tor does not support bridges."
msgstr ""
+#: serverpage.cpp:145
msgctxt "ServerPage"
-msgid ""
-"Please upgrade your Tor software or configure Tor to act as a normal Tor "
-"relay."
+msgid "Please upgrade your Tor software or configure Tor to act as a normal Tor relay."
msgstr ""
+#: serverpage.cpp:199
msgctxt "ServerPage"
msgid "Your bridge relay is not running."
msgstr ""
+#: serverpage.cpp:263
msgctxt "ServerPage"
msgid "You must specify at least a relay nickname and port."
msgstr ""
+#: serverpage.ui:25
msgctxt "ServerPage"
msgid "Run as a client only"
msgstr ""
+#: serverpage.ui:32
msgctxt "ServerPage"
msgid "Relay traffic for the Tor network"
msgstr ""
+#: serverpage.ui:39
+msgctxt "ServerPage"
+msgid "Help censored users reach the Tor network (Tor 0.2.0.8-alpha or newer)"
+msgstr ""
+
+#: serverpage.ui:91
msgctxt "ServerPage"
msgid "Relay Port:"
msgstr ""
+#: serverpage.ui:110
msgctxt "ServerPage"
msgid "Enable to mirror the relay directory"
msgstr ""
+#: serverpage.ui:113
+msgctxt "ServerPage"
+msgid "Mirror the Relay Directory "
+msgstr ""
+
+#: serverpage.ui:139
msgctxt "ServerPage"
msgid "Attempt to automatically configure port forwarding"
msgstr ""
+#: serverpage.ui:154
msgctxt "ServerPage"
msgid "Test"
msgstr ""
+#: serverpage.ui:164
msgctxt "ServerPage"
msgid "Show help topic on port forwarding"
msgstr ""
+#: serverpage.ui:204
+msgctxt "ServerPage"
+msgid "Email address at which you may be reached if there is a"
+"problem with your relay. You might also include your PGP or GPG fingerprint."
+msgstr ""
+
+#: serverpage.ui:234
msgctxt "ServerPage"
msgid "Directory Port:"
msgstr ""
+#: serverpage.ui:267
msgctxt "ServerPage"
msgid "Directory Port Number"
msgstr ""
+#: serverpage.ui:279
msgctxt "ServerPage"
msgid "Contact Info:"
msgstr ""
+#: serverpage.ui:337
msgctxt "ServerPage"
msgid "Name of your relay"
msgstr ""
+#: serverpage.ui:370
msgctxt "ServerPage"
msgid "Port on which users and other relays can communicate with your relay"
msgstr ""
+#: serverpage.ui:380
msgctxt "ServerPage"
msgid "Nickname:"
msgstr ""
+#: serverpage.ui:76
msgctxt "ServerPage"
msgid "Basic Settings"
msgstr ""
+#: serverpage.ui:435
msgctxt "ServerPage"
-msgid ""
-"For Internet connections with fast download speed but slow upload, please "
-"list your upload speed here."
+msgid "For Internet connections with fast download speed but slow upload, please list your upload speed here."
msgstr ""
+#: serverpage.ui:466
msgctxt "ServerPage"
msgid "Cable/DSL 256 Kbps"
msgstr ""
+#: serverpage.ui:471
msgctxt "ServerPage"
msgid "Cable/DSL 512 Kbps"
msgstr ""
+#: serverpage.ui:476
msgctxt "ServerPage"
msgid "Cable/DSL 768 Kbps"
msgstr ""
+#: serverpage.ui:481
msgctxt "ServerPage"
msgid "T1/Cable/DSL 1.5 Mbps"
msgstr ""
+#: serverpage.ui:486
msgctxt "ServerPage"
msgid "> 1.5 Mbps"
msgstr ""
+#: serverpage.ui:491
msgctxt "ServerPage"
msgid "Custom"
msgstr ""
+#: serverpage.ui:456
msgctxt "ServerPage"
msgid "Select the entry that most closely resembles your Internet connection"
msgstr ""
+#: serverpage.ui:502
msgctxt "ServerPage"
msgid "Show help topic on bandwidth rate limits"
msgstr ""
+#: serverpage.ui:591
msgctxt "ServerPage"
-msgid "Average Rate"
-msgstr ""
-
-msgctxt "ServerPage"
-msgid "Long-term average bandwidth limit"
-msgstr ""
-
-msgctxt "ServerPage"
-msgid "KB/s"
-msgstr ""
-
-msgctxt "ServerPage"
-msgid "Maximum Rate"
-msgstr ""
-
-msgctxt "ServerPage"
-msgid "Peak bandwidth rate limit"
-msgstr ""
-
-msgctxt "ServerPage"
-msgid ""
-"Your maximum bandwidth rate must be greater than or equal to your average "
-"bandwidth rate. Both values must be at least 20 KB/s."
-msgstr ""
-
-msgctxt "ServerPage"
-msgid "Bandwidth Limits"
-msgstr ""
-
-msgctxt "ServerPage"
-msgid "Ports 6660 - 6669 and 6697"
-msgstr ""
-
-msgctxt "ServerPage"
-msgid "Internet Relay Chat (IRC)"
-msgstr ""
-
-msgctxt "ServerPage"
-msgid "Ports 110, 143, 993 and 995"
-msgstr ""
-
-msgctxt "ServerPage"
-msgid "Retrieve Mail (POP, IMAP)"
-msgstr ""
-
-msgctxt "ServerPage"
-msgid "Ports unspecified by other checkboxes"
-msgstr ""
-
-msgctxt "ServerPage"
-msgid "Misc Other Services"
-msgstr ""
-
-msgctxt "ServerPage"
-msgid "Ports 706, 1863, 5050, 5190, 5222, 5223, 8300 and 8888"
+msgid "Average Rate"
msgstr ""
+#: serverpage.ui:620
msgctxt "ServerPage"
-msgid "Instant Messaging (IM)"
+msgid "Long-term average bandwidth limit"
msgstr ""
+#: serverpage.ui:708
msgctxt "ServerPage"
-msgid "Port 443"
+msgid "KB/s"
msgstr ""
+#: serverpage.ui:666
msgctxt "ServerPage"
-msgid "Secure Websites (SSL)"
+msgid "Maximum Rate"
msgstr ""
+#: serverpage.ui:695
msgctxt "ServerPage"
-msgid "Port 80"
+msgid "Peak bandwidth rate limit"
msgstr ""
+#: serverpage.ui:737
msgctxt "ServerPage"
-msgid "Websites"
+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 "Show help topic on exit policies"
+msgid "Bandwidth Limits"
msgstr ""
+#: serverpage.ui:802
msgctxt "ServerPage"
-msgid ""
-"What Internet resources should users be able to access from your relay?"
+msgid "Ports 6660 - 6669 and 6697"
msgstr ""
+#: serverpage.ui:805
msgctxt "ServerPage"
-msgid ""
-"Tor will still block some outgoing mail and file sharing applications by "
-"default to reduce spam and other abuse."
+msgid "Internet Relay Chat (IRC)"
msgstr ""
+#: serverpage.ui:815
msgctxt "ServerPage"
-msgid "Exit Policies"
+msgid "Ports 110, 143, 993 and 995"
msgstr ""
+#: serverpage.ui:818
msgctxt "ServerPage"
-msgid "Let others access your bridge by giving them this line:"
+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"
+msgid "Ports unspecified by other checkboxes"
msgstr ""
+#: serverpage.ui:831
msgctxt "ServerPage"
-msgid "Copy your bridge relay's identity to the clipboard"
+msgid "Misc Other Services"
msgstr ""
+#: serverpage.ui:841
msgctxt "ServerPage"
-msgid "No Recent Usage"
+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."
+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."
+msgid "Port 443"
msgstr ""
+#: serverpage.ui:857
msgctxt "ServerPage"
-msgid "Bridge History"
+msgid "Secure Websites (SSL)"
msgstr ""
+#: serverpage.ui:867
msgctxt "ServerPage"
-msgid "Vidalia was unable to retrieve your bridge's usage history."
+msgid "Port 80"
msgstr ""
+#: serverpage.ui:870
msgctxt "ServerPage"
-msgid ""
-"Tor returned an improperly formatted response when Vidalia requested your "
-"bridge's usage history."
+msgid "Websites"
msgstr ""
+#: serverpage.ui:896
msgctxt "ServerPage"
-msgid "The returned response was: %1"
+msgid "Show help topic on exit policies"
msgstr ""
+#: serverpage.ui:969
msgctxt "ServerPage"
-msgid "Help censored users reach the Tor network"
+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>"
+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>"
+msgid "Exit Policies"
msgstr ""
+#: serverpage.ui:1015
msgctxt "ServerPage"
-msgid "Automatically distribute my bridge address"
+msgid "Let others access your bridge by giving them this line:"
msgstr ""
+#: serverpage.ui:1039
msgctxt "ServerPage"
-msgid "Mirror the Relay Directory"
+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 ""
+#: servicepage.cpp:116
msgctxt "ServicePage"
msgid "Error while trying to unpublish all services"
msgstr ""
+#: servicepage.cpp:123
msgctxt "ServicePage"
-msgid ""
-"Please configure at least a service directory and a virtual port for each "
-"service you want to save. Remove the other ones."
+msgid "Please configure at least a service directory and a virtual port for each service you want to save. Remove the other ones."
msgstr ""
+#: servicepage.cpp:597
msgctxt "ServicePage"
msgid "Error"
msgstr ""
+#: servicepage.cpp:452
msgctxt "ServicePage"
msgid "Please select a Service."
msgstr ""
+#: servicepage.cpp:458
msgctxt "ServicePage"
msgid "Select Service Directory"
msgstr ""
+#: servicepage.cpp:547
msgctxt "ServicePage"
msgid "Virtual Port may only contain valid port numbers [1..65535]."
msgstr ""
+#: servicepage.cpp:578
msgctxt "ServicePage"
msgid "Target may only contain address:port, address, or port."
msgstr ""
+#: servicepage.cpp:598
msgctxt "ServicePage"
msgid "Directory already in use by another service."
msgstr ""
+#: servicepage.ui:19
msgctxt "ServicePage"
msgid "Form"
msgstr ""
+#: servicepage.ui:31
msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
+#: servicepage.ui:56
msgctxt "ServicePage"
msgid "Onion Address"
msgstr ""
+#: servicepage.ui:61
msgctxt "ServicePage"
msgid "Virtual Port"
msgstr ""
+#: servicepage.ui:66
msgctxt "ServicePage"
msgid "Target"
msgstr ""
+#: servicepage.ui:71
msgctxt "ServicePage"
msgid "Directory Path"
msgstr ""
+#: servicepage.ui:76
msgctxt "ServicePage"
msgid "Enabled"
msgstr ""
+#: servicepage.ui:84
msgctxt "ServicePage"
msgid "Add new service to list"
msgstr ""
+#: servicepage.ui:97
msgctxt "ServicePage"
msgid "Remove selected service from list"
msgstr ""
+#: servicepage.ui:110
msgctxt "ServicePage"
msgid "Copy onion address of selected service to clipboard"
msgstr ""
+#: servicepage.ui:123
msgctxt "ServicePage"
msgid "Browse in local file system and choose directory for selected service"
msgstr ""
+#: servicepage.cpp:384
msgctxt "ServicePage"
msgid "Created by Tor"
msgstr ""
-msgctxt "StatusEventWidget"
-msgid "Copy to Clipboard"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "The Tor Software is Running"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "You are currently running version \"%1\" of the Tor software."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "The Tor Software is not Running"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Click \"Start Tor\" in the Vidalia Control Panel to restart the Tor "
-"software. If Tor exited unexpectedly, select the \"Advanced\" tab above for "
-"details about any errors encountered."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"You are currently running version \"%1\" of the Tor software, which is no "
-"longer recommended. Please upgrade to the most recent version of the "
-"software, which may contain important security, reliability and performance "
-"fixes."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"You are currently running version \"%1\" of the Tor software, which may no "
-"longer work with the current Tor network. Please upgrade to the most recent "
-"version of the software, which may contain important security, reliability "
-"and performance fixes."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Your Tor Software is Out-of-date"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Connected to the Tor Network"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"We were able to successfully establish a connection to the Tor network. You "
-"can now configure your applications to use the Internet anonymously."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Tor Software Error"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"The Tor software encountered an internal bug. Please report the following "
-"error message to the Tor developers at bugs.torproject.org: \"%1\""
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Tor has determined that your computer's clock may be set to %1 seconds in "
-"the past compared to the source \"%2\". If your clock is not correct, Tor "
-"will not be able to function. Please verify your computer displays the "
-"correct time."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Tor has determined that your computer's clock may be set to %1 seconds in "
-"the future compared to the source \"%2\". If your clock is not correct, Tor "
-"will not be able to function. Please verify your computer displays the "
-"correct time."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Your Computer's Clock is Potentially Incorrect"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"One of the applications on your computer may have attempted to make an "
-"unencrypted connection through Tor to port %1. Sending unencrypted "
-"information over the Tor network is dangerous and not recommended. For your "
-"protection, Tor has automatically closed this connection."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"One of the applications on your computer may have attempted to make an "
-"unencrypted connection through Tor to port %1. Sending unencrypted "
-"information over the Tor network is dangerous and not recommended."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Potentially Dangerous Connection!"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"One of your applications established a connection through Tor to \"%1\" "
-"using a protocol that may leak information about your destination. Please "
-"ensure you configure your applications to use only SOCKS4a or SOCKS5 with "
-"remote hostname resolution."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Unknown SOCKS Protocol"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"One of your applications tried to establish a connection through Tor using a"
-" protocol that Tor does not understand. Please ensure you configure your "
-"applications to use only SOCKS4a or SOCKS5 with remote hostname resolution."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Invalid Destination Hostname"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"One of your applications tried to establish a connection through Tor to "
-"\"%1\", which Tor does not recognize as a valid hostname. Please check your "
-"application's configuration."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "External IP Address Changed"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Tor has determined your relay's public IP address is currently %1%2. If that"
-" is not correct, please consider setting the 'Address' option in your "
-"relay's configuration."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "DNS Hijacking Detected"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Tor detected that your DNS provider is providing false responses for domains"
-" that do not exist. Some ISPs and other DNS providers, such as OpenDNS, are "
-"known to do this in order to display their own search or advertising pages."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Tor detected that your DNS provider is providing false responses for well "
-"known domains. Since clients rely on Tor network relays to provide accurate "
-"DNS repsonses, your relay will not be configured as an exit relay."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Checking Server Port Reachability"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Tor is trying to determine if your relay's server port is reachable from the"
-" Tor network by connecting to itself at %1:%2. This test could take several "
-"minutes."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Server Port Reachability Test Successful!"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Your relay's server port is reachable from the Tor network!"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Server Port Reachability Test Failed"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Your relay's server port is not reachable by other Tor clients. This can "
-"happen if you are behind a router or firewall that requires you to set up "
-"port forwarding. If %1:%2 is not your correct IP address and server port, "
-"please check your relay's configuration."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Checking Directory Port Reachability"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Tor is trying to determine if your relay's directory port is reachable from "
-"the Tor network by connecting to itself at %1:%2. This test could take "
-"several minutes."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Directory Port Reachability Test Successful!"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Your relay's directory port is reachable from the Tor network!"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Directory Port Reachability Test Failed"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Your relay's directory port is not reachable by other Tor clients. This can "
-"happen if you are behind a router or firewall that requires you to set up "
-"port forwarding. If %1:%2 is not your correct IP address and directory port,"
-" please check your relay's configuration."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Relay Descriptor Rejected"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Your relay's descriptor, which enables clients to connect to your relay, was"
-" rejected by the directory server at %1:%2. The reason given was: %3"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Your Relay is Online"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Your relay is now online and available for Tor clients to use. You should "
-"see an increase in network traffic shown by the Bandwidth Graph within a few"
-" hours as more clients learn about your relay. Thank you for contributing to"
-" the Tor network!"
-msgstr ""
-
+#: stream.cpp:131
msgctxt "Stream"
msgid "New"
msgstr ""
+#: stream.cpp:133
msgctxt "Stream"
msgid "Resolving"
msgstr ""
+#: stream.cpp:134
msgctxt "Stream"
msgid "Connecting"
msgstr ""
+#: stream.cpp:135
msgctxt "Stream"
msgid "Open"
msgstr ""
+#: stream.cpp:136
msgctxt "Stream"
msgid "Failed"
msgstr ""
+#: stream.cpp:137
msgctxt "Stream"
msgid "Closed"
msgstr ""
+#: stream.cpp:138
msgctxt "Stream"
msgid "Retrying"
msgstr ""
+#: stream.cpp:139
msgctxt "Stream"
msgid "Remapped"
msgstr ""
+#: stream.cpp:140
msgctxt "Stream"
msgid "Unknown"
msgstr ""
+#: torprocess.cpp:107
msgctxt "TorProcess"
msgid "Process %1 failed to stop. [%2]"
msgstr ""
+#: torservice.cpp:143
msgctxt "TorService"
msgid "The Tor service is not installed."
msgstr ""
+#: torservice.cpp:161
msgctxt "TorService"
msgid "Unable to start the Tor service."
msgstr ""
+#: torsettings.cpp:103
msgctxt "TorSettings"
msgid "Failed to hash the control password."
msgstr ""
-msgctxt "TorrcDialog"
-msgid "Editing torrc"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid ""
-"Save settings. If unchecked it will only apply settings to the current Tor "
-"instance."
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Cut"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Copy"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Paste"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Undo"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Redo"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Select All"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Apply all"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Apply selection only"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Error connecting to Tor"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Selection is empty. Please select some text, or check \"Apply all\""
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Error at line %1: \"%2\""
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Error"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "An error ocurred while opening torrc file"
-msgstr ""
-
+#: upnpcontrol.cpp:139
msgctxt "UPNPControl"
msgid "Success"
msgstr ""
+#: upnpcontrol.cpp:141
msgctxt "UPNPControl"
msgid "No UPnP-enabled devices found"
msgstr ""
+#: upnpcontrol.cpp:143
msgctxt "UPNPControl"
msgid "No valid UPnP-enabled Internet gateway devices found"
msgstr ""
+#: upnpcontrol.cpp:145
msgctxt "UPNPControl"
msgid "WSAStartup failed"
msgstr ""
+#: upnpcontrol.cpp:147
msgctxt "UPNPControl"
msgid "Failed to add a port mapping"
msgstr ""
+#: upnpcontrol.cpp:149
msgctxt "UPNPControl"
msgid "Failed to retrieve a port mapping"
msgstr ""
+#: upnpcontrol.cpp:151
msgctxt "UPNPControl"
msgid "Failed to remove a port mapping"
msgstr ""
+#: upnpcontrol.cpp:153
msgctxt "UPNPControl"
msgid "Unknown error"
msgstr ""
+#: upnptestdialog.cpp:112
msgctxt "UPNPTestDialog"
msgid "Discovering UPnP-enabled devices"
msgstr ""
+#: upnptestdialog.cpp:117
msgctxt "UPNPTestDialog"
msgid "Updating directory port mapping"
msgstr ""
+#: upnptestdialog.cpp:122
msgctxt "UPNPTestDialog"
msgid "Updating relay port mapping"
msgstr ""
+#: upnptestdialog.cpp:127
msgctxt "UPNPTestDialog"
msgid "Test completed successfully!"
msgstr ""
+#: upnptestdialog.ui:13
msgctxt "UPNPTestDialog"
msgid "Testing UPnP Support"
msgstr ""
+#: upnptestdialog.ui:92
msgctxt "UPNPTestDialog"
msgid "Testing Universal Plug & Play Support"
msgstr ""
-msgctxt "UpdateProcess"
-msgid ""
-"Vidalia was unable to check for available software updates because it could "
-"not find '%1'."
-msgstr ""
-
-msgctxt "UpdateProcess"
-msgid ""
-"Vidalia was unable to check for available software updates because Tor's "
-"update process exited unexpectedly."
-msgstr ""
-
-msgctxt "UpdateProgressDialog"
-msgid "Checking for available updates..."
-msgstr ""
-
-msgctxt "UpdateProgressDialog"
-msgid "Hide"
-msgstr ""
-
-msgctxt "UpdateProgressDialog"
-msgid "Downloading updates..."
-msgstr ""
-
-msgctxt "UpdateProgressDialog"
-msgid "Installing updated software..."
-msgstr ""
-
-msgctxt "UpdateProgressDialog"
-msgid "Done! Your software is now up to date."
-msgstr ""
-
-msgctxt "UpdateProgressDialog"
-msgid "OK"
-msgstr ""
-
-msgctxt "UpdateProgressDialog"
-msgid "Software Updates"
-msgstr ""
-
-msgctxt "UpdateProgressDialog"
-msgid "Checking for updates..."
-msgstr ""
-
-msgctxt "UpdateProgressDialog"
-msgid "Cancel"
-msgstr ""
-
-msgctxt "UpdatesAvailableDialog"
-msgid "Software Updates Available"
-msgstr ""
-
-msgctxt "UpdatesAvailableDialog"
-msgid "Remind Me Later"
-msgstr ""
-
-msgctxt "UpdatesAvailableDialog"
-msgid "Install"
-msgstr ""
-
-msgctxt "UpdatesAvailableDialog"
-msgid "The following updated software packages are ready for installation:"
-msgstr ""
-
-msgctxt "UpdatesAvailableDialog"
-msgid "Package"
-msgstr ""
-
-msgctxt "UpdatesAvailableDialog"
-msgid "Version"
-msgstr ""
-
+#: vmessagebox.cpp:77
msgctxt "VMessageBox"
msgid "OK"
msgstr ""
+#: vmessagebox.cpp:78
msgctxt "VMessageBox"
msgid "Cancel"
msgstr ""
+#: vmessagebox.cpp:79
msgctxt "VMessageBox"
msgid "Yes"
msgstr ""
+#: vmessagebox.cpp:80
msgctxt "VMessageBox"
msgid "No"
msgstr ""
+#: vmessagebox.cpp:81
msgctxt "VMessageBox"
msgid "Help"
msgstr ""
+#: vmessagebox.cpp:82
msgctxt "VMessageBox"
msgid "Retry"
msgstr ""
+#: vmessagebox.cpp:83
msgctxt "VMessageBox"
msgid "Show Log"
msgstr ""
+#: vmessagebox.cpp:84
msgctxt "VMessageBox"
msgid "Show Settings"
msgstr ""
+#: vmessagebox.cpp:85
msgctxt "VMessageBox"
msgid "Continue"
msgstr ""
+#: vmessagebox.cpp:86
msgctxt "VMessageBox"
msgid "Quit"
msgstr ""
+#: vmessagebox.cpp:87
msgctxt "VMessageBox"
msgid "Browse"
msgstr ""
+#: main.cpp:75
msgctxt "Vidalia"
msgid "Invalid Argument"
msgstr ""
+#: main.cpp:89
msgctxt "Vidalia"
msgid "Vidalia is already running"
msgstr ""
+#: main.cpp:95
+msgctxt "Vidalia"
+msgid "Another Vidalia process is possibly already running. If there really is not another Vidalia process running, you can choose to continue anyway."
+""
+"Would you like to continue starting Vidalia?"
+msgstr ""
+
+#: vidalia.cpp:169
msgctxt "Vidalia"
msgid "Displays this usage message and exits."
msgstr ""
+#: vidalia.cpp:171
msgctxt "Vidalia"
msgid "Resets ALL stored Vidalia settings."
msgstr ""
+#: vidalia.cpp:173
msgctxt "Vidalia"
msgid "Sets the directory Vidalia uses for data files."
msgstr ""
+#: vidalia.cpp:175
msgctxt "Vidalia"
msgid "Sets the name and location of Vidalia's pidfile."
msgstr ""
+#: vidalia.cpp:177
msgctxt "Vidalia"
msgid "Sets the name and location of Vidalia's logfile."
msgstr ""
+#: vidalia.cpp:180
msgctxt "Vidalia"
msgid "Sets the verbosity of Vidalia's logging."
msgstr ""
+#: vidalia.cpp:183
msgctxt "Vidalia"
msgid "Sets Vidalia's interface style."
msgstr ""
+#: vidalia.cpp:186
msgctxt "Vidalia"
msgid "Sets Vidalia's language."
msgstr ""
+#: vidalia.cpp:190
msgctxt "Vidalia"
msgid "Vidalia Usage Information"
msgstr ""
+#: vidalia.cpp:238
msgctxt "Vidalia"
-msgid "Unable to open log file '%1': %2"
-msgstr ""
-
-msgctxt "Vidalia"
-msgid "Value required for parameter :"
-msgstr ""
-
-msgctxt "Vidalia"
-msgid "Invalid language code specified:"
+msgid "Invalid language code specified: "
msgstr ""
+#: vidalia.cpp:245
msgctxt "Vidalia"
-msgid "Invalid GUI style specified:"
+msgid "Invalid GUI style specified: "
msgstr ""
+#: vidalia.cpp:251
msgctxt "Vidalia"
-msgid "Invalid log level specified:"
+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?"
-msgstr ""
-
-msgctxt "stringutil.h"
-msgid "%1 secs"
-msgstr ""
-
-msgctxt "stringutil.h"
-msgid "%1 B/s"
-msgstr ""
-
-msgctxt "stringutil.h"
-msgid "%1 KB/s"
-msgstr ""
-
-msgctxt "stringutil.h"
-msgid "%1 MB/s"
-msgstr ""
-
-msgctxt "stringutil.h"
-msgid "%1 GB/s"
-msgstr ""
-
-msgctxt "stringutil.h"
-msgid "%1 days"
-msgstr ""
-
-msgctxt "stringutil.h"
-msgid "%1 hours"
-msgstr ""
-
-msgctxt "stringutil.h"
-msgid "%1 mins"
+msgid "Unable to open log file '%1': %2"
msgstr ""
-
-
diff --git a/src/vidalia/i18n/po/kw/qt_kw.po b/src/vidalia/i18n/po/kw/qt_kw.po
index 6fb8933..9239778 100644
--- a/src/vidalia/i18n/po/kw/qt_kw.po
+++ b/src/vidalia/i18n/po/kw/qt_kw.po
@@ -1,11 +1,10 @@
#
-# Translators:
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-08-20 03:25+0000\n"
-"PO-Revision-Date: 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"
@@ -431,5 +430,3 @@ msgstr ""
msgctxt "QFileSystemModel"
msgid "%1 bytes"
msgstr ""
-
-
diff --git a/src/vidalia/i18n/po/kw/vidalia_kw.po b/src/vidalia/i18n/po/kw/vidalia_kw.po
index 1126a58..22b0f4e 100644
--- a/src/vidalia/i18n/po/kw/vidalia_kw.po
+++ b/src/vidalia/i18n/po/kw/vidalia_kw.po
@@ -1,18 +1,15 @@
-#
-# Translators:
+#, fuzzy
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: 2010-12-05 20:03+0000\n"
-"Last-Translator: \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: 2009-05-19 23:56+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
+"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: kw\n"
-"Plural-Forms: nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n == 3) ? 2 : 3\n"
"X-Generator: Vidalia ts2po 0.2\n"
msgctxt "AboutDialog"
@@ -35,13 +32,28 @@ msgctxt "AboutDialog"
msgid "Qt 4.4.2"
msgstr ""
+msgctxt "AboutDialog"
+msgid "Vidalia"
+msgstr ""
+
+msgctxt "AboutDialog"
+msgid "Tor"
+msgstr ""
+
+msgctxt "AboutDialog"
+msgid "Qt"
+msgstr ""
+
+msgctxt "AboutDialog"
+msgid "version"
+msgstr ""
+
msgctxt "AdvancedPage"
msgid "'%1' is not a valid IP address."
msgstr ""
msgctxt "AdvancedPage"
-msgid ""
-"You selected 'Password' authentication, but did not specify a password."
+msgid "You selected 'Password' authentication, but did not specify a password."
msgstr ""
msgctxt "AdvancedPage"
@@ -81,6 +93,10 @@ msgid "Vidalia was unable to install the Tor service."
msgstr ""
msgctxt "AdvancedPage"
+msgid "Control Port"
+msgstr ""
+
+msgctxt "AdvancedPage"
msgid "Authentication:"
msgstr ""
@@ -137,68 +153,7 @@ msgid "Select the directory used to store data for the Tor software"
msgstr ""
msgctxt "AdvancedPage"
-msgid "Tor Control"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "Use TCP connection (ControlPort)"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "Path:"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "Use Unix domain socket (ControlSocket)"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "Edit current torrc"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "NOTE: this will edit the currently loaded torrc"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "ControlSocket path doesn't exist."
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid ""
-"The specified Tor configuration file location contains characters that "
-"cannot be represented in your system's current 8-bit character encoding."
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid ""
-"The specified Tor data directory location contains characters that cannot be"
-" represented in your system's current 8-bit character encoding."
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "Warning"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "You changed torrc path, would you like to restart Tor?"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "Tor Configuration File (torrc);;All Files (*)"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "Select a file to use for Tor socket path"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "Configure ControlPort automatically"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid ""
-"Vidalia was unable to remove the Tor service.\n"
+msgid "Vidalia was unable to remove the Tor service.\n"
"\n"
"You may need to remove it manually."
msgstr ""
@@ -440,9 +395,7 @@ msgid "Remember my password"
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid ""
-"Vidalia has connected to a running Tor process that requires a password. "
-"Please enter your control password:"
+msgid "Vidalia has connected to a running Tor process that requires a password. Please enter your control password:"
msgstr ""
msgctxt "ControlSocket"
@@ -1158,10 +1111,6 @@ msgid "Zimbabwe"
msgstr ""
msgctxt "CountryInfo"
-msgid "Zaire"
-msgstr ""
-
-msgctxt "CountryInfo"
msgid "Albania"
msgstr ""
@@ -1257,55 +1206,6 @@ msgctxt "CountryInfo"
msgid "Taiwan"
msgstr ""
-msgctxt "CrashReportDialog"
-msgid "Submit a Crash Report"
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid "Vidalia encountered an error and needed to close"
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid "Restart Vidalia"
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid "Don't Restart"
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid "Unable to restart Vidalia"
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid ""
-"We were unable to automatically restart Vidalia. Please restart Vidalia "
-"manually."
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid "Please fill a ticket in:"
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid ""
-"<a "
-"href=\"https://trac.torproject.org/projects/tor/newticket\">https://trac.torproject.org/projects/tor/newticket</a>"
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid ""
-"A crash report has been created that you can send to the Vidalia developers "
-"to help identify and fix the problem. The submitted report does not contain "
-"any personally identifying information."
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid ""
-"with a description of what you were doing before the application crashed, "
-"along with the following files corresponding to the crash report:"
-msgstr ""
-
msgctxt "GeneralPage"
msgid "Executables (*.exe)"
msgstr ""
@@ -1323,6 +1223,10 @@ msgid "You must specify the name of your Tor executable."
msgstr ""
msgctxt "GeneralPage"
+msgid "The proxy arguments specified are not properly formatted."
+msgstr ""
+
+msgctxt "GeneralPage"
msgid "Start Vidalia when my system starts"
msgstr ""
@@ -1519,10 +1423,7 @@ msgid "Opening External Link"
msgstr ""
msgctxt "HelpTextBrowser"
-msgid ""
-"Vidalia can open the link you selected in your default Web browser. If your "
-"browser is not currently configured to use Tor then the request will not be "
-"anonymous."
+msgid "Vidalia can open the link you selected in your default Web browser. If your browser is not currently configured to use Tor then the request will not be anonymous."
msgstr ""
msgctxt "HelpTextBrowser"
@@ -1534,9 +1435,7 @@ msgid "Unable to Open Link"
msgstr ""
msgctxt "HelpTextBrowser"
-msgid ""
-"Vidalia was unable to open the selected link in your Web browser. You can "
-"still copy the URL and paste it into your browser."
+msgid "Vidalia was unable to open the selected link in your Web browser. You can still copy the URL and paste it into your browser."
msgstr ""
msgctxt "HelpTextBrowser"
@@ -1579,30 +1478,6 @@ msgctxt "LogEvent"
msgid "Unknown"
msgstr ""
-msgctxt "LogTreeItem"
-msgid "Debug"
-msgstr ""
-
-msgctxt "LogTreeItem"
-msgid "Info"
-msgstr ""
-
-msgctxt "LogTreeItem"
-msgid "Notice"
-msgstr ""
-
-msgctxt "LogTreeItem"
-msgid "Warning"
-msgstr ""
-
-msgctxt "LogTreeItem"
-msgid "Error"
-msgstr ""
-
-msgctxt "LogTreeItem"
-msgid "Unknown"
-msgstr ""
-
msgctxt "MainWindow"
msgid "Start Tor"
msgstr ""
@@ -1816,9 +1691,7 @@ msgid "Error Starting Tor"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Vidalia was unable to start Tor. Check your settings to ensure the correct "
-"name and location of your Tor executable is specified."
+msgid "Vidalia was unable to start Tor. Check your settings to ensure the correct name and location of your Tor executable is specified."
msgstr ""
msgctxt "MainWindow"
@@ -1854,9 +1727,7 @@ msgid "Cookie Authentication Required"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"The Tor software requires Vidalia to send the contents of an authentication "
-"cookie, but Vidalia was unable to find one."
+msgid "The Tor software requires Vidalia to send the contents of an authentication cookie, but Vidalia was unable to find one."
msgstr ""
msgctxt "MainWindow"
@@ -1876,9 +1747,7 @@ msgid "Error Registering for Events"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Vidalia was unable to register for some events. Many of Vidalia's features "
-"may be unavailable."
+msgid "Vidalia was unable to register for some events. Many of Vidalia's features may be unavailable."
msgstr ""
msgctxt "MainWindow"
@@ -1898,9 +1767,7 @@ msgid "Tor Update Available"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended. Please visit the Tor website to download the latest version."
+msgid "The currently installed version of Tor is out of date or no longer recommended. Please visit the Tor website to download the latest version."
msgstr ""
msgctxt "MainWindow"
@@ -1908,9 +1775,7 @@ msgid "Tor website: %1"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"All subsequent connections will appear to be different than your old "
-"connections."
+msgid "All subsequent connections will appear to be different than your old connections."
msgstr ""
msgctxt "MainWindow"
@@ -2002,21 +1867,15 @@ msgid "Password Reset Failed"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Vidalia tried to reset Tor's control password, but was not able to restart "
-"the Tor software. Please check your Task Manager to ensure there are no "
-"other Tor processes running."
+msgid "Vidalia tried to reset Tor's control password, but was not able to restart the Tor software. Please check your Task Manager to ensure there are no other Tor processes running."
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended."
+msgid "The currently installed version of Tor is out of date or no longer recommended."
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Would you like to check if a newer package is available for installation?"
+msgid "Would you like to check if a newer package is available for installation?"
msgstr ""
msgctxt "MainWindow"
@@ -2024,9 +1883,11 @@ msgid "Potentially Unsafe Connection"
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 ""
msgctxt "MainWindow"
@@ -2038,9 +1899,7 @@ msgid "Your software is up to date"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"There are no new Tor software packages available for your computer at this "
-"time."
+msgid "There are no new Tor software packages available for your computer at this time."
msgstr ""
msgctxt "MainWindow"
@@ -2056,52 +1915,52 @@ msgid "The following error occurred:"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Anything sent over this connection could be monitored. Please check your "
-"application's configuration and use only encrypted protocols, such as SSL, "
-"if possible."
-msgstr ""
-
-msgctxt "MainWindow"
msgid "failed (%1)"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
+msgid "Your relay is shutting down.\n"
"Click 'Stop' again to stop your relay now."
msgstr ""
msgctxt "MainWindow"
-msgid "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 ""
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 ""
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 ""
+
+msgctxt "MainWindow"
+msgid "File"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "About Vidalia"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Home"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Check For Updates"
msgstr ""
msgctxt "MessageLog"
@@ -2345,68 +2204,50 @@ 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"
+msgid "Always Save New Log Messages"
msgstr ""
msgctxt "MessageLog"
-msgid "Tor Status"
+msgid "Browse"
msgstr ""
msgctxt "MessageLog"
-msgid "Advanced"
+msgid "Enable automatically saving all new log messages to a file"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
+msgid "Automatically save new log messages to a file"
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 ""
msgctxt "MessageLog"
-msgid ""
-"Messages that only appear when \n"
+msgid "Messages that only appear when \n"
"something has gone wrong with Tor."
msgstr ""
msgctxt "MessageLog"
-msgid ""
-"Messages that appear infrequently \n"
+msgid "Messages that appear infrequently \n"
"during normal Tor operation and are \n"
"not considered errors, but you may \n"
"care about."
msgstr ""
msgctxt "MessageLog"
-msgid ""
-"Messages that appear frequently \n"
+msgid "Messages that appear frequently \n"
"during normal Tor operation."
msgstr ""
msgctxt "MessageLog"
-msgid ""
-"Hyper-verbose messages primarily of \n"
+msgid "Hyper-verbose messages primarily of \n"
"interest to Tor developers."
msgstr ""
msgctxt "MessageLog"
-msgid ""
-"Cannot write file %1\n"
+msgid "Cannot write file %1\n"
"\n"
"%2."
msgstr ""
@@ -2528,15 +2369,11 @@ msgid "Copy (Ctrl+C)"
msgstr ""
msgctxt "NetworkPage"
-msgid ""
-"You must specify both an IP address or hostname and a port number to "
-"configure Tor to use a proxy to access the Internet."
+msgid "You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet."
msgstr ""
msgctxt "NetworkPage"
-msgid ""
-"You must specify one or more ports to which your firewall allows you to "
-"connect."
+msgid "You must specify one or more ports to which your firewall allows you to connect."
msgstr ""
msgctxt "NetworkPage"
@@ -2556,10 +2393,18 @@ msgid "Proxy Settings"
msgstr ""
msgctxt "NetworkPage"
+msgid "HTTP Proxy:"
+msgstr ""
+
+msgctxt "NetworkPage"
msgid "Username:"
msgstr ""
msgctxt "NetworkPage"
+msgid "Use this proxy for HTTPS also"
+msgstr ""
+
+msgctxt "NetworkPage"
msgid "Password:"
msgstr ""
@@ -2588,9 +2433,7 @@ msgid "80, 443"
msgstr ""
msgctxt "NetworkPage"
-msgid ""
-"Check to encrypt directory requests and, optionally, use bridge relays to "
-"access the Tor network"
+msgid "Check to encrypt directory requests and, optionally, use bridge relays to access the Tor network"
msgstr ""
msgctxt "NetworkPage"
@@ -2602,10 +2445,18 @@ msgid "Bridge Settings"
msgstr ""
msgctxt "NetworkPage"
+msgid "The Tor software you are currently running does not support bridges. <br>Directory connections will still be encrypted."
+msgstr ""
+
+msgctxt "NetworkPage"
msgid "Add a Bridge:"
msgstr ""
msgctxt "NetworkPage"
+msgid "<a href=\"bridges.finding\">How do I find a bridge?</a>"
+msgstr ""
+
+msgctxt "NetworkPage"
msgid "Remove the selected bridges from the list"
msgstr ""
@@ -2626,43 +2477,13 @@ msgid "<a href=\"bridges.finding\">How can I find bridges?</a>"
msgstr ""
msgctxt "NetworkPage"
-msgid ""
-"No new bridges are currently available. You can either wait a while and try "
-"again, or try another method of finding new bridges."
+msgid "No new bridges are currently available. You can either wait a while and try again, or try another method of finding new bridges."
msgstr ""
msgctxt "NetworkPage"
msgid "Click Help to see other methods of finding new bridges."
msgstr ""
-msgctxt "NetworkPage"
-msgid "Address:"
-msgstr ""
-
-msgctxt "NetworkPage"
-msgid "Type:"
-msgstr ""
-
-msgctxt "NetworkPage"
-msgid "You must select the proxy type."
-msgstr ""
-
-msgctxt "NetworkPage"
-msgid "SOCKS 4"
-msgstr ""
-
-msgctxt "NetworkPage"
-msgid "SOCKS 5"
-msgstr ""
-
-msgctxt "NetworkPage"
-msgid "HTTP"
-msgstr ""
-
-msgctxt "NetworkPage"
-msgid "HTTP / HTTPS"
-msgstr ""
-
msgctxt "Policy"
msgid "accept"
msgstr ""
@@ -2816,15 +2637,11 @@ msgid "Bridge Support Unavailable"
msgstr ""
msgctxt "ServerPage"
-msgid ""
-"You have configured Tor to act as a bridge relay for censored users, but "
-"your version of Tor does not support bridges."
+msgid "You have configured Tor to act as a bridge relay for censored users, but your version of Tor does not support bridges."
msgstr ""
msgctxt "ServerPage"
-msgid ""
-"Please upgrade your Tor software or configure Tor to act as a normal Tor "
-"relay."
+msgid "Please upgrade your Tor software or configure Tor to act as a normal Tor relay."
msgstr ""
msgctxt "ServerPage"
@@ -2892,9 +2709,7 @@ msgid "Basic Settings"
msgstr ""
msgctxt "ServerPage"
-msgid ""
-"For Internet connections with fast download speed but slow upload, please "
-"list your upload speed here."
+msgid "For Internet connections with fast download speed but slow upload, please list your upload speed here."
msgstr ""
msgctxt "ServerPage"
@@ -2950,9 +2765,7 @@ msgid "Peak bandwidth rate limit"
msgstr ""
msgctxt "ServerPage"
-msgid ""
-"Your maximum bandwidth rate must be greater than or equal to your average "
-"bandwidth rate. Both values must be at least 20 KB/s."
+msgid "Your maximum bandwidth rate must be greater than or equal to your average bandwidth rate. Both values must be at least 20 KB/s."
msgstr ""
msgctxt "ServerPage"
@@ -3012,14 +2825,11 @@ msgid "Show help topic on exit policies"
msgstr ""
msgctxt "ServerPage"
-msgid ""
-"What Internet resources should users be able to access from your relay?"
+msgid "What Internet resources should users be able to access from your relay?"
msgstr ""
msgctxt "ServerPage"
-msgid ""
-"Tor will still block some outgoing mail and file sharing applications by "
-"default to reduce spam and other abuse."
+msgid "Tor will still block some outgoing mail and file sharing applications by default to reduce spam and other abuse."
msgstr ""
msgctxt "ServerPage"
@@ -3031,8 +2841,7 @@ msgid "Let others access your bridge by giving them this line:"
msgstr ""
msgctxt "ServerPage"
-msgid ""
-"This is the identity of your bridge relay that you can give to other people"
+msgid "This is the identity of your bridge relay that you can give to other people"
msgstr ""
msgctxt "ServerPage"
@@ -3048,9 +2857,7 @@ msgid "No clients have used your relay recently."
msgstr ""
msgctxt "ServerPage"
-msgid ""
-"Leave your relay running so clients have a better chance of finding and "
-"using it."
+msgid "Leave your relay running so clients have a better chance of finding and using it."
msgstr ""
msgctxt "ServerPage"
@@ -3062,9 +2869,7 @@ msgid "Vidalia was unable to retrieve your bridge's usage history."
msgstr ""
msgctxt "ServerPage"
-msgid ""
-"Tor returned an improperly formatted response when Vidalia requested your "
-"bridge's usage history."
+msgid "Tor returned an improperly formatted response when Vidalia requested your bridge's usage history."
msgstr ""
msgctxt "ServerPage"
@@ -3080,20 +2885,11 @@ msgid "<a href=\"#bridgeUsage\">Who has used my bridge?</a>"
msgstr ""
msgctxt "ServerPage"
-msgid "<a href=\"#bridgeHelp\">What's this?</a>"
-msgstr ""
-
-msgctxt "ServerPage"
-msgid "Automatically distribute my bridge address"
-msgstr ""
-
-msgctxt "ServerPage"
msgid "Mirror the Relay Directory"
msgstr ""
msgctxt "ServerPage"
-msgid ""
-"Email address at which you may be reached if there is a\n"
+msgid "Email address at which you may be reached if there is a\n"
"problem with your relay. You might also include your PGP or GPG fingerprint."
msgstr ""
@@ -3102,9 +2898,7 @@ msgid "Error while trying to unpublish all services"
msgstr ""
msgctxt "ServicePage"
-msgid ""
-"Please configure at least a service directory and a virtual port for each "
-"service you want to save. Remove the other ones."
+msgid "Please configure at least a service directory and a virtual port for each service you want to save. Remove the other ones."
msgstr ""
msgctxt "ServicePage"
@@ -3179,251 +2973,6 @@ msgctxt "ServicePage"
msgid "Created by Tor"
msgstr ""
-msgctxt "StatusEventWidget"
-msgid "Copy to Clipboard"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "The Tor Software is Running"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "You are currently running version \"%1\" of the Tor software."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "The Tor Software is not Running"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Click \"Start Tor\" in the Vidalia Control Panel to restart the Tor "
-"software. If Tor exited unexpectedly, select the \"Advanced\" tab above for "
-"details about any errors encountered."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"You are currently running version \"%1\" of the Tor software, which is no "
-"longer recommended. Please upgrade to the most recent version of the "
-"software, which may contain important security, reliability and performance "
-"fixes."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"You are currently running version \"%1\" of the Tor software, which may no "
-"longer work with the current Tor network. Please upgrade to the most recent "
-"version of the software, which may contain important security, reliability "
-"and performance fixes."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Your Tor Software is Out-of-date"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Connected to the Tor Network"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"We were able to successfully establish a connection to the Tor network. You "
-"can now configure your applications to use the Internet anonymously."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Tor Software Error"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"The Tor software encountered an internal bug. Please report the following "
-"error message to the Tor developers at bugs.torproject.org: \"%1\""
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Tor has determined that your computer's clock may be set to %1 seconds in "
-"the past compared to the source \"%2\". If your clock is not correct, Tor "
-"will not be able to function. Please verify your computer displays the "
-"correct time."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Tor has determined that your computer's clock may be set to %1 seconds in "
-"the future compared to the source \"%2\". If your clock is not correct, Tor "
-"will not be able to function. Please verify your computer displays the "
-"correct time."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Your Computer's Clock is Potentially Incorrect"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"One of the applications on your computer may have attempted to make an "
-"unencrypted connection through Tor to port %1. Sending unencrypted "
-"information over the Tor network is dangerous and not recommended. For your "
-"protection, Tor has automatically closed this connection."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"One of the applications on your computer may have attempted to make an "
-"unencrypted connection through Tor to port %1. Sending unencrypted "
-"information over the Tor network is dangerous and not recommended."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Potentially Dangerous Connection!"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"One of your applications established a connection through Tor to \"%1\" "
-"using a protocol that may leak information about your destination. Please "
-"ensure you configure your applications to use only SOCKS4a or SOCKS5 with "
-"remote hostname resolution."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Unknown SOCKS Protocol"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"One of your applications tried to establish a connection through Tor using a"
-" protocol that Tor does not understand. Please ensure you configure your "
-"applications to use only SOCKS4a or SOCKS5 with remote hostname resolution."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Invalid Destination Hostname"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"One of your applications tried to establish a connection through Tor to "
-"\"%1\", which Tor does not recognize as a valid hostname. Please check your "
-"application's configuration."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "External IP Address Changed"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Tor has determined your relay's public IP address is currently %1%2. If that"
-" is not correct, please consider setting the 'Address' option in your "
-"relay's configuration."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "DNS Hijacking Detected"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Tor detected that your DNS provider is providing false responses for domains"
-" that do not exist. Some ISPs and other DNS providers, such as OpenDNS, are "
-"known to do this in order to display their own search or advertising pages."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Tor detected that your DNS provider is providing false responses for well "
-"known domains. Since clients rely on Tor network relays to provide accurate "
-"DNS repsonses, your relay will not be configured as an exit relay."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Checking Server Port Reachability"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Tor is trying to determine if your relay's server port is reachable from the"
-" Tor network by connecting to itself at %1:%2. This test could take several "
-"minutes."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Server Port Reachability Test Successful!"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Your relay's server port is reachable from the Tor network!"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Server Port Reachability Test Failed"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Your relay's server port is not reachable by other Tor clients. This can "
-"happen if you are behind a router or firewall that requires you to set up "
-"port forwarding. If %1:%2 is not your correct IP address and server port, "
-"please check your relay's configuration."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Checking Directory Port Reachability"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Tor is trying to determine if your relay's directory port is reachable from "
-"the Tor network by connecting to itself at %1:%2. This test could take "
-"several minutes."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Directory Port Reachability Test Successful!"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Your relay's directory port is reachable from the Tor network!"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Directory Port Reachability Test Failed"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Your relay's directory port is not reachable by other Tor clients. This can "
-"happen if you are behind a router or firewall that requires you to set up "
-"port forwarding. If %1:%2 is not your correct IP address and directory port,"
-" please check your relay's configuration."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Relay Descriptor Rejected"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Your relay's descriptor, which enables clients to connect to your relay, was"
-" rejected by the directory server at %1:%2. The reason given was: %3"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Your Relay is Online"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Your relay is now online and available for Tor clients to use. You should "
-"see an increase in network traffic shown by the Bandwidth Graph within a few"
-" hours as more clients learn about your relay. Thank you for contributing to"
-" the Tor network!"
-msgstr ""
-
msgctxt "Stream"
msgid "New"
msgstr ""
@@ -3476,68 +3025,6 @@ msgctxt "TorSettings"
msgid "Failed to hash the control password."
msgstr ""
-msgctxt "TorrcDialog"
-msgid "Editing torrc"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid ""
-"Save settings. If unchecked it will only apply settings to the current Tor "
-"instance."
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Cut"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Copy"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Paste"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Undo"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Redo"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Select All"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Apply all"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Apply selection only"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Error connecting to Tor"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Selection is empty. Please select some text, or check \"Apply all\""
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Error at line %1: \"%2\""
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Error"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "An error ocurred while opening torrc file"
-msgstr ""
-
msgctxt "UPNPControl"
msgid "Success"
msgstr ""
@@ -3595,15 +3082,11 @@ msgid "Testing Universal Plug & Play Support"
msgstr ""
msgctxt "UpdateProcess"
-msgid ""
-"Vidalia was unable to check for available software updates because it could "
-"not find '%1'."
+msgid "Vidalia was unable to check for available software updates because it could not find '%1'."
msgstr ""
msgctxt "UpdateProcess"
-msgid ""
-"Vidalia was unable to check for available software updates because Tor's "
-"update process exited unexpectedly."
+msgid "Vidalia was unable to check for available software updates because Tor's update process exited unexpectedly."
msgstr ""
msgctxt "UpdateProgressDialog"
@@ -3759,10 +3242,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 ""
@@ -3775,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 ""
@@ -3812,5 +3290,3 @@ msgstr ""
msgctxt "stringutil.h"
msgid "%1 mins"
msgstr ""
-
-
diff --git a/src/vidalia/i18n/po/ky/qt_ky.po b/src/vidalia/i18n/po/ky/qt_ky.po
index f546fee..63743eb 100644
--- a/src/vidalia/i18n/po/ky/qt_ky.po
+++ b/src/vidalia/i18n/po/ky/qt_ky.po
@@ -1,11 +1,10 @@
#
-# Translators:
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-08-20 03:25+0000\n"
-"PO-Revision-Date: 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"
@@ -431,5 +430,3 @@ msgstr ""
msgctxt "QFileSystemModel"
msgid "%1 bytes"
msgstr ""
-
-
diff --git a/src/vidalia/i18n/po/ky/vidalia_ky.po b/src/vidalia/i18n/po/ky/vidalia_ky.po
index bb0163b..22b0f4e 100644
--- a/src/vidalia/i18n/po/ky/vidalia_ky.po
+++ b/src/vidalia/i18n/po/ky/vidalia_ky.po
@@ -1,18 +1,15 @@
-#
-# Translators:
+#, fuzzy
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: 2010-12-05 20:03+0000\n"
-"Last-Translator: \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: 2009-05-19 23:56+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
+"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: ky\n"
-"Plural-Forms: nplurals=1; plural=0\n"
"X-Generator: Vidalia ts2po 0.2\n"
msgctxt "AboutDialog"
@@ -35,13 +32,28 @@ msgctxt "AboutDialog"
msgid "Qt 4.4.2"
msgstr ""
+msgctxt "AboutDialog"
+msgid "Vidalia"
+msgstr ""
+
+msgctxt "AboutDialog"
+msgid "Tor"
+msgstr ""
+
+msgctxt "AboutDialog"
+msgid "Qt"
+msgstr ""
+
+msgctxt "AboutDialog"
+msgid "version"
+msgstr ""
+
msgctxt "AdvancedPage"
msgid "'%1' is not a valid IP address."
msgstr ""
msgctxt "AdvancedPage"
-msgid ""
-"You selected 'Password' authentication, but did not specify a password."
+msgid "You selected 'Password' authentication, but did not specify a password."
msgstr ""
msgctxt "AdvancedPage"
@@ -81,6 +93,10 @@ msgid "Vidalia was unable to install the Tor service."
msgstr ""
msgctxt "AdvancedPage"
+msgid "Control Port"
+msgstr ""
+
+msgctxt "AdvancedPage"
msgid "Authentication:"
msgstr ""
@@ -137,68 +153,7 @@ msgid "Select the directory used to store data for the Tor software"
msgstr ""
msgctxt "AdvancedPage"
-msgid "Tor Control"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "Use TCP connection (ControlPort)"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "Path:"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "Use Unix domain socket (ControlSocket)"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "Edit current torrc"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "NOTE: this will edit the currently loaded torrc"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "ControlSocket path doesn't exist."
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid ""
-"The specified Tor configuration file location contains characters that "
-"cannot be represented in your system's current 8-bit character encoding."
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid ""
-"The specified Tor data directory location contains characters that cannot be"
-" represented in your system's current 8-bit character encoding."
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "Warning"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "You changed torrc path, would you like to restart Tor?"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "Tor Configuration File (torrc);;All Files (*)"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "Select a file to use for Tor socket path"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "Configure ControlPort automatically"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid ""
-"Vidalia was unable to remove the Tor service.\n"
+msgid "Vidalia was unable to remove the Tor service.\n"
"\n"
"You may need to remove it manually."
msgstr ""
@@ -440,9 +395,7 @@ msgid "Remember my password"
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid ""
-"Vidalia has connected to a running Tor process that requires a password. "
-"Please enter your control password:"
+msgid "Vidalia has connected to a running Tor process that requires a password. Please enter your control password:"
msgstr ""
msgctxt "ControlSocket"
@@ -1158,10 +1111,6 @@ msgid "Zimbabwe"
msgstr ""
msgctxt "CountryInfo"
-msgid "Zaire"
-msgstr ""
-
-msgctxt "CountryInfo"
msgid "Albania"
msgstr ""
@@ -1257,55 +1206,6 @@ msgctxt "CountryInfo"
msgid "Taiwan"
msgstr ""
-msgctxt "CrashReportDialog"
-msgid "Submit a Crash Report"
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid "Vidalia encountered an error and needed to close"
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid "Restart Vidalia"
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid "Don't Restart"
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid "Unable to restart Vidalia"
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid ""
-"We were unable to automatically restart Vidalia. Please restart Vidalia "
-"manually."
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid "Please fill a ticket in:"
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid ""
-"<a "
-"href=\"https://trac.torproject.org/projects/tor/newticket\">https://trac.torproject.org/projects/tor/newticket</a>"
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid ""
-"A crash report has been created that you can send to the Vidalia developers "
-"to help identify and fix the problem. The submitted report does not contain "
-"any personally identifying information."
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid ""
-"with a description of what you were doing before the application crashed, "
-"along with the following files corresponding to the crash report:"
-msgstr ""
-
msgctxt "GeneralPage"
msgid "Executables (*.exe)"
msgstr ""
@@ -1323,6 +1223,10 @@ msgid "You must specify the name of your Tor executable."
msgstr ""
msgctxt "GeneralPage"
+msgid "The proxy arguments specified are not properly formatted."
+msgstr ""
+
+msgctxt "GeneralPage"
msgid "Start Vidalia when my system starts"
msgstr ""
@@ -1519,10 +1423,7 @@ msgid "Opening External Link"
msgstr ""
msgctxt "HelpTextBrowser"
-msgid ""
-"Vidalia can open the link you selected in your default Web browser. If your "
-"browser is not currently configured to use Tor then the request will not be "
-"anonymous."
+msgid "Vidalia can open the link you selected in your default Web browser. If your browser is not currently configured to use Tor then the request will not be anonymous."
msgstr ""
msgctxt "HelpTextBrowser"
@@ -1534,9 +1435,7 @@ msgid "Unable to Open Link"
msgstr ""
msgctxt "HelpTextBrowser"
-msgid ""
-"Vidalia was unable to open the selected link in your Web browser. You can "
-"still copy the URL and paste it into your browser."
+msgid "Vidalia was unable to open the selected link in your Web browser. You can still copy the URL and paste it into your browser."
msgstr ""
msgctxt "HelpTextBrowser"
@@ -1579,30 +1478,6 @@ msgctxt "LogEvent"
msgid "Unknown"
msgstr ""
-msgctxt "LogTreeItem"
-msgid "Debug"
-msgstr ""
-
-msgctxt "LogTreeItem"
-msgid "Info"
-msgstr ""
-
-msgctxt "LogTreeItem"
-msgid "Notice"
-msgstr ""
-
-msgctxt "LogTreeItem"
-msgid "Warning"
-msgstr ""
-
-msgctxt "LogTreeItem"
-msgid "Error"
-msgstr ""
-
-msgctxt "LogTreeItem"
-msgid "Unknown"
-msgstr ""
-
msgctxt "MainWindow"
msgid "Start Tor"
msgstr ""
@@ -1816,9 +1691,7 @@ msgid "Error Starting Tor"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Vidalia was unable to start Tor. Check your settings to ensure the correct "
-"name and location of your Tor executable is specified."
+msgid "Vidalia was unable to start Tor. Check your settings to ensure the correct name and location of your Tor executable is specified."
msgstr ""
msgctxt "MainWindow"
@@ -1854,9 +1727,7 @@ msgid "Cookie Authentication Required"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"The Tor software requires Vidalia to send the contents of an authentication "
-"cookie, but Vidalia was unable to find one."
+msgid "The Tor software requires Vidalia to send the contents of an authentication cookie, but Vidalia was unable to find one."
msgstr ""
msgctxt "MainWindow"
@@ -1876,9 +1747,7 @@ msgid "Error Registering for Events"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Vidalia was unable to register for some events. Many of Vidalia's features "
-"may be unavailable."
+msgid "Vidalia was unable to register for some events. Many of Vidalia's features may be unavailable."
msgstr ""
msgctxt "MainWindow"
@@ -1898,9 +1767,7 @@ msgid "Tor Update Available"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended. Please visit the Tor website to download the latest version."
+msgid "The currently installed version of Tor is out of date or no longer recommended. Please visit the Tor website to download the latest version."
msgstr ""
msgctxt "MainWindow"
@@ -1908,9 +1775,7 @@ msgid "Tor website: %1"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"All subsequent connections will appear to be different than your old "
-"connections."
+msgid "All subsequent connections will appear to be different than your old connections."
msgstr ""
msgctxt "MainWindow"
@@ -2002,21 +1867,15 @@ msgid "Password Reset Failed"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Vidalia tried to reset Tor's control password, but was not able to restart "
-"the Tor software. Please check your Task Manager to ensure there are no "
-"other Tor processes running."
+msgid "Vidalia tried to reset Tor's control password, but was not able to restart the Tor software. Please check your Task Manager to ensure there are no other Tor processes running."
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended."
+msgid "The currently installed version of Tor is out of date or no longer recommended."
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Would you like to check if a newer package is available for installation?"
+msgid "Would you like to check if a newer package is available for installation?"
msgstr ""
msgctxt "MainWindow"
@@ -2024,9 +1883,11 @@ msgid "Potentially Unsafe Connection"
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 ""
msgctxt "MainWindow"
@@ -2038,9 +1899,7 @@ msgid "Your software is up to date"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"There are no new Tor software packages available for your computer at this "
-"time."
+msgid "There are no new Tor software packages available for your computer at this time."
msgstr ""
msgctxt "MainWindow"
@@ -2056,52 +1915,52 @@ msgid "The following error occurred:"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Anything sent over this connection could be monitored. Please check your "
-"application's configuration and use only encrypted protocols, such as SSL, "
-"if possible."
-msgstr ""
-
-msgctxt "MainWindow"
msgid "failed (%1)"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
+msgid "Your relay is shutting down.\n"
"Click 'Stop' again to stop your relay now."
msgstr ""
msgctxt "MainWindow"
-msgid "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 ""
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 ""
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 ""
+
+msgctxt "MainWindow"
+msgid "File"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "About Vidalia"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Home"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Check For Updates"
msgstr ""
msgctxt "MessageLog"
@@ -2345,68 +2204,50 @@ 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"
+msgid "Always Save New Log Messages"
msgstr ""
msgctxt "MessageLog"
-msgid "Tor Status"
+msgid "Browse"
msgstr ""
msgctxt "MessageLog"
-msgid "Advanced"
+msgid "Enable automatically saving all new log messages to a file"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
+msgid "Automatically save new log messages to a file"
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 ""
msgctxt "MessageLog"
-msgid ""
-"Messages that only appear when \n"
+msgid "Messages that only appear when \n"
"something has gone wrong with Tor."
msgstr ""
msgctxt "MessageLog"
-msgid ""
-"Messages that appear infrequently \n"
+msgid "Messages that appear infrequently \n"
"during normal Tor operation and are \n"
"not considered errors, but you may \n"
"care about."
msgstr ""
msgctxt "MessageLog"
-msgid ""
-"Messages that appear frequently \n"
+msgid "Messages that appear frequently \n"
"during normal Tor operation."
msgstr ""
msgctxt "MessageLog"
-msgid ""
-"Hyper-verbose messages primarily of \n"
+msgid "Hyper-verbose messages primarily of \n"
"interest to Tor developers."
msgstr ""
msgctxt "MessageLog"
-msgid ""
-"Cannot write file %1\n"
+msgid "Cannot write file %1\n"
"\n"
"%2."
msgstr ""
@@ -2528,15 +2369,11 @@ msgid "Copy (Ctrl+C)"
msgstr ""
msgctxt "NetworkPage"
-msgid ""
-"You must specify both an IP address or hostname and a port number to "
-"configure Tor to use a proxy to access the Internet."
+msgid "You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet."
msgstr ""
msgctxt "NetworkPage"
-msgid ""
-"You must specify one or more ports to which your firewall allows you to "
-"connect."
+msgid "You must specify one or more ports to which your firewall allows you to connect."
msgstr ""
msgctxt "NetworkPage"
@@ -2556,10 +2393,18 @@ msgid "Proxy Settings"
msgstr ""
msgctxt "NetworkPage"
+msgid "HTTP Proxy:"
+msgstr ""
+
+msgctxt "NetworkPage"
msgid "Username:"
msgstr ""
msgctxt "NetworkPage"
+msgid "Use this proxy for HTTPS also"
+msgstr ""
+
+msgctxt "NetworkPage"
msgid "Password:"
msgstr ""
@@ -2588,9 +2433,7 @@ msgid "80, 443"
msgstr ""
msgctxt "NetworkPage"
-msgid ""
-"Check to encrypt directory requests and, optionally, use bridge relays to "
-"access the Tor network"
+msgid "Check to encrypt directory requests and, optionally, use bridge relays to access the Tor network"
msgstr ""
msgctxt "NetworkPage"
@@ -2602,10 +2445,18 @@ msgid "Bridge Settings"
msgstr ""
msgctxt "NetworkPage"
+msgid "The Tor software you are currently running does not support bridges. <br>Directory connections will still be encrypted."
+msgstr ""
+
+msgctxt "NetworkPage"
msgid "Add a Bridge:"
msgstr ""
msgctxt "NetworkPage"
+msgid "<a href=\"bridges.finding\">How do I find a bridge?</a>"
+msgstr ""
+
+msgctxt "NetworkPage"
msgid "Remove the selected bridges from the list"
msgstr ""
@@ -2626,43 +2477,13 @@ msgid "<a href=\"bridges.finding\">How can I find bridges?</a>"
msgstr ""
msgctxt "NetworkPage"
-msgid ""
-"No new bridges are currently available. You can either wait a while and try "
-"again, or try another method of finding new bridges."
+msgid "No new bridges are currently available. You can either wait a while and try again, or try another method of finding new bridges."
msgstr ""
msgctxt "NetworkPage"
msgid "Click Help to see other methods of finding new bridges."
msgstr ""
-msgctxt "NetworkPage"
-msgid "Address:"
-msgstr ""
-
-msgctxt "NetworkPage"
-msgid "Type:"
-msgstr ""
-
-msgctxt "NetworkPage"
-msgid "You must select the proxy type."
-msgstr ""
-
-msgctxt "NetworkPage"
-msgid "SOCKS 4"
-msgstr ""
-
-msgctxt "NetworkPage"
-msgid "SOCKS 5"
-msgstr ""
-
-msgctxt "NetworkPage"
-msgid "HTTP"
-msgstr ""
-
-msgctxt "NetworkPage"
-msgid "HTTP / HTTPS"
-msgstr ""
-
msgctxt "Policy"
msgid "accept"
msgstr ""
@@ -2816,15 +2637,11 @@ msgid "Bridge Support Unavailable"
msgstr ""
msgctxt "ServerPage"
-msgid ""
-"You have configured Tor to act as a bridge relay for censored users, but "
-"your version of Tor does not support bridges."
+msgid "You have configured Tor to act as a bridge relay for censored users, but your version of Tor does not support bridges."
msgstr ""
msgctxt "ServerPage"
-msgid ""
-"Please upgrade your Tor software or configure Tor to act as a normal Tor "
-"relay."
+msgid "Please upgrade your Tor software or configure Tor to act as a normal Tor relay."
msgstr ""
msgctxt "ServerPage"
@@ -2892,9 +2709,7 @@ msgid "Basic Settings"
msgstr ""
msgctxt "ServerPage"
-msgid ""
-"For Internet connections with fast download speed but slow upload, please "
-"list your upload speed here."
+msgid "For Internet connections with fast download speed but slow upload, please list your upload speed here."
msgstr ""
msgctxt "ServerPage"
@@ -2950,9 +2765,7 @@ msgid "Peak bandwidth rate limit"
msgstr ""
msgctxt "ServerPage"
-msgid ""
-"Your maximum bandwidth rate must be greater than or equal to your average "
-"bandwidth rate. Both values must be at least 20 KB/s."
+msgid "Your maximum bandwidth rate must be greater than or equal to your average bandwidth rate. Both values must be at least 20 KB/s."
msgstr ""
msgctxt "ServerPage"
@@ -3012,14 +2825,11 @@ msgid "Show help topic on exit policies"
msgstr ""
msgctxt "ServerPage"
-msgid ""
-"What Internet resources should users be able to access from your relay?"
+msgid "What Internet resources should users be able to access from your relay?"
msgstr ""
msgctxt "ServerPage"
-msgid ""
-"Tor will still block some outgoing mail and file sharing applications by "
-"default to reduce spam and other abuse."
+msgid "Tor will still block some outgoing mail and file sharing applications by default to reduce spam and other abuse."
msgstr ""
msgctxt "ServerPage"
@@ -3031,8 +2841,7 @@ msgid "Let others access your bridge by giving them this line:"
msgstr ""
msgctxt "ServerPage"
-msgid ""
-"This is the identity of your bridge relay that you can give to other people"
+msgid "This is the identity of your bridge relay that you can give to other people"
msgstr ""
msgctxt "ServerPage"
@@ -3048,9 +2857,7 @@ msgid "No clients have used your relay recently."
msgstr ""
msgctxt "ServerPage"
-msgid ""
-"Leave your relay running so clients have a better chance of finding and "
-"using it."
+msgid "Leave your relay running so clients have a better chance of finding and using it."
msgstr ""
msgctxt "ServerPage"
@@ -3062,9 +2869,7 @@ msgid "Vidalia was unable to retrieve your bridge's usage history."
msgstr ""
msgctxt "ServerPage"
-msgid ""
-"Tor returned an improperly formatted response when Vidalia requested your "
-"bridge's usage history."
+msgid "Tor returned an improperly formatted response when Vidalia requested your bridge's usage history."
msgstr ""
msgctxt "ServerPage"
@@ -3080,20 +2885,11 @@ msgid "<a href=\"#bridgeUsage\">Who has used my bridge?</a>"
msgstr ""
msgctxt "ServerPage"
-msgid "<a href=\"#bridgeHelp\">What's this?</a>"
-msgstr ""
-
-msgctxt "ServerPage"
-msgid "Automatically distribute my bridge address"
-msgstr ""
-
-msgctxt "ServerPage"
msgid "Mirror the Relay Directory"
msgstr ""
msgctxt "ServerPage"
-msgid ""
-"Email address at which you may be reached if there is a\n"
+msgid "Email address at which you may be reached if there is a\n"
"problem with your relay. You might also include your PGP or GPG fingerprint."
msgstr ""
@@ -3102,9 +2898,7 @@ msgid "Error while trying to unpublish all services"
msgstr ""
msgctxt "ServicePage"
-msgid ""
-"Please configure at least a service directory and a virtual port for each "
-"service you want to save. Remove the other ones."
+msgid "Please configure at least a service directory and a virtual port for each service you want to save. Remove the other ones."
msgstr ""
msgctxt "ServicePage"
@@ -3179,251 +2973,6 @@ msgctxt "ServicePage"
msgid "Created by Tor"
msgstr ""
-msgctxt "StatusEventWidget"
-msgid "Copy to Clipboard"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "The Tor Software is Running"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "You are currently running version \"%1\" of the Tor software."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "The Tor Software is not Running"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Click \"Start Tor\" in the Vidalia Control Panel to restart the Tor "
-"software. If Tor exited unexpectedly, select the \"Advanced\" tab above for "
-"details about any errors encountered."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"You are currently running version \"%1\" of the Tor software, which is no "
-"longer recommended. Please upgrade to the most recent version of the "
-"software, which may contain important security, reliability and performance "
-"fixes."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"You are currently running version \"%1\" of the Tor software, which may no "
-"longer work with the current Tor network. Please upgrade to the most recent "
-"version of the software, which may contain important security, reliability "
-"and performance fixes."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Your Tor Software is Out-of-date"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Connected to the Tor Network"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"We were able to successfully establish a connection to the Tor network. You "
-"can now configure your applications to use the Internet anonymously."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Tor Software Error"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"The Tor software encountered an internal bug. Please report the following "
-"error message to the Tor developers at bugs.torproject.org: \"%1\""
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Tor has determined that your computer's clock may be set to %1 seconds in "
-"the past compared to the source \"%2\". If your clock is not correct, Tor "
-"will not be able to function. Please verify your computer displays the "
-"correct time."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Tor has determined that your computer's clock may be set to %1 seconds in "
-"the future compared to the source \"%2\". If your clock is not correct, Tor "
-"will not be able to function. Please verify your computer displays the "
-"correct time."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Your Computer's Clock is Potentially Incorrect"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"One of the applications on your computer may have attempted to make an "
-"unencrypted connection through Tor to port %1. Sending unencrypted "
-"information over the Tor network is dangerous and not recommended. For your "
-"protection, Tor has automatically closed this connection."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"One of the applications on your computer may have attempted to make an "
-"unencrypted connection through Tor to port %1. Sending unencrypted "
-"information over the Tor network is dangerous and not recommended."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Potentially Dangerous Connection!"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"One of your applications established a connection through Tor to \"%1\" "
-"using a protocol that may leak information about your destination. Please "
-"ensure you configure your applications to use only SOCKS4a or SOCKS5 with "
-"remote hostname resolution."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Unknown SOCKS Protocol"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"One of your applications tried to establish a connection through Tor using a"
-" protocol that Tor does not understand. Please ensure you configure your "
-"applications to use only SOCKS4a or SOCKS5 with remote hostname resolution."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Invalid Destination Hostname"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"One of your applications tried to establish a connection through Tor to "
-"\"%1\", which Tor does not recognize as a valid hostname. Please check your "
-"application's configuration."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "External IP Address Changed"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Tor has determined your relay's public IP address is currently %1%2. If that"
-" is not correct, please consider setting the 'Address' option in your "
-"relay's configuration."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "DNS Hijacking Detected"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Tor detected that your DNS provider is providing false responses for domains"
-" that do not exist. Some ISPs and other DNS providers, such as OpenDNS, are "
-"known to do this in order to display their own search or advertising pages."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Tor detected that your DNS provider is providing false responses for well "
-"known domains. Since clients rely on Tor network relays to provide accurate "
-"DNS repsonses, your relay will not be configured as an exit relay."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Checking Server Port Reachability"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Tor is trying to determine if your relay's server port is reachable from the"
-" Tor network by connecting to itself at %1:%2. This test could take several "
-"minutes."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Server Port Reachability Test Successful!"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Your relay's server port is reachable from the Tor network!"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Server Port Reachability Test Failed"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Your relay's server port is not reachable by other Tor clients. This can "
-"happen if you are behind a router or firewall that requires you to set up "
-"port forwarding. If %1:%2 is not your correct IP address and server port, "
-"please check your relay's configuration."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Checking Directory Port Reachability"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Tor is trying to determine if your relay's directory port is reachable from "
-"the Tor network by connecting to itself at %1:%2. This test could take "
-"several minutes."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Directory Port Reachability Test Successful!"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Your relay's directory port is reachable from the Tor network!"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Directory Port Reachability Test Failed"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Your relay's directory port is not reachable by other Tor clients. This can "
-"happen if you are behind a router or firewall that requires you to set up "
-"port forwarding. If %1:%2 is not your correct IP address and directory port,"
-" please check your relay's configuration."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Relay Descriptor Rejected"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Your relay's descriptor, which enables clients to connect to your relay, was"
-" rejected by the directory server at %1:%2. The reason given was: %3"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Your Relay is Online"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Your relay is now online and available for Tor clients to use. You should "
-"see an increase in network traffic shown by the Bandwidth Graph within a few"
-" hours as more clients learn about your relay. Thank you for contributing to"
-" the Tor network!"
-msgstr ""
-
msgctxt "Stream"
msgid "New"
msgstr ""
@@ -3476,68 +3025,6 @@ msgctxt "TorSettings"
msgid "Failed to hash the control password."
msgstr ""
-msgctxt "TorrcDialog"
-msgid "Editing torrc"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid ""
-"Save settings. If unchecked it will only apply settings to the current Tor "
-"instance."
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Cut"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Copy"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Paste"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Undo"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Redo"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Select All"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Apply all"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Apply selection only"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Error connecting to Tor"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Selection is empty. Please select some text, or check \"Apply all\""
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Error at line %1: \"%2\""
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Error"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "An error ocurred while opening torrc file"
-msgstr ""
-
msgctxt "UPNPControl"
msgid "Success"
msgstr ""
@@ -3595,15 +3082,11 @@ msgid "Testing Universal Plug & Play Support"
msgstr ""
msgctxt "UpdateProcess"
-msgid ""
-"Vidalia was unable to check for available software updates because it could "
-"not find '%1'."
+msgid "Vidalia was unable to check for available software updates because it could not find '%1'."
msgstr ""
msgctxt "UpdateProcess"
-msgid ""
-"Vidalia was unable to check for available software updates because Tor's "
-"update process exited unexpectedly."
+msgid "Vidalia was unable to check for available software updates because Tor's update process exited unexpectedly."
msgstr ""
msgctxt "UpdateProgressDialog"
@@ -3759,10 +3242,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 ""
@@ -3775,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 ""
@@ -3812,5 +3290,3 @@ msgstr ""
msgctxt "stringutil.h"
msgid "%1 mins"
msgstr ""
-
-
diff --git a/src/vidalia/i18n/po/lb/qt_lb.po b/src/vidalia/i18n/po/lb/qt_lb.po
index d12b5a3..93cf944 100644
--- a/src/vidalia/i18n/po/lb/qt_lb.po
+++ b/src/vidalia/i18n/po/lb/qt_lb.po
@@ -1,11 +1,10 @@
#
-# Translators:
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-08-20 03:25+0000\n"
-"PO-Revision-Date: 2010-12-05 19:59+0000\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"
@@ -431,5 +430,3 @@ msgstr ""
msgctxt "QFileSystemModel"
msgid "%1 bytes"
msgstr ""
-
-
diff --git a/src/vidalia/i18n/po/lb/vidalia_lb.po b/src/vidalia/i18n/po/lb/vidalia_lb.po
index b5591d0..aaf69a2 100644
--- a/src/vidalia/i18n/po/lb/vidalia_lb.po
+++ b/src/vidalia/i18n/po/lb/vidalia_lb.po
@@ -1,11 +1,10 @@
#
-# Translators:
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-09-07 14:40+0000\n"
-"PO-Revision-Date: 2010-12-05 20:03+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"
@@ -193,10 +192,6 @@ 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"
@@ -236,10 +231,6 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr ""
-
-msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -279,6 +270,10 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr ""
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -432,17 +427,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"
@@ -1266,44 +1270,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"
@@ -1331,10 +1342,6 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr ""
-
-msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1362,6 +1369,10 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr ""
+
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1644,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 ""
@@ -1680,10 +1663,6 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1796,10 +1775,6 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1882,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 ""
@@ -1934,82 +1897,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 ""
@@ -2057,19 +1949,39 @@ 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)"
+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"
@@ -2091,17 +2003,35 @@ msgid ""
msgstr ""
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"
@@ -2357,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"
@@ -2412,10 +2334,6 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2515,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 ""
@@ -2840,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 ""
@@ -3088,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 ""
@@ -3132,10 +3070,6 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
-msgid "Form"
-msgstr ""
-
-msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3424,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 ""
@@ -3460,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 ""
@@ -3538,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 ""
@@ -3666,6 +3646,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 ""
@@ -3759,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 ""
@@ -3812,5 +3796,3 @@ msgstr ""
msgctxt "stringutil.h"
msgid "%1 mins"
msgstr ""
-
-
diff --git a/src/vidalia/i18n/po/ln/qt_ln.po b/src/vidalia/i18n/po/ln/qt_ln.po
index 9b3d5d5..78550cf 100644
--- a/src/vidalia/i18n/po/ln/qt_ln.po
+++ b/src/vidalia/i18n/po/ln/qt_ln.po
@@ -1,11 +1,10 @@
#
-# Translators:
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-08-20 03:25+0000\n"
-"PO-Revision-Date: 2010-12-05 19:59+0000\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"
@@ -431,5 +430,3 @@ msgstr ""
msgctxt "QFileSystemModel"
msgid "%1 bytes"
msgstr ""
-
-
diff --git a/src/vidalia/i18n/po/ln/vidalia_ln.po b/src/vidalia/i18n/po/ln/vidalia_ln.po
index 2681894..ebca324 100644
--- a/src/vidalia/i18n/po/ln/vidalia_ln.po
+++ b/src/vidalia/i18n/po/ln/vidalia_ln.po
@@ -1,11 +1,10 @@
#
-# Translators:
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-09-07 14:40+0000\n"
-"PO-Revision-Date: 2010-12-05 20:03+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"
@@ -193,10 +192,6 @@ 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"
@@ -236,10 +231,6 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr ""
-
-msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -279,6 +270,10 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr ""
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -432,17 +427,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"
@@ -1266,44 +1270,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"
@@ -1331,10 +1342,6 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr ""
-
-msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1362,6 +1369,10 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr ""
+
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1644,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 ""
@@ -1680,10 +1663,6 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1796,10 +1775,6 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1882,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 ""
@@ -1934,82 +1897,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 ""
@@ -2057,19 +1949,39 @@ 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)"
+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"
@@ -2091,17 +2003,35 @@ msgid ""
msgstr ""
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"
@@ -2357,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"
@@ -2412,10 +2334,6 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2515,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 ""
@@ -2840,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 ""
@@ -3088,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 ""
@@ -3132,10 +3070,6 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
-msgid "Form"
-msgstr ""
-
-msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3424,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 ""
@@ -3460,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 ""
@@ -3538,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 ""
@@ -3666,6 +3646,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 ""
@@ -3759,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 ""
@@ -3812,5 +3796,3 @@ msgstr ""
msgctxt "stringutil.h"
msgid "%1 mins"
msgstr ""
-
-
diff --git a/src/vidalia/i18n/po/lo/qt_lo.po b/src/vidalia/i18n/po/lo/qt_lo.po
index f39179f..e58abb9 100644
--- a/src/vidalia/i18n/po/lo/qt_lo.po
+++ b/src/vidalia/i18n/po/lo/qt_lo.po
@@ -1,11 +1,10 @@
#
-# Translators:
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-08-20 03:25+0000\n"
-"PO-Revision-Date: 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"
@@ -431,5 +430,3 @@ msgstr ""
msgctxt "QFileSystemModel"
msgid "%1 bytes"
msgstr ""
-
-
diff --git a/src/vidalia/i18n/po/lo/vidalia_lo.po b/src/vidalia/i18n/po/lo/vidalia_lo.po
index d294b4c..665ad26 100644
--- a/src/vidalia/i18n/po/lo/vidalia_lo.po
+++ b/src/vidalia/i18n/po/lo/vidalia_lo.po
@@ -1,11 +1,10 @@
#
-# Translators:
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-09-07 14:40+0000\n"
-"PO-Revision-Date: 2010-12-05 20:03+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"
@@ -193,10 +192,6 @@ 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"
@@ -236,10 +231,6 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr ""
-
-msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -279,6 +270,10 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr ""
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -432,17 +427,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"
@@ -1266,44 +1270,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"
@@ -1331,10 +1342,6 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr ""
-
-msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1362,6 +1369,10 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr ""
+
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1644,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 ""
@@ -1680,10 +1663,6 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1796,10 +1775,6 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1882,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 ""
@@ -1934,82 +1897,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 ""
@@ -2057,19 +1949,39 @@ 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)"
+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"
@@ -2091,17 +2003,35 @@ msgid ""
msgstr ""
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"
@@ -2357,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"
@@ -2412,10 +2334,6 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2515,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 ""
@@ -2840,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 ""
@@ -3088,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 ""
@@ -3132,10 +3070,6 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
-msgid "Form"
-msgstr ""
-
-msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3424,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 ""
@@ -3460,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 ""
@@ -3538,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 ""
@@ -3666,6 +3646,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 ""
@@ -3759,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 ""
@@ -3812,5 +3796,3 @@ msgstr ""
msgctxt "stringutil.h"
msgid "%1 mins"
msgstr ""
-
-
diff --git a/src/vidalia/i18n/po/lt/qt_lt.po b/src/vidalia/i18n/po/lt/qt_lt.po
index 64f7cdc..fe5958c 100644
--- a/src/vidalia/i18n/po/lt/qt_lt.po
+++ b/src/vidalia/i18n/po/lt/qt_lt.po
@@ -1,11 +1,10 @@
#
-# Translators:
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-08-20 03:25+0000\n"
-"PO-Revision-Date: 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"
@@ -431,5 +430,3 @@ msgstr ""
msgctxt "QFileSystemModel"
msgid "%1 bytes"
msgstr ""
-
-
diff --git a/src/vidalia/i18n/po/lt/vidalia_lt.po b/src/vidalia/i18n/po/lt/vidalia_lt.po
index fa87632..515fae6 100644
--- a/src/vidalia/i18n/po/lt/vidalia_lt.po
+++ b/src/vidalia/i18n/po/lt/vidalia_lt.po
@@ -1,13 +1,11 @@
#
-# Translators:
-# <andrius.dre at gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2012-03-21 17:52+0000\n"
-"PO-Revision-Date: 2012-04-24 21:58+0000\n"
-"Last-Translator: vasaris <andrius.dre at gmail.com>\n"
+"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"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -18,124 +16,124 @@ msgstr ""
msgctxt "AboutDialog"
msgid "About Vidalia"
-msgstr "Apie Vidalia"
+msgstr ""
msgctxt "AboutDialog"
msgid "License"
-msgstr "Licencija"
+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' IP adresas negalioja."
+msgstr ""
msgctxt "AdvancedPage"
msgid ""
"You selected 'Password' authentication, but did not specify a password."
-msgstr "Pažymėta \"Apsaugoti slaptažodžiu\", tačiau nenurodytas slaptažodis."
+msgstr ""
msgctxt "AdvancedPage"
msgid "Select Tor Configuration File"
-msgstr "Nurodykite Tor konfigūracijos failą."
+msgstr ""
msgctxt "AdvancedPage"
msgid "File Not Found"
-msgstr "Failas nerastas."
+msgstr ""
msgctxt "AdvancedPage"
msgid "%1 does not exist. Would you like to create it?"
-msgstr "%1 neegzistuoja. Sukurti naują?"
+msgstr ""
msgctxt "AdvancedPage"
msgid "Failed to Create File"
-msgstr "Saugant failą įvyko klaida."
+msgstr ""
msgctxt "AdvancedPage"
msgid "Unable to create %1 [%2]"
-msgstr "Nepavyko sukurti %1 [%2]"
+msgstr ""
msgctxt "AdvancedPage"
msgid "Select a Directory to Use for Tor Data"
-msgstr "Pažymėkite aplanką Tor duomenims saugoti."
+msgstr ""
msgctxt "AdvancedPage"
msgid "Unable to remove Tor Service"
-msgstr "Nepavyko pašalinti Tor Servisą"
+msgstr ""
msgctxt "AdvancedPage"
msgid "Unable to install Tor Service"
-msgstr "Nepavyko įdiegti Tor Servisą."
+msgstr ""
msgctxt "AdvancedPage"
msgid "Vidalia was unable to install the Tor service."
-msgstr "Vidalia programai nepavyko įdiegti Tor Servisą."
+msgstr ""
msgctxt "AdvancedPage"
msgid "Authentication:"
-msgstr "Atpažinimas:"
+msgstr ""
msgctxt "AdvancedPage"
msgid "Address:"
-msgstr "Adresas:"
+msgstr ""
msgctxt "AdvancedPage"
msgid "None"
-msgstr "Joks"
+msgstr ""
msgctxt "AdvancedPage"
msgid "Cookie"
-msgstr "Slapukas (Cookie)"
+msgstr ""
msgctxt "AdvancedPage"
msgid "Password"
-msgstr "Slaptažodis"
+msgstr ""
msgctxt "AdvancedPage"
msgid "Randomly Generate"
-msgstr "Generuoti atsitiktinai"
+msgstr ""
msgctxt "AdvancedPage"
msgid ":"
-msgstr ":"
+msgstr ""
msgctxt "AdvancedPage"
msgid "Tor Configuration File"
-msgstr "Tor konfigūracijos failas"
+msgstr ""
msgctxt "AdvancedPage"
msgid "Start the Tor software with the specified configuration file (torrc)"
-msgstr "Paleisti Tor programinę įrangą, naudojantis konkrečiu konfigūracijos failu (torrc)"
+msgstr ""
msgctxt "AdvancedPage"
msgid "Select path to your configuration file"
-msgstr "Nurodykite kelią iki konfigūracijos failo"
+msgstr ""
msgctxt "AdvancedPage"
msgid "Browse"
-msgstr "Naršyti"
+msgstr ""
msgctxt "AdvancedPage"
msgid "Data Directory"
-msgstr "Duomenų aplankas"
+msgstr ""
msgctxt "AdvancedPage"
msgid "Store data for the Tor software in the following directory"
-msgstr "Saugoti Tor programinės įrangos duomenis šiame aplanke"
+msgstr ""
msgctxt "AdvancedPage"
msgid "Select the directory used to store data for the Tor software"
-msgstr "Nurodykite aplanką Tor programiniams duomenims"
+msgstr ""
msgctxt "AdvancedPage"
msgid "Tor Control"
@@ -194,115 +192,87 @@ msgid "Select a file to use for Tor socket path"
msgstr ""
msgctxt "AdvancedPage"
-msgid "Configure ControlPort automatically"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid ""
-"You've checked the autoconfiguration option for the ControlPort, but "
-"provided no Data Directory. Please add one, or uncheck the \"Configure "
-"ControlPort automatically\" option."
-msgstr ""
-
-msgctxt "AdvancedPage"
msgid ""
"Vidalia was unable to remove the Tor service.\n"
"\n"
"You may need to remove it manually."
-msgstr "Vidalia programai nepavyko pašalinti Tor Serviso.\n\nJums teks pašalinti Tor Servisą rankiniu būdu."
+msgstr ""
msgctxt "AppearancePage"
msgid "Language"
-msgstr "Kalba"
+msgstr ""
msgctxt "AppearancePage"
msgid "Choose the language used in Vidalia"
-msgstr "Pasirinkite kalbą Vidalia programai"
-
-msgctxt "AppearancePage"
-msgid "Style"
-msgstr "Stilius"
-
-msgctxt "AppearancePage"
-msgid "Choose Vidalia's interface style"
-msgstr "Pasirinkite Vidalia programos stilių"
-
-msgctxt "AppearancePage"
-msgid "Vidalia was unable to load the selected language translation."
-msgstr "Vidalia programai nepavyko rasti nurodytos kalbos vertimo."
-
-msgctxt "AppearancePage"
-msgid ""
-"System Icon Preferences (changes will take effect when you restart Vidalia)"
msgstr ""
msgctxt "AppearancePage"
-msgid "Show the Tray Icon and Dock Icon (default)"
+msgid "Style"
msgstr ""
msgctxt "AppearancePage"
-msgid "Hide the Tray Icon"
+msgid "Choose Vidalia's interface style"
msgstr ""
msgctxt "AppearancePage"
-msgid "Hide the Dock Icon"
+msgid "Vidalia was unable to load the selected language translation."
msgstr ""
msgctxt "BandwidthGraph"
msgid "Since:"
-msgstr "Nuo: "
+msgstr ""
msgctxt "BandwidthGraph"
msgid "Hide Settings"
-msgstr "Paslėpti nustatymus"
+msgstr ""
msgctxt "BandwidthGraph"
msgid "Show Settings"
-msgstr "Rodyti nustatymus"
-
-msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr "Tor pralaidumas"
+msgstr ""
msgctxt "BandwidthGraph"
msgid "Reset"
-msgstr "Paleisti iš naujo"
+msgstr ""
msgctxt "BandwidthGraph"
msgid "Receive Rate"
-msgstr "Įeinamojo srauto sparta"
+msgstr ""
msgctxt "BandwidthGraph"
msgid "Send Rate"
-msgstr "Išeinamojo srauto sparta"
+msgstr ""
msgctxt "BandwidthGraph"
msgid "Always on Top"
-msgstr "Visada viršuje"
+msgstr ""
msgctxt "BandwidthGraph"
msgid "Style"
-msgstr "Stilius"
+msgstr ""
msgctxt "BandwidthGraph"
msgid "Changes the transparency of the Bandwidth Graph"
-msgstr "Keisti Siuntimo spartos grafiko permatomumą"
+msgstr ""
msgctxt "BandwidthGraph"
msgid "100"
-msgstr "100"
+msgstr ""
msgctxt "BandwidthGraph"
msgid "% Opaque"
-msgstr "% nepermatomas"
+msgstr ""
msgctxt "BandwidthGraph"
msgid "Save"
-msgstr "Saugoti"
+msgstr ""
msgctxt "BandwidthGraph"
msgid "Cancel"
-msgstr "Atšaukti"
+msgstr ""
+
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr ""
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
@@ -457,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 ""
+"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"
@@ -508,203 +487,203 @@ msgstr ""
msgctxt "CountryInfo"
msgid "Armenia"
-msgstr "Armėnija"
+msgstr ""
msgctxt "CountryInfo"
msgid "Australia"
-msgstr "Australija"
+msgstr ""
msgctxt "CountryInfo"
msgid "Azerbaijan"
-msgstr "Azerbaidžanas"
+msgstr ""
msgctxt "CountryInfo"
msgid "Bahamas"
-msgstr "Bahamų salos"
+msgstr ""
msgctxt "CountryInfo"
msgid "Bangladesh"
-msgstr "Bangladešas"
+msgstr ""
msgctxt "CountryInfo"
msgid "Barbados"
-msgstr "Barbadosas"
+msgstr ""
msgctxt "CountryInfo"
msgid "Belarus"
-msgstr "Gudija"
+msgstr ""
msgctxt "CountryInfo"
msgid "Belgium"
-msgstr "Belgija"
+msgstr ""
msgctxt "CountryInfo"
msgid "Belize"
-msgstr "Belizas"
+msgstr ""
msgctxt "CountryInfo"
msgid "Bhutan"
-msgstr "Butanas"
+msgstr ""
msgctxt "CountryInfo"
msgid "Bolivia"
-msgstr "Bolivija"
+msgstr ""
msgctxt "CountryInfo"
msgid "Bosnia & Herzegovina"
-msgstr "Bosnija ir Hercogovina"
+msgstr ""
msgctxt "CountryInfo"
msgid "Botswana"
-msgstr "Botsvana"
+msgstr ""
msgctxt "CountryInfo"
msgid "Brazil"
-msgstr "Brazilija"
+msgstr ""
msgctxt "CountryInfo"
msgid "Brunei Darussalam"
-msgstr "Brunėjus"
+msgstr ""
msgctxt "CountryInfo"
msgid "Bulgaria"
-msgstr "Bulgarija"
+msgstr ""
msgctxt "CountryInfo"
msgid "Burkina Faso"
-msgstr "Burkina Faso"
+msgstr ""
msgctxt "CountryInfo"
msgid "Burundi"
-msgstr "Burundi"
+msgstr ""
msgctxt "CountryInfo"
msgid "Cambodia"
-msgstr "Kambodža"
+msgstr ""
msgctxt "CountryInfo"
msgid "Cameroon"
-msgstr "Kamerūnas"
+msgstr ""
msgctxt "CountryInfo"
msgid "Canada"
-msgstr "Kanada"
+msgstr ""
msgctxt "CountryInfo"
msgid "Cape Verde"
-msgstr "Žaliasis Kyšulys"
+msgstr ""
msgctxt "CountryInfo"
msgid "Central African Republic"
-msgstr "Centrinės Afrikos Respublika"
+msgstr ""
msgctxt "CountryInfo"
msgid "Chad"
-msgstr "Čadas"
+msgstr ""
msgctxt "CountryInfo"
msgid "Chile"
-msgstr "Čilė"
+msgstr ""
msgctxt "CountryInfo"
msgid "China"
-msgstr "Kinija"
+msgstr ""
msgctxt "CountryInfo"
msgid "Colombia"
-msgstr "Kolumbija"
+msgstr ""
msgctxt "CountryInfo"
msgid "Comoros"
-msgstr "Komorų salos"
+msgstr ""
msgctxt "CountryInfo"
msgid "Congo, The Democratic Republic of the"
-msgstr "Kongo DR"
+msgstr ""
msgctxt "CountryInfo"
msgid "Congo"
-msgstr "Kongas"
+msgstr ""
msgctxt "CountryInfo"
msgid "Costa Rica"
-msgstr "Kosta Rika"
+msgstr ""
msgctxt "CountryInfo"
msgid "Cote d’Ivoire"
-msgstr "Dramblio Kaulo Krantas"
+msgstr ""
msgctxt "CountryInfo"
msgid "Croatia"
-msgstr "Kroatija"
+msgstr ""
msgctxt "CountryInfo"
msgid "Cuba"
-msgstr "Kuba"
+msgstr ""
msgctxt "CountryInfo"
msgid "Cyprus"
-msgstr "Kipras"
+msgstr ""
msgctxt "CountryInfo"
msgid "Czech Republic"
-msgstr "Čekija"
+msgstr ""
msgctxt "CountryInfo"
msgid "Denmark"
-msgstr "Danija"
+msgstr ""
msgctxt "CountryInfo"
msgid "Djibouti"
-msgstr "Džibutis"
+msgstr ""
msgctxt "CountryInfo"
msgid "Dominica"
-msgstr "Dominika"
+msgstr ""
msgctxt "CountryInfo"
msgid "Dominican Republic"
-msgstr "Dominikos Respublika"
+msgstr ""
msgctxt "CountryInfo"
msgid "Ecuador"
-msgstr "Ekvadoras"
+msgstr ""
msgctxt "CountryInfo"
msgid "Egypt"
-msgstr "Egiptas"
+msgstr ""
msgctxt "CountryInfo"
msgid "El Salvador"
-msgstr "Salvadoras"
+msgstr ""
msgctxt "CountryInfo"
msgid "Equatorial Guinea"
-msgstr "Pusaujo Gvinėja"
+msgstr ""
msgctxt "CountryInfo"
msgid "Eritrea"
-msgstr "Eritrėja"
+msgstr ""
msgctxt "CountryInfo"
msgid "Estonia"
-msgstr "Estija"
+msgstr ""
msgctxt "CountryInfo"
msgid "France"
-msgstr "Prancūzija"
+msgstr ""
msgctxt "CountryInfo"
msgid "Gabon"
-msgstr "Gabonas"
+msgstr ""
msgctxt "CountryInfo"
msgid "Gambia"
-msgstr "Gambija"
+msgstr ""
msgctxt "CountryInfo"
msgid "Georgia"
-msgstr "Gruzija"
+msgstr ""
msgctxt "CountryInfo"
msgid "Germany"
@@ -908,75 +887,75 @@ msgstr ""
msgctxt "CountryInfo"
msgid "Niger"
-msgstr "Nigeris"
+msgstr ""
msgctxt "CountryInfo"
msgid "Nigeria"
-msgstr "Nigerija"
+msgstr ""
msgctxt "CountryInfo"
msgid "Norway"
-msgstr "Norvegija"
+msgstr ""
msgctxt "CountryInfo"
msgid "Oman"
-msgstr "Omanas"
+msgstr ""
msgctxt "CountryInfo"
msgid "Pakistan"
-msgstr "Pakistanas"
+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 Naujoji Guinėja"
+msgstr ""
msgctxt "CountryInfo"
msgid "Paraguay"
-msgstr "Paragvajus"
+msgstr ""
msgctxt "CountryInfo"
msgid "Peru"
-msgstr "Peru"
+msgstr ""
msgctxt "CountryInfo"
msgid "Philippines"
-msgstr "Filipinai"
+msgstr ""
msgctxt "CountryInfo"
msgid "Poland"
-msgstr "Lenkija"
+msgstr ""
msgctxt "CountryInfo"
msgid "Portugal"
-msgstr "Portugalija"
+msgstr ""
msgctxt "CountryInfo"
msgid "Qatar"
-msgstr "Kataras"
+msgstr ""
msgctxt "CountryInfo"
msgid "Romania"
-msgstr "Rumunija"
+msgstr ""
msgctxt "CountryInfo"
msgid "Russia"
-msgstr "Rusija"
+msgstr ""
msgctxt "CountryInfo"
msgid "Rwanda"
-msgstr "Ruanda"
+msgstr ""
msgctxt "CountryInfo"
msgid "Saint Kitts & Nevis"
@@ -1104,7 +1083,7 @@ msgstr ""
msgctxt "CountryInfo"
msgid "Trinidad & Tobago"
-msgstr "Gruzija"
+msgstr ""
msgctxt "CountryInfo"
msgid "Tunisia"
@@ -1291,149 +1270,156 @@ 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"
msgid "Executables (*.exe)"
-msgstr "Vykdomieji failai (*.exe)"
+msgstr ""
msgctxt "GeneralPage"
msgid "Select Path to Tor"
-msgstr "Nurodykite kelią ik Tor"
+msgstr ""
msgctxt "GeneralPage"
msgid "Select Proxy Executable"
-msgstr "Nurodykite Proxy vykdomąjį failą"
+msgstr ""
msgctxt "GeneralPage"
msgid "You must specify the name of your Tor executable."
-msgstr "Nurodykite Tor vykdomojo failo vardą"
+msgstr ""
msgctxt "GeneralPage"
msgid "Start Vidalia when my system starts"
-msgstr "Paleisti Vidalia programą startavus operacinei sistemai"
+msgstr ""
msgctxt "GeneralPage"
msgid "Browse"
-msgstr "Naršyti"
-
-msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr "Paleisti Tor programinę įrangą startavus Vidalia programai"
+msgstr ""
msgctxt "GeneralPage"
msgid "Tor"
-msgstr "Tor"
+msgstr ""
msgctxt "GeneralPage"
msgid "Proxy Application (optional)"
-msgstr "Proxy programa (nebūtina)"
+msgstr ""
msgctxt "GeneralPage"
msgid "Start a proxy application when Tor starts"
-msgstr "Paleisti proxy programą startavus Tor"
+msgstr ""
msgctxt "GeneralPage"
msgid "Proxy Application Arguments:"
-msgstr "Proxy programos papildomi kintamieji:"
+msgstr ""
msgctxt "GeneralPage"
msgid "Software Updates"
-msgstr "Programinės įrangos atnaujinimai"
+msgstr ""
msgctxt "GeneralPage"
msgid "Check for new software updates automatically"
-msgstr "Automatiškai tikrinti ar yra programinės įrangos atnaujinimų"
+msgstr ""
msgctxt "GeneralPage"
msgid "Check Now"
-msgstr "Tikrinti"
+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 "Gauta:"
+msgstr ""
msgctxt "GraphFrame"
msgid "Sent:"
-msgstr "Išsiųsta:"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Supplied XML file is not a valid Contents document."
-msgstr "Pateiktas XML failas nėra tinkamas"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Search reached end of document"
-msgstr "Paieška pasiekė dokumento pabaigą"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Search reached start of document"
-msgstr "Paieška pasiekė dokumento pradžią"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Text not found in document"
-msgstr "Tekstas dokumente nerastas"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Found %1 results"
-msgstr "Rasta %1 rezultatų"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Vidalia Help"
-msgstr "Vidalia Instrukcija"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Back"
@@ -1541,40 +1527,40 @@ msgstr ""
msgctxt "HelpTextBrowser"
msgid "Opening External Link"
-msgstr "Atidaryti išorinę nuorodą"
+msgstr ""
msgctxt "HelpTextBrowser"
msgid ""
"Vidalia can open the link you selected in your default Web browser. If your "
"browser is not currently configured to use Tor then the request will not be "
"anonymous."
-msgstr "Vidalia negali atidaryti nuorodos. Jūsų duomenys bus anonimiški tik sukonfigūravus naršyklę naudoti Tor."
+msgstr ""
msgctxt "HelpTextBrowser"
msgid "Do you want Vidalia to open the link in your Web browser?"
-msgstr "Ar norite, kad Vidalia atidarytų nuorodą Jūsų naršyklėje?"
+msgstr ""
msgctxt "HelpTextBrowser"
msgid "Unable to Open Link"
-msgstr "Nepavyko atidaryti nuorodos"
+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 progrmai nepavyko atidaryti nuorodos. Jūs galite nukopijuoti URL adresą."
+msgstr ""
msgctxt "HelpTextBrowser"
msgid "Error opening help file:"
-msgstr "Klaida atidanat failą:"
+msgstr ""
msgctxt "LicenseDialog"
msgid "License Information"
-msgstr "Licencijos informacija"
+msgstr ""
msgctxt "LicenseDialog"
msgid "License"
-msgstr "Licencija"
+msgstr ""
msgctxt "LicenseDialog"
msgid "Credits"
@@ -1586,23 +1572,23 @@ msgstr ""
msgctxt "LogEvent"
msgid "Info"
-msgstr "Informacija"
+msgstr ""
msgctxt "LogEvent"
msgid "Notice"
-msgstr "Pranešimas"
+msgstr ""
msgctxt "LogEvent"
msgid "Warning"
-msgstr "Įspėjimas"
+msgstr ""
msgctxt "LogEvent"
msgid "Error"
-msgstr "Klaida"
+msgstr ""
msgctxt "LogEvent"
msgid "Unknown"
-msgstr "Nežinoma"
+msgstr ""
msgctxt "LogTreeItem"
msgid "Debug"
@@ -1630,149 +1616,121 @@ msgstr ""
msgctxt "MainWindow"
msgid "Start Tor"
-msgstr "Paleisti Tor"
+msgstr ""
msgctxt "MainWindow"
msgid "Exit"
-msgstr "Išeiti"
+msgstr ""
msgctxt "MainWindow"
msgid "Bandwidth Graph"
-msgstr "Spartos grafikas"
+msgstr ""
msgctxt "MainWindow"
msgid "Message Log"
-msgstr "Pranešimų žurnalas"
+msgstr ""
msgctxt "MainWindow"
msgid "Network Map"
-msgstr "Tinklo žemėlapis"
+msgstr ""
msgctxt "MainWindow"
msgid "Control Panel"
-msgstr "Kontrolinis pultas"
+msgstr ""
msgctxt "MainWindow"
msgid "Settings"
-msgstr "Nustatymai"
+msgstr ""
msgctxt "MainWindow"
msgid "About"
-msgstr "Apie"
+msgstr ""
msgctxt "MainWindow"
msgid "Help"
-msgstr "Pagalba"
+msgstr ""
msgctxt "MainWindow"
msgid "New Identity"
-msgstr "Nauja tapatybė"
-
-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 "Rodymas"
-
-msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr "Vidalia Instrukcija"
+msgstr ""
msgctxt "MainWindow"
msgid "Error starting web browser"
-msgstr "Klaida paleidžiant naršyklę"
+msgstr ""
msgctxt "MainWindow"
msgid "Vidalia was unable to start the configured web browser"
-msgstr "Vidalia programai nepavyko paleisti naršyklės su šiais nustatymais"
+msgstr ""
msgctxt "MainWindow"
msgid "Error starting IM client"
-msgstr "Klaida paleidžiant pokalbių programą"
+msgstr ""
msgctxt "MainWindow"
msgid "Vidalia was unable to start the configured IM client"
-msgstr "Vidalia programai nepavyko paleisti pokalbių programą"
+msgstr ""
msgctxt "MainWindow"
msgid "Error starting proxy server"
-msgstr "Klaida paleidžiant proxy serverį"
+msgstr ""
msgctxt "MainWindow"
msgid "Vidalia was unable to start the configured proxy server"
-msgstr "Vidalia programai nepavyko paleisti proxy serverį su šiais nustatymais"
+msgstr ""
msgctxt "MainWindow"
msgid "Connecting to a relay directory"
-msgstr "Jungiamasi prie retransliavimo taškų"
+msgstr ""
msgctxt "MainWindow"
msgid "Establishing an encrypted directory connection"
-msgstr "Užmezgiamas ryšys"
+msgstr ""
msgctxt "MainWindow"
msgid "Retrieving network status"
-msgstr "Nuskaitoma tinklo būklė"
+msgstr ""
msgctxt "MainWindow"
msgid "Loading network status"
-msgstr "Nustatoma tinklo būklė"
+msgstr ""
msgctxt "MainWindow"
msgid "Loading authority certificates"
-msgstr "Įkeliami prieigos sertifikatai"
+msgstr ""
msgctxt "MainWindow"
msgid "Requesting relay information"
-msgstr "Užklausiama retranslaicijos taškų informacija"
+msgstr ""
msgctxt "MainWindow"
msgid "Loading relay information"
-msgstr "Įkeliama retransliacijos informacija"
+msgstr ""
msgctxt "MainWindow"
msgid "Connecting to the Tor network"
-msgstr "Jungiamasi prie Tor tinklo"
+msgstr ""
msgctxt "MainWindow"
msgid "Establishing a Tor circuit"
-msgstr "Užmezgiamas sujungimas"
+msgstr ""
msgctxt "MainWindow"
msgid "Connected to the Tor network!"
msgstr ""
msgctxt "MainWindow"
+msgid "Unrecognized startup status"
+msgstr ""
+
+msgctxt "MainWindow"
msgid "miscellaneous"
msgstr ""
@@ -1817,10 +1775,6 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1903,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 ""
@@ -1955,126 +1897,61 @@ 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 "Rodyti Tor tinklo žemėlapį"
-
-msgctxt "MainWindow"
-msgid "Use a New Identity"
-msgstr "Naudoti naują tapatybę"
-
-msgctxt "MainWindow"
-msgid "Make subsequent connections appear new"
-msgstr "Paspaudus šį mygtuką bus jungiamasi kaip iš naujos vietos"
-
-msgctxt "MainWindow"
-msgid "View recent bandwidth usage"
-msgstr "Rodyti srauto spartą"
-
-msgctxt "MainWindow"
-msgid "View log message history"
-msgstr "Rodyti žurnalą"
-
-msgctxt "MainWindow"
-msgid "View help documentation"
-msgstr "Rodyti instrukciją"
-
-msgctxt "MainWindow"
-msgid "Configure Vidalia"
-msgstr "Konfigūruoti Vidalia"
-
-msgctxt "MainWindow"
-msgid "View version and license information"
-msgstr "Rodyti programos versiją ir licencijos infomaciją"
-
-msgctxt "MainWindow"
-msgid "Exit Vidalia"
-msgstr "Uždaryti Vidalia"
-
-msgctxt "MainWindow"
-msgid "Show this window on startup"
-msgstr "Rodyti šį langą įjungus kompiuterį"
-
-msgctxt "MainWindow"
-msgid "Hide"
-msgstr "Slėpti"
-
-msgctxt "MainWindow"
-msgid "Hide this window"
-msgstr "Slėpti šį langą"
-
-msgctxt "MainWindow"
msgid "Password Reset Failed"
-msgstr "Įvyko klaida keičiant slaptažodį"
-
-msgctxt "MainWindow"
-msgid ""
-"Vidalia tried to reset Tor's control password, but was not able to restart "
-"the Tor software. Please check your Task Manager to ensure there are no "
-"other Tor processes running."
-msgstr "Vidalia programa bandė pakeisti Tor slaptažodį, tačiau nepavyko perkrauti Tor programinės įrangos. Įsitikinkite, kad sistemoje nėra paleistų Tor procesų"
+msgstr ""
msgctxt "MainWindow"
msgid ""
"The currently installed version of Tor is out of date or no longer "
"recommended."
-msgstr "Šiuo metu įdiegta Tor versija yra pasenusi ir neberekomenduojama naudoti"
+msgstr ""
msgctxt "MainWindow"
msgid ""
"Would you like to check if a newer package is available for installation?"
-msgstr "Ar norėtumėte patiktinti ar atsirado nauja versija?"
+msgstr ""
msgctxt "MainWindow"
msgid "Potentially Unsafe Connection"
-msgstr "Potencialiai NEsaugus ryšys"
+msgstr ""
msgctxt "MainWindow"
msgid ""
"Tor has automatically closed your connection in order to protect your "
"anonymity."
-msgstr "Tor automatiškai nutraukė ryšį, kad būtų išsaugotas anonimiškumas"
+msgstr ""
msgctxt "MainWindow"
msgid "Update Failed"
-msgstr "Atnaujinimas nepavyko"
+msgstr ""
msgctxt "MainWindow"
msgid "Your software is up to date"
-msgstr "Jūsų programinė įranga atnaujinta"
+msgstr ""
msgctxt "MainWindow"
msgid ""
"There are no new Tor software packages available for your computer at this "
"time."
-msgstr "Šiuo metu nėra naujesnės Tor programinės įrangos. Jūsų versija yra naujausia."
+msgstr ""
msgctxt "MainWindow"
msgid "Installation Failed"
-msgstr "Diegimas nepavyko"
+msgstr ""
msgctxt "MainWindow"
msgid "Vidalia was unable to install your software updates."
-msgstr "Vidalia programai nepavyko įdiegti atnaujinimų"
+msgstr ""
msgctxt "MainWindow"
msgid "The following error occurred:"
-msgstr "Įvyko klaida: "
+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 ""
@@ -2084,46 +1961,31 @@ msgid ""
msgstr ""
msgctxt "MainWindow"
-msgid "Bootstrapping torrc from %1 to %2"
+msgid "toolBar"
msgstr ""
msgctxt "MainWindow"
-msgid "(probably Telnet)"
+msgid "Start"
msgstr ""
msgctxt "MainWindow"
-msgid "(probably an email client)"
+msgid "Stop"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"One of your applications %1 appears to be making a potentially unencrypted "
-"and unsafe connection to port %2."
+msgid "Restart"
msgstr ""
msgctxt "MainWindow"
-msgid "failed (%1)"
-msgstr "nepavyko (%1)"
-
-msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
-msgstr "Jūsų retransliacijos taškas išjungiamas.\nPaspauskite \"Stop\" mygtuką nutraukti ryšiui."
+msgid "Reload Tor's config"
+msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Vidalia can't find out how to talk to Tor because it can't access this file: %1\n"
-"\n"
-"Here's the last error message:\n"
-"%2"
+msgid "Actions"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"It seems Tor has stopped running since Vidalia started it.\n"
-"\n"
-"See the Advanced Message Log for more information."
+msgid "Bootstrapping torrc from %1 to %2"
msgstr ""
msgctxt "MainWindow"
@@ -2131,7 +1993,7 @@ msgid ""
"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
"\n"
"Would you like to shutdown gracefully and give clients time to find a new relay?"
-msgstr "Jūsų kompiuteris veikia kaip Tor tinklo retransliatorius. Nutrukus sustabdžius retransliavimą bus nutraukti užmegzti sujungimai.\n\nAr norėtumėte naudotojus įspėti, kad jie turėtų laiko prisijungti prie kito retransliavimo taško?"
+msgstr ""
msgctxt "MainWindow"
msgid ""
@@ -2140,6 +2002,38 @@ msgid ""
"Please check the message log for recent warning or error messages."
msgstr ""
+msgctxt "MainWindow"
+msgid ""
+"Vidalia tried to restart Tor, but was not able to. Please check your Task "
+"Manager to ensure there are no other Tor processes running."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "failed (%1)"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid ", probably Telnet,"
+msgstr ""
+
+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 ""
@@ -2226,7 +2120,7 @@ msgstr ""
msgctxt "MessageLog"
msgid "Ctrl+E"
-msgstr "Užmezgiamas sujungimas"
+msgstr ""
msgctxt "MessageLog"
msgid "Copy"
@@ -2393,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"
@@ -2448,10 +2334,6 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2551,6 +2433,30 @@ 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 ""
+
+msgctxt "NetworkPage"
+msgid "The specified bridge identifier is not valid."
+msgstr ""
+
msgctxt "NetworkPage"
msgid "Copy (Ctrl+C)"
msgstr ""
@@ -2684,11 +2590,11 @@ msgid "SOCKS 5"
msgstr ""
msgctxt "NetworkPage"
-msgid "HTTP / HTTPS"
+msgid "HTTP"
msgstr ""
msgctxt "NetworkPage"
-msgid "You must specify one or more bridges."
+msgid "HTTP / HTTPS"
msgstr ""
msgctxt "Policy"
@@ -3112,11 +3018,11 @@ msgid "Automatically distribute my bridge address"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network (exit relay)"
+msgid "Relay traffic inside the Tor network (non-exit relay)"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic inside the Tor network (non-exit relay)"
+msgid "Relay traffic for the Tor network (exit relay)"
msgstr ""
msgctxt "ServerPage"
@@ -3164,10 +3070,6 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
-msgid "Form"
-msgstr ""
-
-msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3456,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 ""
@@ -3492,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 ""
@@ -3570,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 ""
@@ -3698,6 +3646,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 ""
@@ -3791,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 ""
diff --git a/src/vidalia/i18n/po/lv/qt_lv.po b/src/vidalia/i18n/po/lv/qt_lv.po
index 9002578..8640954 100644
--- a/src/vidalia/i18n/po/lv/qt_lv.po
+++ b/src/vidalia/i18n/po/lv/qt_lv.po
@@ -1,11 +1,10 @@
#
-# Translators:
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-08-20 03:25+0000\n"
-"PO-Revision-Date: 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"
@@ -431,5 +430,3 @@ msgstr ""
msgctxt "QFileSystemModel"
msgid "%1 bytes"
msgstr ""
-
-
diff --git a/src/vidalia/i18n/po/lv/vidalia_lv.po b/src/vidalia/i18n/po/lv/vidalia_lv.po
index 6cf77a7..9ff589d 100644
--- a/src/vidalia/i18n/po/lv/vidalia_lv.po
+++ b/src/vidalia/i18n/po/lv/vidalia_lv.po
@@ -1,11 +1,10 @@
#
-# Translators:
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-09-07 14:40+0000\n"
-"PO-Revision-Date: 2010-12-05 20:03+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"
@@ -193,10 +192,6 @@ 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"
@@ -236,10 +231,6 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr ""
-
-msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -279,6 +270,10 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr ""
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -432,17 +427,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"
@@ -1266,44 +1270,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"
@@ -1331,10 +1342,6 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr ""
-
-msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1362,6 +1369,10 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr ""
+
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1644,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 ""
@@ -1680,10 +1663,6 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1796,10 +1775,6 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1882,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 ""
@@ -1934,82 +1897,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 ""
@@ -2057,19 +1949,39 @@ 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)"
+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"
@@ -2091,17 +2003,35 @@ msgid ""
msgstr ""
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"
@@ -2357,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"
@@ -2412,10 +2334,6 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2515,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 ""
@@ -2840,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 ""
@@ -3088,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 ""
@@ -3132,10 +3070,6 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
-msgid "Form"
-msgstr ""
-
-msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3424,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 ""
@@ -3460,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 ""
@@ -3538,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 ""
@@ -3666,6 +3646,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 ""
@@ -3759,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 ""
@@ -3812,5 +3796,3 @@ msgstr ""
msgctxt "stringutil.h"
msgid "%1 mins"
msgstr ""
-
-
diff --git a/src/vidalia/i18n/po/mg/qt_mg.po b/src/vidalia/i18n/po/mg/qt_mg.po
index 99838af..10c72ad 100644
--- a/src/vidalia/i18n/po/mg/qt_mg.po
+++ b/src/vidalia/i18n/po/mg/qt_mg.po
@@ -1,11 +1,10 @@
#
-# Translators:
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-08-20 03:25+0000\n"
-"PO-Revision-Date: 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"
@@ -431,5 +430,3 @@ msgstr ""
msgctxt "QFileSystemModel"
msgid "%1 bytes"
msgstr ""
-
-
diff --git a/src/vidalia/i18n/po/mg/vidalia_mg.po b/src/vidalia/i18n/po/mg/vidalia_mg.po
index 6182cb2..9d86930 100644
--- a/src/vidalia/i18n/po/mg/vidalia_mg.po
+++ b/src/vidalia/i18n/po/mg/vidalia_mg.po
@@ -1,11 +1,10 @@
#
-# Translators:
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-09-07 14:40+0000\n"
-"PO-Revision-Date: 2010-12-05 20:03+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"
@@ -193,10 +192,6 @@ 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"
@@ -236,10 +231,6 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr ""
-
-msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -279,6 +270,10 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr ""
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -432,17 +427,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"
@@ -1266,44 +1270,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"
@@ -1331,10 +1342,6 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr ""
-
-msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1362,6 +1369,10 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr ""
+
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1644,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 ""
@@ -1680,10 +1663,6 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1796,10 +1775,6 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1882,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 ""
@@ -1934,82 +1897,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 ""
@@ -2057,19 +1949,39 @@ 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)"
+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"
@@ -2091,17 +2003,35 @@ msgid ""
msgstr ""
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"
@@ -2357,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"
@@ -2412,10 +2334,6 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2515,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 ""
@@ -2840,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 ""
@@ -3088,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 ""
@@ -3132,10 +3070,6 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
-msgid "Form"
-msgstr ""
-
-msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3424,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 ""
@@ -3460,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 ""
@@ -3538,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 ""
@@ -3666,6 +3646,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 ""
@@ -3759,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 ""
@@ -3812,5 +3796,3 @@ msgstr ""
msgctxt "stringutil.h"
msgid "%1 mins"
msgstr ""
-
-
diff --git a/src/vidalia/i18n/po/mi/qt_mi.po b/src/vidalia/i18n/po/mi/qt_mi.po
index 7a5f69b..8fce8b0 100644
--- a/src/vidalia/i18n/po/mi/qt_mi.po
+++ b/src/vidalia/i18n/po/mi/qt_mi.po
@@ -1,11 +1,10 @@
#
-# Translators:
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-08-20 03:25+0000\n"
-"PO-Revision-Date: 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"
@@ -431,5 +430,3 @@ msgstr ""
msgctxt "QFileSystemModel"
msgid "%1 bytes"
msgstr ""
-
-
diff --git a/src/vidalia/i18n/po/mi/vidalia_mi.po b/src/vidalia/i18n/po/mi/vidalia_mi.po
index 5471813..0609e8d 100644
--- a/src/vidalia/i18n/po/mi/vidalia_mi.po
+++ b/src/vidalia/i18n/po/mi/vidalia_mi.po
@@ -1,11 +1,10 @@
#
-# Translators:
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-09-07 14:40+0000\n"
-"PO-Revision-Date: 2010-12-05 20:03+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"
@@ -193,10 +192,6 @@ 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"
@@ -236,10 +231,6 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr ""
-
-msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -279,6 +270,10 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr ""
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -432,17 +427,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"
@@ -1266,44 +1270,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"
@@ -1331,10 +1342,6 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr ""
-
-msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1362,6 +1369,10 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr ""
+
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1644,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 ""
@@ -1680,10 +1663,6 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1796,10 +1775,6 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1882,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 ""
@@ -1934,82 +1897,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 ""
@@ -2057,19 +1949,39 @@ 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)"
+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"
@@ -2091,17 +2003,35 @@ msgid ""
msgstr ""
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"
@@ -2357,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"
@@ -2412,10 +2334,6 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2515,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 ""
@@ -2840,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 ""
@@ -3088,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 ""
@@ -3132,10 +3070,6 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
-msgid "Form"
-msgstr ""
-
-msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3424,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 ""
@@ -3460,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 ""
@@ -3538,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 ""
@@ -3666,6 +3646,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 ""
@@ -3759,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 ""
@@ -3812,5 +3796,3 @@ msgstr ""
msgctxt "stringutil.h"
msgid "%1 mins"
msgstr ""
-
-
diff --git a/src/vidalia/i18n/po/mk/qt_mk.po b/src/vidalia/i18n/po/mk/qt_mk.po
index df4956b..4ca8c1a 100644
--- a/src/vidalia/i18n/po/mk/qt_mk.po
+++ b/src/vidalia/i18n/po/mk/qt_mk.po
@@ -1,11 +1,10 @@
#
-# Translators:
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-08-20 03:25+0000\n"
-"PO-Revision-Date: 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"
@@ -431,5 +430,3 @@ msgstr ""
msgctxt "QFileSystemModel"
msgid "%1 bytes"
msgstr ""
-
-
diff --git a/src/vidalia/i18n/po/mk/vidalia_mk.po b/src/vidalia/i18n/po/mk/vidalia_mk.po
index c05a039..fa090b3 100644
--- a/src/vidalia/i18n/po/mk/vidalia_mk.po
+++ b/src/vidalia/i18n/po/mk/vidalia_mk.po
@@ -1,11 +1,10 @@
#
-# Translators:
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-09-07 14:40+0000\n"
-"PO-Revision-Date: 2010-12-05 20:03+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"
@@ -193,10 +192,6 @@ 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"
@@ -236,10 +231,6 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr ""
-
-msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -279,6 +270,10 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr ""
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -432,17 +427,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"
@@ -1266,44 +1270,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"
@@ -1331,10 +1342,6 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr ""
-
-msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1362,6 +1369,10 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr ""
+
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1644,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 ""
@@ -1680,10 +1663,6 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1796,10 +1775,6 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1882,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 ""
@@ -1934,82 +1897,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 ""
@@ -2057,19 +1949,39 @@ 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)"
+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"
@@ -2091,17 +2003,35 @@ msgid ""
msgstr ""
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"
@@ -2357,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"
@@ -2412,10 +2334,6 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2515,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 ""
@@ -2840,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 ""
@@ -3088,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 ""
@@ -3132,10 +3070,6 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
-msgid "Form"
-msgstr ""
-
-msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3424,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 ""
@@ -3460,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 ""
@@ -3538,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 ""
@@ -3666,6 +3646,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 ""
@@ -3759,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 ""
@@ -3812,5 +3796,3 @@ msgstr ""
msgctxt "stringutil.h"
msgid "%1 mins"
msgstr ""
-
-
diff --git a/src/vidalia/i18n/po/ml/qt_ml.po b/src/vidalia/i18n/po/ml/qt_ml.po
index 08bfafd..4e76d07 100644
--- a/src/vidalia/i18n/po/ml/qt_ml.po
+++ b/src/vidalia/i18n/po/ml/qt_ml.po
@@ -1,11 +1,10 @@
#
-# Translators:
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-08-20 03:25+0000\n"
-"PO-Revision-Date: 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"
@@ -431,5 +430,3 @@ msgstr ""
msgctxt "QFileSystemModel"
msgid "%1 bytes"
msgstr ""
-
-
diff --git a/src/vidalia/i18n/po/ml/vidalia_ml.po b/src/vidalia/i18n/po/ml/vidalia_ml.po
index a7a323d..2188ff8 100644
--- a/src/vidalia/i18n/po/ml/vidalia_ml.po
+++ b/src/vidalia/i18n/po/ml/vidalia_ml.po
@@ -1,11 +1,10 @@
#
-# Translators:
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-09-07 14:40+0000\n"
-"PO-Revision-Date: 2010-12-05 20:03+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"
@@ -193,10 +192,6 @@ 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"
@@ -236,10 +231,6 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr ""
-
-msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -279,6 +270,10 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr ""
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -432,17 +427,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"
@@ -1266,44 +1270,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"
@@ -1331,10 +1342,6 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr ""
-
-msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1362,6 +1369,10 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr ""
+
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1644,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 ""
@@ -1680,10 +1663,6 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1796,10 +1775,6 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1882,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 ""
@@ -1934,82 +1897,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 ""
@@ -2057,19 +1949,39 @@ 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)"
+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"
@@ -2091,17 +2003,35 @@ msgid ""
msgstr ""
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"
@@ -2357,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"
@@ -2412,10 +2334,6 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2515,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 ""
@@ -2840,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 ""
@@ -3088,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 ""
@@ -3132,10 +3070,6 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
-msgid "Form"
-msgstr ""
-
-msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3424,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 ""
@@ -3460,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 ""
@@ -3538,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 ""
@@ -3666,6 +3646,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 ""
@@ -3759,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 ""
@@ -3812,5 +3796,3 @@ msgstr ""
msgctxt "stringutil.h"
msgid "%1 mins"
msgstr ""
-
-
diff --git a/src/vidalia/i18n/po/mn/qt_mn.po b/src/vidalia/i18n/po/mn/qt_mn.po
index 9f5450d..3638f0f 100644
--- a/src/vidalia/i18n/po/mn/qt_mn.po
+++ b/src/vidalia/i18n/po/mn/qt_mn.po
@@ -1,11 +1,10 @@
#
-# Translators:
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-08-20 03:25+0000\n"
-"PO-Revision-Date: 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"
@@ -431,5 +430,3 @@ msgstr ""
msgctxt "QFileSystemModel"
msgid "%1 bytes"
msgstr ""
-
-
diff --git a/src/vidalia/i18n/po/mn/vidalia_mn.po b/src/vidalia/i18n/po/mn/vidalia_mn.po
index 784ab28..e609e46 100644
--- a/src/vidalia/i18n/po/mn/vidalia_mn.po
+++ b/src/vidalia/i18n/po/mn/vidalia_mn.po
@@ -1,11 +1,10 @@
#
-# Translators:
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-09-07 14:40+0000\n"
-"PO-Revision-Date: 2010-12-05 20:03+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"
@@ -193,10 +192,6 @@ 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"
@@ -236,10 +231,6 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr ""
-
-msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -279,6 +270,10 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr ""
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -432,17 +427,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"
@@ -1266,44 +1270,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"
@@ -1331,10 +1342,6 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr ""
-
-msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1362,6 +1369,10 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr ""
+
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1644,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 ""
@@ -1680,10 +1663,6 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1796,10 +1775,6 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1882,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 ""
@@ -1934,82 +1897,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 ""
@@ -2057,19 +1949,39 @@ 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)"
+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"
@@ -2091,17 +2003,35 @@ msgid ""
msgstr ""
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"
@@ -2357,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"
@@ -2412,10 +2334,6 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2515,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 ""
@@ -2840,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 ""
@@ -3088,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 ""
@@ -3132,10 +3070,6 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
-msgid "Form"
-msgstr ""
-
-msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3424,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 ""
@@ -3460,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 ""
@@ -3538,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 ""
@@ -3666,6 +3646,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 ""
@@ -3759,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 ""
@@ -3812,5 +3796,3 @@ msgstr ""
msgctxt "stringutil.h"
msgid "%1 mins"
msgstr ""
-
-
diff --git a/src/vidalia/i18n/po/mr/qt_mr.po b/src/vidalia/i18n/po/mr/qt_mr.po
index a8c1183..4a97296 100644
--- a/src/vidalia/i18n/po/mr/qt_mr.po
+++ b/src/vidalia/i18n/po/mr/qt_mr.po
@@ -1,11 +1,10 @@
#
-# Translators:
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-08-20 03:25+0000\n"
-"PO-Revision-Date: 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"
@@ -431,5 +430,3 @@ msgstr ""
msgctxt "QFileSystemModel"
msgid "%1 bytes"
msgstr ""
-
-
diff --git a/src/vidalia/i18n/po/mr/vidalia_mr.po b/src/vidalia/i18n/po/mr/vidalia_mr.po
index f5740db..52c4025 100644
--- a/src/vidalia/i18n/po/mr/vidalia_mr.po
+++ b/src/vidalia/i18n/po/mr/vidalia_mr.po
@@ -1,11 +1,10 @@
#
-# Translators:
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-09-07 14:40+0000\n"
-"PO-Revision-Date: 2010-12-05 20:03+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"
@@ -193,10 +192,6 @@ 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"
@@ -236,10 +231,6 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr ""
-
-msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -279,6 +270,10 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr ""
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -432,17 +427,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"
@@ -1266,44 +1270,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"
@@ -1331,10 +1342,6 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr ""
-
-msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1362,6 +1369,10 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr ""
+
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1644,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 ""
@@ -1680,10 +1663,6 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1796,10 +1775,6 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1882,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 ""
@@ -1934,82 +1897,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 ""
@@ -2057,19 +1949,39 @@ 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)"
+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"
@@ -2091,17 +2003,35 @@ msgid ""
msgstr ""
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"
@@ -2357,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"
@@ -2412,10 +2334,6 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2515,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 ""
@@ -2840,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 ""
@@ -3088,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 ""
@@ -3132,10 +3070,6 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
-msgid "Form"
-msgstr ""
-
-msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3424,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 ""
@@ -3460,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 ""
@@ -3538,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 ""
@@ -3666,6 +3646,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 ""
@@ -3759,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 ""
@@ -3812,5 +3796,3 @@ msgstr ""
msgctxt "stringutil.h"
msgid "%1 mins"
msgstr ""
-
-
diff --git a/src/vidalia/i18n/po/ms/qt_ms.po b/src/vidalia/i18n/po/ms/qt_ms.po
index d64e487..b09c996 100644
--- a/src/vidalia/i18n/po/ms/qt_ms.po
+++ b/src/vidalia/i18n/po/ms/qt_ms.po
@@ -1,11 +1,10 @@
#
-# Translators:
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-08-20 03:25+0000\n"
-"PO-Revision-Date: 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"
@@ -431,5 +430,3 @@ msgstr ""
msgctxt "QFileSystemModel"
msgid "%1 bytes"
msgstr ""
-
-
diff --git a/src/vidalia/i18n/po/ms/vidalia_ms.po b/src/vidalia/i18n/po/ms/vidalia_ms.po
index 751d3d0..d5a0806 100644
--- a/src/vidalia/i18n/po/ms/vidalia_ms.po
+++ b/src/vidalia/i18n/po/ms/vidalia_ms.po
@@ -1,11 +1,10 @@
#
-# Translators:
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-09-07 14:40+0000\n"
-"PO-Revision-Date: 2010-12-05 20:03+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"
@@ -193,10 +192,6 @@ 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"
@@ -236,10 +231,6 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr ""
-
-msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -279,6 +270,10 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr ""
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -432,17 +427,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"
@@ -1266,44 +1270,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"
@@ -1331,10 +1342,6 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr ""
-
-msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1362,6 +1369,10 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr ""
+
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1644,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 ""
@@ -1680,10 +1663,6 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1796,10 +1775,6 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1882,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 ""
@@ -1934,82 +1897,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 ""
@@ -2057,19 +1949,39 @@ 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)"
+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"
@@ -2091,17 +2003,35 @@ msgid ""
msgstr ""
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"
@@ -2357,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"
@@ -2412,10 +2334,6 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2515,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 ""
@@ -2840,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 ""
@@ -3088,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 ""
@@ -3132,10 +3070,6 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
-msgid "Form"
-msgstr ""
-
-msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3424,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 ""
@@ -3460,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 ""
@@ -3538,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 ""
@@ -3666,6 +3646,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 ""
@@ -3759,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 ""
@@ -3812,5 +3796,3 @@ msgstr ""
msgctxt "stringutil.h"
msgid "%1 mins"
msgstr ""
-
-
diff --git a/src/vidalia/i18n/po/mt/qt_mt.po b/src/vidalia/i18n/po/mt/qt_mt.po
index 9c4d6b0..90c737e 100644
--- a/src/vidalia/i18n/po/mt/qt_mt.po
+++ b/src/vidalia/i18n/po/mt/qt_mt.po
@@ -1,11 +1,10 @@
#
-# Translators:
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-08-20 03:25+0000\n"
-"PO-Revision-Date: 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"
@@ -431,5 +430,3 @@ msgstr ""
msgctxt "QFileSystemModel"
msgid "%1 bytes"
msgstr ""
-
-
diff --git a/src/vidalia/i18n/po/mt/vidalia_mt.po b/src/vidalia/i18n/po/mt/vidalia_mt.po
index 8f615eb..8430936 100755
--- a/src/vidalia/i18n/po/mt/vidalia_mt.po
+++ b/src/vidalia/i18n/po/mt/vidalia_mt.po
@@ -1,11 +1,10 @@
#
-# Translators:
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-09-07 14:40+0000\n"
-"PO-Revision-Date: 2010-12-05 20:03+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"
@@ -193,10 +192,6 @@ 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"
@@ -236,10 +231,6 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr ""
-
-msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -279,6 +270,10 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr ""
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -432,17 +427,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"
@@ -1266,44 +1270,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"
@@ -1331,10 +1342,6 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr ""
-
-msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1362,6 +1369,10 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr ""
+
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1644,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 ""
@@ -1680,10 +1663,6 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1796,10 +1775,6 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1882,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 ""
@@ -1934,82 +1897,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 ""
@@ -2057,19 +1949,39 @@ 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)"
+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"
@@ -2091,17 +2003,35 @@ msgid ""
msgstr ""
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"
@@ -2357,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"
@@ -2412,10 +2334,6 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2515,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 ""
@@ -2840,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 ""
@@ -3088,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 ""
@@ -3132,10 +3070,6 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
-msgid "Form"
-msgstr ""
-
-msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3424,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 ""
@@ -3460,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 ""
@@ -3538,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 ""
@@ -3666,6 +3646,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 ""
@@ -3759,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 ""
@@ -3812,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 790f416..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:
-# 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"
@@ -201,7 +199,9 @@ msgctxt "QFileDialog"
msgid ""
"%1 already exists.\n"
"Do you want to replace it?"
-msgstr "%ရွိျပီးသားျဖစ္ပါသည္.\nReplace လုပ္လိုပါသလား"
+msgstr ""
+"%ရွိျပီးသားျဖစ္ပါသည္.\n"
+"Replace လုပ္လိုပါသလား"
#: qfiledialog.cpp:1690
msgctxt "QFileDialog"
@@ -209,7 +209,10 @@ msgid ""
"%1\n"
"File not found.\n"
"Please verify the correct file name was given."
-msgstr "%1\n ဖိုင္မေတြ႔ပါ.\nFile အမည္ျပန္လည္ေရးပါ။"
+msgstr ""
+"%1\n"
+" ဖိုင္မေတြ႔ပါ.\n"
+"File အမည္ျပန္လည္ေရးပါ။"
#: qdirmodel.cpp:833
msgctxt "QFileDialog"
@@ -267,14 +270,19 @@ msgid ""
"%1\n"
"Directory not found.\n"
"Please verify the correct directory name was given."
-msgstr "%1\nDirectory ကိုမေတြ႔ပါ.\nDirectory ေနရာအမွန္ကိုျပန္ေရြးေပးပါ။"
+msgstr ""
+"%1\n"
+"Directory ကိုမေတြ႔ပါ.\n"
+"Directory ေနရာအမွန္ကိုျပန္ေရြးေပးပါ။"
#: qfiledialog.cpp:2281
msgctxt "QFileDialog"
msgid ""
"'%1' is write protected.\n"
"Do you want to delete it anyway?"
-msgstr "'%1' write protect ျဖစ္ပါသည္.\nဖ်က္ခ်င္ပါသလား?"
+msgstr ""
+"'%1' write protect ျဖစ္ပါသည္.\n"
+"ဖ်က္ခ်င္ပါသလား?"
#: qfiledialog.cpp:2286
msgctxt "QFileDialog"
@@ -371,7 +379,9 @@ msgctxt "QFileSystemModel"
msgid ""
"<b>The name \"%1\" can not be used.</b><p>Try using another name, with fewer"
" characters or no punctuations marks."
-msgstr "<b> \"%1\" အမည္ကိုသံုးမရပါ။.</b><p> အျခားအမည္တစ္မ်ိဳးေရြးေပးပါ၊ စာလံုးေရေလွ်ာ့ျပီး punctuations marks မပါပဲ။"
+msgstr ""
+"<b> \"%1\" အမည္ကိုသံုးမရပါ။.</b><p> အျခားအမည္တစ္မ်ိဳးေရြးေပးပါ၊ "
+"စာလံုးေရေလွ်ာ့ျပီး punctuations marks မပါပဲ။"
#: qfilesystemmodel.cpp:832
msgctxt "QFileSystemModel"
diff --git a/src/vidalia/i18n/po/my/vidalia_my.po b/src/vidalia/i18n/po/my/vidalia_my.po
index 13690fd..a1d4a0f 100644
--- a/src/vidalia/i18n/po/my/vidalia_my.po
+++ b/src/vidalia/i18n/po/my/vidalia_my.po
@@ -5,9 +5,9 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2012-03-21 17:52+0000\n"
-"PO-Revision-Date: 2012-05-11 04:11+0000\n"
-"Last-Translator: Thura Hlaing <trhura 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"
@@ -18,92 +18,92 @@ msgstr ""
msgctxt "AboutDialog"
msgid "About Vidalia"
-msgstr "Vidalia အကြောင်း"
+msgstr "Vidalia အေၾကာင္း"
msgctxt "AboutDialog"
msgid "License"
-msgstr "လိုင်စင်"
+msgstr "လိုင္စင္"
msgctxt "AboutDialog"
msgid "Vidalia 0.2.0"
-msgstr "ဗီဒါလီယာ ၀.၂.၀"
+msgstr ""
msgctxt "AboutDialog"
msgid "Tor 0.2.0.32"
-msgstr "Tor 0.2.0.32"
+msgstr ""
msgctxt "AboutDialog"
msgid "Qt 4.4.2"
-msgstr "ကျူတီ ၄.၄.၂"
+msgstr ""
msgctxt "AdvancedPage"
msgid "'%1' is not a valid IP address."
-msgstr "'%1' သည် မှန်ကန်သည့် အိုင်ပီလိပ်စာ မဟုတ်ပါ။"
+msgstr "'%1' ဆိုသည္မွာ အိုင္ပီလိပ္စာ ပံုစံမဟုတ္ပါ"
msgctxt "AdvancedPage"
msgid ""
"You selected 'Password' authentication, but did not specify a password."
-msgstr "'စကားဝှက်' အတည်ပြုချက်ကို သင် ရွေးချယ်ခဲ့သည်။ သို့သော် စကားဝှက်ကို မသတ်မှတ်ခဲ့ပါ။"
+msgstr "'Password' ျဖင့္သာဝင္ရန္ဟုေရြးထားေသာ္လည္း၊ သင့္အေနျဖင့္ password အား မျပဳလုပ္ရေသးပါ။"
msgctxt "AdvancedPage"
msgid "Select Tor Configuration File"
-msgstr "Tor ပုံစံချမှတ်ဖိုင်ကို ရွေးချယ်ပါ။"
+msgstr "Tor ျပင္ဆင္မွဳဖိုင္အားေရြးခ်ယ္ရန္"
msgctxt "AdvancedPage"
msgid "File Not Found"
-msgstr "ဖိုင်ကို ရှာဖွေမတွေ့ရှိပါ။"
+msgstr "ဖိုင္မေတြ႔ပါ"
msgctxt "AdvancedPage"
msgid "%1 does not exist. Would you like to create it?"
-msgstr "%1 မရှိပါ။ ၎င်းဖိုင်ကို ဖန်တီးလိုပါသလား ?"
+msgstr "%1 ဆိုသည္မွာမရွိပါ။ သင္ျပဳလုပ္လိုပါသလား။"
msgctxt "AdvancedPage"
msgid "Failed to Create File"
-msgstr "ဖိုင်ဖန်တီးမှု မအောင်မြင်ပါ။"
+msgstr "ဖိုင္ျပဳလုပ္ျခင္း မရပါ"
msgctxt "AdvancedPage"
msgid "Unable to create %1 [%2]"
-msgstr " %s: %s ကို ဖန်တီး၍ မရနိုင်ပါ။"
+msgstr "%1 [%2] အားျပဳလုပ္၍မရပါ"
msgctxt "AdvancedPage"
msgid "Select a Directory to Use for Tor Data"
-msgstr "To ဒေတာအတွက် သုံးရန် ဖိုင်လမ်းကြောင်းတစ်ခုကိုရွေးချယ်ပါ။"
+msgstr "Tor ႏွင့္ပတ္သတ္ေသာ ေဒတာမ်ားအားသိမ္းဆည္းရန္ ေနရာေရြးပါ"
msgctxt "AdvancedPage"
msgid "Unable to remove Tor Service"
-msgstr "Tor ဝန်ဆောင်မှုကို ဖယ်ထုတ် မရပါ။"
+msgstr "Tor အားဖယ္ရွား၍မရပါ"
msgctxt "AdvancedPage"
msgid "Unable to install Tor Service"
-msgstr "Tor ဝန်ဆောင်မှုကို စက်တွင်းထည့်မရပါ။"
+msgstr "Tor အားထည့္သြင္း၍မရပါ"
msgctxt "AdvancedPage"
msgid "Vidalia was unable to install the Tor service."
-msgstr "Tor ဝန်ဆောင်မှုကို စက်တွင်းထည့်သွင်းရန် ဗီဒါလီယာကို မရနိုင်ပါ။"
+msgstr "Vidalia ျဖင့္ Tor အားထည့္သြင္း၍မရပါ။ ကိုယ္တိုငထည့္သြင္းရပါမည္။"
msgctxt "AdvancedPage"
msgid "Authentication:"
-msgstr "စစ်ဆေးခြင်း -"
+msgstr "စစ္းေဆးမွဳ:"
msgctxt "AdvancedPage"
msgid "Address:"
-msgstr "နေရပ်လိပ်စာ -"
+msgstr "လိပ္စာ:"
msgctxt "AdvancedPage"
msgid "None"
-msgstr "ဘာမှမရွေး"
+msgstr "မရွိ"
msgctxt "AdvancedPage"
msgid "Cookie"
-msgstr "ကွတ်ကီး"
+msgstr "ကြတ္ကီး"
msgctxt "AdvancedPage"
msgid "Password"
-msgstr "စကားဝှက်"
+msgstr "လွ်ိဳ႕ဝက္ကုဒ္"
msgctxt "AdvancedPage"
msgid "Randomly Generate"
-msgstr "ကျပန်းခေါက်၍ ထုတ်ပါ။"
+msgstr "အလွည့္က် "
msgctxt "AdvancedPage"
msgid ":"
@@ -111,105 +111,94 @@ msgstr ":"
msgctxt "AdvancedPage"
msgid "Tor Configuration File"
-msgstr "Tor ပုံစံချမှတ်ဖိုင်"
+msgstr "Tor ျပင္ဆင္ေရးဖိုင္"
msgctxt "AdvancedPage"
msgid "Start the Tor software with the specified configuration file (torrc)"
-msgstr "သတ်မှတ်ထားသည့် ပုံစံပြင်ဖိုင် (torrc) နှင့်အတူ Tor ဆော့ဖ်ဝဲလ်ကို အစပြုပါ။"
+msgstr "ေရြးထားေသာ ျပင္ဆင္မွဳဖိုင္ (torrc) ျဖင့္ Tor အားစတင္ရန္"
msgctxt "AdvancedPage"
msgid "Select path to your configuration file"
-msgstr "သင်၏ပုံစံပြင်ဖိုင်သို့ ဖိုင်လမ်းကြောင်းကို ရွေးချယ်ပါ။"
+msgstr "ျပင္ဆင္မွဳဖိုင္အတြက္ ေနရာေရြးရန္"
msgctxt "AdvancedPage"
msgid "Browse"
-msgstr "ဝင်ရောက်ရှာဖွေပါ။"
+msgstr "ၾကည့္ရန္"
msgctxt "AdvancedPage"
msgid "Data Directory"
-msgstr "ဒေတာဖိုင်လမ်းကြောင်း"
+msgstr "ေဒတာလမ္းညႊန္"
msgctxt "AdvancedPage"
msgid "Store data for the Tor software in the following directory"
-msgstr "Tor ဆော့ဝဲလ် အတွက် ဖော်ပြပါ ဖိုင်လမ်းကြောင်းထဲတွင် ဒေတာ သိမ်းပါ။"
+msgstr "Tor software ၏ေဒတာမ်ားအား ေဖာ္ျပပါ ေနရာတြင္သိမ္းပါ"
msgctxt "AdvancedPage"
msgid "Select the directory used to store data for the Tor software"
-msgstr "Tor ဆော့ဝဲလ်အတွက် ဒေတာ သိမ်းရန် အသုံးပြုသော ဖိုင်လမ်းကြောင်းကို ရွေးချယ်ပါ။"
+msgstr "ေအာက္ေဖာ္ျပပါ ေနရာအား Tor software ၏ေဒတာမ်ားသိမ္းစည္းရန္ေရြးပါ"
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 ဒိုမိန်းဆော့ကတ် (ControlSocket) အား သုံးပါ။"
+msgstr ""
msgctxt "AdvancedPage"
msgid "Edit current torrc"
-msgstr "လက်ရှိ torrc ကို ပြင်ပါ။"
+msgstr ""
msgctxt "AdvancedPage"
msgid "NOTE: this will edit the currently loaded torrc"
-msgstr "မှတ်ရန် - လက်ရှိ load လုပ်လျက်ရှိသည့် 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 ပုံစံချမှတ်ဖိုင်တည်နေရာတွင် သင်၏ လက်ရှိ ၈ ဘစ် စာလုံး ကုဒ်ပြောင်းစနစ်တွင် မဖော်ပြနိုင်သည့် စာလုံးများ ပါဝင်သည်။"
+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 "သက်ဆိုင်ရာ Tor ဒေတာ ဖိုင်လမ်းကြောင်းတည်နေရာတွင် သင်၏ လက်ရှိ ၈ ဘစ် စာမြုပ်စနစ်တွင် ဖော်ပြ၍ မရနိုင်သည့် အက္ခရာများ ပါဝင်နေသည်။"
+msgstr ""
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 ""
-"You've checked the autoconfiguration option for the ControlPort, but "
-"provided no Data Directory. Please add one, or uncheck the \"Configure "
-"ControlPort automatically\" option."
-msgstr "သင်သည် ControlPort အတွက် အလိုအလျောက်ပုံစံချမှတ်ခြင်းကို စစ်ဆေးပြီးပြီ။ သို့သော် ဒေတာဖိုင်လမ်းကြောင်းကို မထောက်ပံ့ထားပါ။ ကျေးဇူးပြု၍ ဒေတာဖိုင်လမ်းကြောင်းတစ်ခုကို ထည့်ပါ။ သို့မဟုတ် \"ControlPort ကို အလိုအလျောက် ပုံစံချမှတ်ပါ\" ဆိုသည့် ရွေးချယ်စရာကို အမှန်ခြစ်ပြန်ဖြုတ်ပါ။"
+msgstr ""
msgctxt "AdvancedPage"
msgid ""
"Vidalia was unable to remove the Tor service.\n"
"\n"
"You may need to remove it manually."
-msgstr "Tor ဝန်ဆောင်မှုကို ဖယ်ထုတ်ရန် ဗီဒါလီယာ မရနိုင်ပါ။\nကုတ်ဒင်းစနစ်ဖြင့် ဗီဒါလီယာကို ဖယ်ထုတ်ရန် လိုအပ်သည်။"
+msgstr ""
msgctxt "AppearancePage"
msgid "Language"
@@ -217,76 +206,55 @@ msgstr "ဘာသာစကား"
msgctxt "AppearancePage"
msgid "Choose the language used in Vidalia"
-msgstr "Vidalia တွင် အသုံးပြုသည့် ဘာသာစကားကို ရွေးချယ်ပါ။"
+msgstr "Vidalia တြင္သံုးရန္ ဘာသာစကားကိုေရြးပါ"
msgctxt "AppearancePage"
msgid "Style"
-msgstr "စတိုင်"
+msgstr "စတိုင္"
msgctxt "AppearancePage"
msgid "Choose Vidalia's interface style"
-msgstr "Vidalia ၏ မျက်နှာစာပုံစံဒီဇိုင်းကို ရွေးချယ်ပါ။"
+msgstr "Vidalia ေရွ႕မ်က္ႏွာစာစတိုင္အားေရြးခ်ယ္ရန္"
msgctxt "AppearancePage"
msgid "Vidalia was unable to load the selected language translation."
-msgstr "ရွေးချယ်ထားသည့် ဘာသာစကား ပြန်ဆိုမှု ကို တင် ရန် Vidalia မရနိုင်ပါ။"
-
-msgctxt "AppearancePage"
-msgid ""
-"System Icon Preferences (changes will take effect when you restart Vidalia)"
-msgstr "စနစ် အိုင်ကွန် စိတ်ကြိုက် ပြင်ဆင်ချက်များ (Vidalia ကို အစမှ ပြန်စ သောအခါ အပြောင်းအလဲများသည် အကျိုးသက်ရောက်မှု ဖြစ်သွားလိမ့်မည်။)"
-
-msgctxt "AppearancePage"
-msgid "Show the Tray Icon and Dock Icon (default)"
-msgstr "Tray အိုင်ကွန် နှင့် Dock အိုင်ကွန် တို့ကို ပြပါ။ (မူလအတိုင်း)"
-
-msgctxt "AppearancePage"
-msgid "Hide the Tray Icon"
-msgstr "Tray ပုံသင်္ကေတကို ဖျောက်ပါ။"
-
-msgctxt "AppearancePage"
-msgid "Hide the Dock Icon"
-msgstr "ဒေါက် ပုံသင်္ကေတကို ဖျောက်ပါ။"
+msgstr "Vidalia အေနျဖင့္ေရြးခ်ယ္ထားေသာ ဘာသာစကားအားေဖာ္ျပ၍မရပါ။"
msgctxt "BandwidthGraph"
msgid "Since:"
-msgstr "ကတည်းက - "
+msgstr "ကတည္းက:"
msgctxt "BandwidthGraph"
msgid "Hide Settings"
-msgstr "စနစ်ပြင်ဆင်မှုများကို ဖျောက်ပါ။"
+msgstr "Setting မ်ားအား သိမ္းထားရန္"
msgctxt "BandwidthGraph"
msgid "Show Settings"
-msgstr "စနစ်ပြင်ဆင်မှုများကို ပြပါ။"
-
-msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr "Bridge အသုံးပြုမှု အနှစ်ချုပ်"
+msgstr "Setting မ်ားအားျပရန္"
msgctxt "BandwidthGraph"
msgid "Reset"
-msgstr "မူလအတိုင်းပြန်ဖြစ်စေသည်။"
+msgstr "အစမွျပန္စရန္"
msgctxt "BandwidthGraph"
msgid "Receive Rate"
-msgstr "လက်ခံနှုန်း"
+msgstr "လက္ခံရရွိႏွဳန္း"
msgctxt "BandwidthGraph"
msgid "Send Rate"
-msgstr "ပေးပို့နှုန်း"
+msgstr "ပို႔လႊတ္ႏွဳန္း"
msgctxt "BandwidthGraph"
msgid "Always on Top"
-msgstr "အမြဲတမ်း အပေါ်ဆုံးမှာ ထားပါ။"
+msgstr "အေပၚတြင္အျမဲထားရန္"
msgctxt "BandwidthGraph"
msgid "Style"
-msgstr "စတိုင်"
+msgstr "စတိုင္"
msgctxt "BandwidthGraph"
msgid "Changes the transparency of the Bandwidth Graph"
-msgstr "မြန်နှုန်းပြဇယား၏ ပါးလွှာမှု ကို ပြောင်းလဲပါ။"
+msgstr "Bandwidth ဇယား၏ ေဖာက္ထြင္းျမင္ႏိုင္မွဳ အားေျပာင္းသည္။"
msgctxt "BandwidthGraph"
msgid "100"
@@ -294,135 +262,139 @@ msgstr "၁၀၀"
msgctxt "BandwidthGraph"
msgid "% Opaque"
-msgstr "% အလင်းဖောက်ထွင်းနှုန်း"
+msgstr "% ေဖာင္ထြင္းျမင္ေနရသည္"
msgctxt "BandwidthGraph"
msgid "Save"
-msgstr "သိမ်းထား"
+msgstr "သိမ္းရန္"
msgctxt "BandwidthGraph"
msgid "Cancel"
-msgstr "နေတော့"
+msgstr "ထြက္ရန္"
+
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr ""
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
-msgstr "HTTPS bridge တောင်းဆိုမှုကို အစပြုနေဆဲ .... "
+msgstr ""
msgctxt "BridgeDownloader"
msgid "Connecting to %1:%2..."
-msgstr "%1:%2 သို့ အင်တာနက် ချိတ်ဆက်နေဆဲ ..."
+msgstr ""
msgctxt "BridgeDownloader"
msgid "Sending an HTTPS request for bridges..."
-msgstr "bridge များအတွက် HTTPS တောင်းဆိုချက်တစ်ခုကို ပေးပို့နေဆဲ ... "
+msgstr ""
msgctxt "BridgeDownloader"
msgid "Downloading a list of bridges..."
-msgstr "Bridgeများစာရင်းကို ဒေါင်းလုပ် ပြုလုပ်နေဆဲ ..."
+msgstr ""
msgctxt "BridgeDownloaderProgressDialog"
msgid "Downloading Bridges"
-msgstr "Bridgeများကို ဒေါင်းလုတ်ပြုလုပ်ခြင်း"
+msgstr ""
msgctxt "BridgeDownloaderProgressDialog"
msgid "Unable to download bridges: %1"
-msgstr "Bridge များကို ဒေါင်းလုတ်ပြုလုပ်ရန် မရနိုင်ပါ။ - %1"
+msgstr ""
msgctxt "BridgeDownloaderProgressDialog"
msgid "Retrying bridge request..."
-msgstr "Bridge တောင်းဆိုမှုကို ထပ်မံ ကြိုးစးကြည့်နေဆဲ ..."
+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 ကတည်းက သင်၏ relay ကို အသုံးပြုခဲ့ပြီးပြီ။"
+msgstr ""
msgctxt "BridgeUsageDialog"
msgid "Bridge Usage Summary"
-msgstr "Bridge အသုံးပြုမှု အနှစ်ချုပ်"
+msgstr ""
msgctxt "BridgeUsageDialog"
msgid "Client Summary"
-msgstr "ကလိုင်းယင့် အကျဉ်းချုပ်"
+msgstr ""
msgctxt "Circuit"
msgid "New"
-msgstr "အသစ်"
+msgstr "အသစ္"
msgctxt "Circuit"
msgid "Open"
-msgstr "ဖွင့်ပါ"
+msgstr "ဖြင့္ရန္"
msgctxt "Circuit"
msgid "Building"
-msgstr "တည်ဆောက်ခြင်း"
+msgstr "တည္ေဆာက္ေနသည္"
msgctxt "Circuit"
msgid "Failed"
-msgstr "မရပါ။"
+msgstr "ျပဳလုပ္၍မရပါ"
msgctxt "Circuit"
msgid "Closed"
-msgstr "ပိတ်ထားသည်"
+msgstr "ပိတ္ထားျပီး"
msgctxt "Circuit"
msgid "Unknown"
-msgstr "အမျိုးအမည်မသိ"
+msgstr "အမ်ိဳးအမည္မသိ"
msgctxt "CircuitItem"
msgid "<Path Empty>"
-msgstr "<ဖိုင်လမ်းကြောင်း မရှိ>"
+msgstr ""
msgctxt "CircuitListWidget"
msgid "Connection"
-msgstr "အင်တာနက်ချိတ်ဆက်မှု"
+msgstr "ဆက္သြယ္မႈ"
msgctxt "CircuitListWidget"
msgid "Status"
-msgstr "အခြေအနေ"
+msgstr "အေျခအေန"
msgctxt "CircuitListWidget"
msgid "Zoom to Circuit"
-msgstr "ဆားကစ်ကို ချုံ့ချဲ့ပြုလုပ်ပါ။"
+msgstr "ပတ္လမ္းကို ျမင္ကြင္းခ်ံဳ႕/ခ်ဲ႕ ၾကည့္ရန္"
msgctxt "CircuitListWidget"
msgid "Close Circuit (Del)"
-msgstr "ဆားကစ်ကို ပိတ်ပါ။ (Del)"
+msgstr "ပတ္လမ္းကို ပိတ္ပါ (Del)"
msgctxt "CircuitListWidget"
msgid "Close Stream (Del)"
-msgstr "Stream ကို ပိတ်ပါ။ (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"
@@ -430,934 +402,946 @@ msgstr "အကူအညီ"
msgctxt "ConfigDialog"
msgid "Error Saving Settings"
-msgstr "စနစ်ပြင်ဆင်မှုများကို သိမ်းရာ၌ ချို့ယွင်းချက် ဖြစ်ပွားနေသည်။"
+msgstr "setting မ်ားသိမ္းရာတြင္ error တတ္သည္"
msgctxt "ConfigDialog"
msgid "Vidalia was unable to save your %1 settings."
-msgstr "သင်၏ %l စနစ်ပြောင်းလဲမှုများကို သိမ်းရန် Vidalia မရနိုင်ပါ။"
+msgstr "Vidalia အေနျဖင့္သင့္ %1 setting မ်ားအားမသိမ္းႏိုင္ပါ။"
msgctxt "ConfigDialog"
msgid "Error Applying Settings"
-msgstr "စနစ်ပြင်ဆင်မှုများကို ပြုလုပ်ရာ၌ ချို့ယွင်းချက်များ ဖြစ်ပွားသည်။"
+msgstr "setting မ်ားသိမ္းရာတြင္ error တတ္သည္"
msgctxt "ConfigDialog"
msgid "Vidalia was unable to apply your %1 settings to Tor."
-msgstr "Tor သို့ သင်၏ %1 စနစ်ပြောင်းလဲမှုများကို သိမ်းရန် Vidalia မရနိုင်ပါ။"
+msgstr "Vidalia အေနျဖင့္သင့္ Tor %1 setting မ်ားအားမသိမ္းႏိုင္ပါ။"
msgctxt "ConfigDialog"
msgid "Settings"
-msgstr "စနစ်ပြင်ဆင်မှုများ"
+msgstr "ထိန္းညိွမွဳ (setting)"
msgctxt "ControlConnection"
msgid "Vidalia was unable to connect to Tor. (%1)"
-msgstr "Tor ကို ချိန်ဆက်ရန် Vidalia မရနိုင်ပါ။ (%l)"
+msgstr "Vidalia အေနျဖင့္ Tor အားခ်ိတ္ဆက္လို႔မရပါ။ (%1)"
msgctxt "ControlConnection"
msgid "Control socket is not connected."
-msgstr "ထိန်းချုပ်ဆော့ကတ်ကို မချိတ်ဆက်ထားပါ။"
+msgstr "ထိန္းခ်ဳပ္မွဳ socket အားခ်ိတ္ဆက္၍မရပါ။"
msgctxt "ControlPasswordInputDialog"
-msgid "Password Required"
-msgstr "စကားဝှက်လိုအပ်သည်"
+msgid "Problem connecting to Tor"
+msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Remember my password"
-msgstr "_L ထွက်တဲ့အထိ စကားဝှက်ကို မှတ်ထားပါ"
+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:"
-msgstr "Vidalia သည့် Tor၏လုပ်ဆောင်ချက်များအားချိတ်ဆက်ရာတွင်စကားဝှက်များလိုအပ်နေသည့် ။ သင့်၏ ထိန်းချုပ်စကားဝှက်အား ထည့်သွင်းပါ ။"
+"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"
msgid "Control socket is not connected."
-msgstr "ထိန်းချုပ်ဆော့ကတ်ကို မချိတ်ဆက်ထားပါ။"
+msgstr "ထိန္းခ်ဳပ္မွဳ socket အားမခ်ိတ္ဆက္ထားပါ။"
msgctxt "ControlSocket"
msgid "Error sending control command. [%1]"
-msgstr "ထိန်းချုပ် ကွန်းမန်းစာသားကို ပို့ရာ၌ ချို့ယွင်းချက် ရှိနေသည်။ [%1]"
+msgstr "control command ပို႔ရာတြင္ အယ္ရာတတ္သည္။ [%1]"
msgctxt "ControlSocket"
msgid "Socket disconnected while attempting to read a line of data."
-msgstr "ဒေတာတစ်သီတစ်တန်းကို ဖတ်ရန် ကြိုးစားနေစဉ်တွင် ဆော့ကတ် ချိတ်ဆက်မှု မရခဲ့ပါ။"
+msgstr "ေဒတာတစ္ေၾကာင္းအားဖတ္ရန္ၾကိဳးစားရာတြင္ Socket ခ်ိတ္ဆက္မွဳျပတ္သြားသည္။"
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 "Sri Lanka"
+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 "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 "ကျေးဇူးပြု၍ လက်မှတ်တစ်စောင်ကို ဖြည့်ပါ။"
+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 "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."
-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:"
-msgstr "အသုံးချဆော့ဖ်ဝဲလ် ပျက်မသွားခင်က သင်လုပ်နေခဲ့သည်ကိုဖော်ပြချက်နှင့်အတူ ဆော့ဖ်ဝဲလ်ပျက်ကြောင်းပြအစီရင်ခံစာနှင့်အလားတူဖြစ်သည့် ဖော်ပြပါဖိုင်များနှင့်အတူ -"
+msgctxt "CrashReportUploader"
+msgid "Receiving response..."
+msgstr ""
msgctxt "GeneralPage"
msgid "Executables (*.exe)"
-msgstr "ပရိုဂရမ်အစပြုစရာများ (*.exe)"
+msgstr "exe ဖုိင္မ်ား"
msgctxt "GeneralPage"
msgid "Select Path to Tor"
-msgstr "Tor သို့ သွားရာ ဖိုင်လမ်းကြောင်းကို ရွေးချယ်ပါ။"
+msgstr "Tor အတြက္လမ္းေၾကာင္းေရြးခ်ယ္ရန္"
msgctxt "GeneralPage"
msgid "Select Proxy Executable"
-msgstr "ပရောင်ဇီအမျိုးအစားကို ရွေးချယ်ရမည်။"
+msgstr "လုပ္ေဆာင္ႏုိင္ေသာ Proxy ကုိ ေရြးခ်ယ္ပါ"
msgctxt "GeneralPage"
msgid "You must specify the name of your Tor executable."
-msgstr "သင်၏ Tor ပရိုဂရမ်အစပြုစရာ၏ အမည် ကို သတ်မှတ်ရမည်။"
+msgstr "သင္၏ လုပ္ေဆာင္ႏိုင္ေသာ Tor ကုိ အမည္ သတ္မွတ္ေပးပါ"
msgctxt "GeneralPage"
msgid "Start Vidalia when my system starts"
-msgstr "စနစ်တက်လာသောအခါ Vidalia ကို အစပြုပါ။"
+msgstr "Vidalia ကုိ စနစ္စတင္ခ်ိန္တြင္ စတင္ပါ"
msgctxt "GeneralPage"
msgid "Browse"
-msgstr "ဝင်ရောက်ရှာဖွေပါ။"
-
-msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr "စနစ်တက်လာသောအခါ Vidalia ကို အစပြုပါ။"
+msgstr "Browse"
msgctxt "GeneralPage"
msgid "Tor"
@@ -1365,95 +1349,99 @@ msgstr "Tor"
msgctxt "GeneralPage"
msgid "Proxy Application (optional)"
-msgstr "_F ဖိုဒါ လမ်းကြောင်း (မရွေးလည်းရ):"
+msgstr "Proxy Application (ေရြးခ်ယ္ႏုိင္ပါသည္)"
msgctxt "GeneralPage"
msgid "Start a proxy application when Tor starts"
-msgstr "Tor စတင်လျှင် ပရောက်ဆီ အပလီကေးရှင်းအားစပါ"
+msgstr "Proxy application ကို Tor စတင္ခ်ိန္တြင္ စတင္ပါ"
msgctxt "GeneralPage"
msgid "Proxy Application Arguments:"
-msgstr "ဤအပ္ပလီကေးရှင်းကို ဘာသာပြန်ရန်..."
+msgstr "Proxy Application ၏အခ်က္အလက္မ်ား :"
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 "%1 KB/s"
msgctxt "GraphFrame"
msgid "%1 KB"
-msgstr "%1 ကီလိုဘိုက်"
+msgstr "%1 KB"
msgctxt "GraphFrame"
msgid "%1 MB"
-msgstr "တစ်စက္ကန့်လျှင် %1 မဂ္ဂါဘိုက်"
+msgstr "%1 MB"
msgctxt "GraphFrame"
msgid "%1 GB"
-msgstr "တစ်စက္ကန့်လျှင် %1 ဂစ်ဂါဘိုက်"
+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."
-msgstr "ဖြည့်သွင်းသည့် XML ဖိုင်သည် စစ်မှန်သော အကြောင်းအရာများ စာရွက်စာတမ်းတစ်ခု မဟုတ်ပါ။"
+msgstr "ေပးထားေသာ XML ဖိုင္သည္ မွန္ကန္ေသာ ဖိုင္ပံုစံမဟုတ္ပါ။"
msgctxt "HelpBrowser"
msgid "Search reached end of document"
-msgstr "ရှာဖွေမှုသည် စာရွက်စာတမ်း၏ အဆုံးထိ ရောက်သွားသည်။"
+msgstr "ရွာေဖြမွဳျပီးဆံုးသည္"
msgctxt "HelpBrowser"
msgid "Search reached start of document"
-msgstr "ရှာဖွေမှုသည် စာရွက်စာတမ်း၏ အစသို့ ရောက်သွားသည်။"
+msgstr "ရွာေဖြမွဳစတင္သည္"
msgctxt "HelpBrowser"
msgid "Text not found in document"
-msgstr "စာရွက်စာတမ်းထဲတွင် စာသားကို ရှာမတွေ့ပါ။"
+msgstr "စာသားရွာမေတြ႔ပါ"
msgctxt "HelpBrowser"
msgid "Found %1 results"
-msgstr "ရလဒ် %1 ခု ကို ရှာဖွေတွေ့ရှိခဲ့သည်။"
+msgstr "ရလဒ္ %1 ေတြ႔သည္"
msgctxt "HelpBrowser"
msgid "Vidalia Help"
-msgstr "Vidalia အကူအညီ"
+msgstr "Vadalia အကူ"
msgctxt "HelpBrowser"
msgid "Back"
-msgstr "နောက်သို့"
+msgstr "ေနာက္သို႔"
msgctxt "HelpBrowser"
msgid "Move to previous page (Backspace)"
-msgstr "ယခင် စာမျက်နှာ သို့ ရွေ့ပါ။ (Backspace)"
+msgstr "ယခင္စာမ်က္ႏွာသို႔သြားပါ (Backspace)"
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 "ေနာက္ထပ္စာမ်က္ႏွာတစ္ခုသို႕ သြားပါ (Shict+Backspace)"
msgctxt "HelpBrowser"
msgid "Shift+Backspace"
@@ -1461,11 +1449,11 @@ msgstr "Shift+Backspace"
msgctxt "HelpBrowser"
msgid "Home"
-msgstr "အိမ်လိပ်စာ"
+msgstr "မူလစာမ်က္ႏွာ"
msgctxt "HelpBrowser"
msgid "Move to the Home page (Ctrl+H)"
-msgstr "မူလစာမျက်နှာသို့ ရွေ့ပါ။ (Ctrl+H)"
+msgstr "မူလစာမ်က္ႏွာသို႕ သြားပါ (Ctrl+H)"
msgctxt "HelpBrowser"
msgid "Ctrl+H"
@@ -1473,11 +1461,11 @@ msgstr "Ctrl+H"
msgctxt "HelpBrowser"
msgid "Find"
-msgstr "ရှာ"
+msgstr "ရွာေဖြရန္"
msgctxt "HelpBrowser"
msgid "Search for a word or phrase on current page (Ctrl+F)"
-msgstr "လက်ရှိစာမျက်နှာပေါ်ရှိ စကားလုံး (သို့) စကားစု တစ်ခုခု အတွက် ရှာပါ။ (Ctrl+F)"
+msgstr "စာလံုးတစ္ခု သို႕မဟုတ္ စာစုတစ္ခုကုိ လက္ရွိစာမ်က္ႏွာတြင္ ရွာေဖြရန္ (Ctrl+F)"
msgctxt "HelpBrowser"
msgid "Ctrl+F"
@@ -1485,11 +1473,11 @@ msgstr "Ctrl+F"
msgctxt "HelpBrowser"
msgid "Close"
-msgstr "ပိတ်သိမ်း"
+msgstr "ပိတ္ပါ"
msgctxt "HelpBrowser"
msgid "Close Vidalia Help"
-msgstr "Vidalia အကူအညီကို ပိတ်ပါ။"
+msgstr "Vidalia အကူအညီကုိ ပိတ္ပါ"
msgctxt "HelpBrowser"
msgid "Esc"
@@ -1497,168 +1485,168 @@ msgstr "Esc"
msgctxt "HelpBrowser"
msgid "Find:"
-msgstr "ရှာဖွေ -"
+msgstr "ရွာပါ:"
msgctxt "HelpBrowser"
msgid "Find Previous"
-msgstr "နောက်ပြန် ရှာ"
+msgstr "ေရွ႕သို႕ ျပန္ရွာရန္"
msgctxt "HelpBrowser"
msgid "Find Next"
-msgstr "ရှေ့ဆက် ရှာ"
+msgstr "ေနာက္ထပ္ရွာေဖြရန္"
msgctxt "HelpBrowser"
msgid "Case sensitive"
-msgstr "စာလုံးအကြီးအသေး ရွေးသည်။"
+msgstr "စာလံုးအၾကီးအသးႏွင့္အတိအက်"
msgctxt "HelpBrowser"
msgid "Whole words only"
-msgstr "စကားလုံးတစ်ခုလုံးသာလျှင်"
+msgstr "စာသားတစ္ခုလံုးႏွင့္သာ"
msgctxt "HelpBrowser"
msgid "Help Topics"
-msgstr "အကူအညီပေး ခေါင်းစဉ်များ"
+msgstr "ကူညီမႈ အေၾကာင္းအရာမ်ား"
msgctxt "HelpBrowser"
msgid "Contents"
-msgstr "မာတိကာ"
+msgstr "ပါဝင္သည့္ အခ်က္အလက္မ်ား"
msgctxt "HelpBrowser"
msgid "Search"
-msgstr "ရှာဖွေ"
+msgstr "ရွာေဖြပါ"
msgctxt "HelpBrowser"
msgid "Searching for:"
-msgstr "ရှာဖွေလိုသည်မှာ - "
+msgstr "ရွာေဖြရန္ :"
msgctxt "HelpBrowser"
msgid "Found Documents"
-msgstr "ရှာဖွေတွေ့ရှိသည့် စာရွက်စာတမ်းများ"
+msgstr "ေတြ႕ရိွသည့္ စာရြက္စာတမ္းမ်ား"
msgctxt "HelpBrowser"
msgid "Error Loading Help Contents:"
-msgstr "အကူအညီ အကြောင်းအရာများကို ရယူနေစဉ် ချို့ယွင်းချက် ဖြစ်ပွားသည် -"
+msgstr ""
msgctxt "HelpTextBrowser"
msgid "Opening External Link"
-msgstr "ပြင်ပချိတ်ဆက်လင့်ကို ဖွင့်ခြင်း"
+msgstr "ျပင္ပ ခ်ိတ္ဆက္မႈကုိ ဖြင့္လွစ္ျခင္း"
msgctxt "HelpTextBrowser"
msgid ""
"Vidalia can open the link you selected in your default Web browser. If your "
"browser is not currently configured to use Tor then the request will not be "
"anonymous."
-msgstr "Vidalia "
+msgstr "Vidalia သည္ သင္ေရြးခ်ယ္ထားေသာ ခ်ိတ္ဆက္မႈကို ပံုေသ Web browser တြင္ ဖြင့္လွစ္ႏိုင္ပါသည္။ အကယ္၍ သင္၏ browser သည္ Tor အသံုးျပဳရန္ ျပင္ဆင္သတ္မွတ္ထားျခင္း မရွိပါက ေတာင္းဆုိမႈသည္ အမည္မသိ ျဖစ္ႏုိင္မည္ မဟုတ္ပါ"
msgctxt "HelpTextBrowser"
msgid "Do you want Vidalia to open the link in your Web browser?"
-msgstr "သင်သည် Vidalia ကို သင်၏ ဝဘ်ဘ်ဘရော့ဇာတွင် ချိတ်ဆက်လင့်ကို ဖွင့်စေချင်သလား?"
+msgstr "Vidalia မွ သင္၏ web browser တြင္ ခ်ိတ္ဆက္မႈကုိ ဖြင့္လွစ္ေစလုိပါသလား ?"
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 မရနိုင်ပါ။ သင်သည် URL ဝက်ဘ်လမ်းကြောင်းကို ကူးယူနိုင်ပြီး သင်၏ ဝက်ဘ်ဘရောင့်ဖာတွင် ကူးထည့်နိုင်သေးသည်။"
+msgstr "Vidalia သည္ သင္ေရြးခ်ယ္ထားေသာ ခ်ိတ္ဆက္မႈကို Web browser တြင မဖြင့္လွစ္ႏုိင္ပါ။ URL ကုိ သင္၏ browser တြင္ ေကာ္ပီကူးယူ ျပန္ပြားယူႏိုင္ေသးပါသည္။"
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 "Debug"
msgctxt "LogEvent"
msgid "Info"
-msgstr "သတင်း"
+msgstr "သတင္းအခ်က္အလက္"
msgctxt "LogEvent"
msgid "Notice"
-msgstr "သတိပြုရန်"
+msgstr "သတိျပဳရန္"
msgctxt "LogEvent"
msgid "Warning"
-msgstr "သတိပြုရန်"
+msgstr "သတိေပးခ်က္"
msgctxt "LogEvent"
msgid "Error"
-msgstr "ချို့ယွင်းချက်"
+msgstr "မွားယြင္းမႈ"
msgctxt "LogEvent"
msgid "Unknown"
-msgstr "အမျိုးအမည်မသိ"
+msgstr "အမည္မသိ"
msgctxt "LogTreeItem"
msgid "Debug"
-msgstr "အမှားစစ်"
+msgstr ""
msgctxt "LogTreeItem"
msgid "Info"
-msgstr "သတင်း"
+msgstr ""
msgctxt "LogTreeItem"
msgid "Notice"
-msgstr "သတိပြုရန်"
+msgstr ""
msgctxt "LogTreeItem"
msgid "Warning"
-msgstr "သတိပြုရန်"
+msgstr ""
msgctxt "LogTreeItem"
msgid "Error"
-msgstr "ချို့ယွင်းချက်"
+msgstr ""
msgctxt "LogTreeItem"
msgid "Unknown"
-msgstr "အမျိုးအမည်မသိ"
+msgstr ""
msgctxt "MainWindow"
msgid "Start Tor"
-msgstr "Tor ကို အစပြုပါ။"
+msgstr "Tor ကုိ စတင္ပါ"
msgctxt "MainWindow"
msgid "Exit"
-msgstr "ထွက်ပါ။"
+msgstr "ထြက္ပါ"
msgctxt "MainWindow"
msgid "Bandwidth Graph"
-msgstr "ဘန်ဝင့် ဂရပ်ဖ်"
+msgstr "Bandwidth ျပ ဇယားပံု"
msgctxt "MainWindow"
msgid "Message Log"
-msgstr "သတင်းလွှာ မှတ်တမ်း"
+msgstr "သတင္းေပးပို႕မႈ မွတ္တမ္း"
msgctxt "MainWindow"
msgid "Network Map"
-msgstr "ကွန်ယက်ပြ မြေပုံ"
+msgstr "Netowrk ေျမပံု"
msgctxt "MainWindow"
msgid "Control Panel"
-msgstr "ထိန်းချုပ်မှုနေရာ"
+msgstr "ထိန္းခ်ဳပ္ရာေနရာ"
msgctxt "MainWindow"
msgid "Settings"
-msgstr "စနစ်ပြင်ဆင်မှုများ"
+msgstr "ခ်ိန္ညိႇမႈမ်ား"
msgctxt "MainWindow"
msgid "About"
-msgstr "အကြောင်း"
+msgstr "အေၾကာင္းအရာ"
msgctxt "MainWindow"
msgid "Help"
@@ -1666,35 +1654,7 @@ msgstr "အကူအညီ"
msgctxt "MainWindow"
msgid "New Identity"
-msgstr "မတူညီမှုများကိုခွဲခြားပါ။"
-
-msgctxt "MainWindow"
-msgid "Ctrl+T"
-msgstr "Ctrl+T"
-
-msgctxt "MainWindow"
-msgid "Ctrl+B"
-msgstr "Ctrl+H"
-
-msgctxt "MainWindow"
-msgid "Ctrl+L"
-msgstr "Ctrl+H"
-
-msgctxt "MainWindow"
-msgid "Ctrl+N"
-msgstr "Ctrl+H"
-
-msgctxt "MainWindow"
-msgid "Ctrl+?"
-msgstr "Ctrl+H"
-
-msgctxt "MainWindow"
-msgid "Ctrl+I"
-msgstr "Ctrl+H"
-
-msgctxt "MainWindow"
-msgid "Ctrl+P"
-msgstr "Ctrl+H"
+msgstr "ကုိယ္ပိုင္အမွတ္အသားအသစ္"
msgctxt "MainWindow"
msgid "Tor"
@@ -1702,479 +1662,415 @@ msgstr "Tor"
msgctxt "MainWindow"
msgid "View"
-msgstr "မြင်ကွင်း"
-
-msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr "Vidalia အကူအညီ"
+msgstr "ၾကည့္ရႈရန္"
msgctxt "MainWindow"
msgid "Error starting web browser"
-msgstr "Web Browser အတွင်း၌ ရုပ်သံဖွင့်ရာတွင် ပြဿနာရှိနေသည်"
+msgstr "Web browser စတင္ရာတြင္ မွားယြင္းမႈ"
msgctxt "MainWindow"
msgid "Vidalia was unable to start the configured web browser"
-msgstr "ဘရောက်ဆာအား Vidalia အတွက်ပြင်ထားသည့်မှာ မစတင်နိုင်သေးပါ"
+msgstr "Vidalia မွ ျပင္ဆင္သတ္မွတ္ထားေသာ Web browser ကို မစတင္ႏုိင္ပါ"
msgctxt "MainWindow"
msgid "Error starting IM client"
-msgstr " IM ကလိုင်းရင့်စတင်ရာတွင်ပြသနာရှိနေသည်"
+msgstr "IM client ကုိ စတင္ရာတြင္ မွားယြင္းမႈ"
msgctxt "MainWindow"
msgid "Vidalia was unable to start the configured IM client"
-msgstr "Vidalia သည်IM Clientအားပြင်မှု့အားစတင်ရန် မတတ်နိုင်ပါ"
+msgstr "Vidalia သည္ ျပင္ဆင္သတ္မွတ္ထားေသာ IM client ကုိ မစတင္ႏုိင္ပါ"
msgctxt "MainWindow"
msgid "Error starting proxy server"
-msgstr "ဆာဗာသို့ချိတ်ဆက်ရာတွင် ချို့ယွင်းချက် ရှိနေသည်။"
+msgstr "Proxy server စတင္ရာတြင္ မွားယြင္းမႈ"
msgctxt "MainWindow"
msgid "Vidalia was unable to start the configured proxy server"
-msgstr "Vidalia ပရောက်ဆီဆာဗာအားပြင်ဆင်မှု့ မစတင်နိုင်ပါ"
+msgstr "Vidalia သည္ ျပင္ဆင္သတ္မွတ္ထားေသာ Proxy server ကို မစတင္ႏုိင္ပါ"
msgctxt "MainWindow"
msgid "Connecting to a relay directory"
-msgstr "Relay ဖိုင်လမ်းကြောင်းသို့ အင်တာနက်ချိတ်ဆက်ခြင်း"
+msgstr "Relay directory ကုိ ဆက္သြယ္ေနပါသည္"
msgctxt "MainWindow"
msgid "Establishing an encrypted directory connection"
-msgstr "စာဝှက်ထားသည့် ဖိုင်လမ်းကြောင်းချိတ်ဆက်မှုတစ်ခု တည်ဆောက်ခြင်း"
+msgstr "Encrypt ျပဳလုပ္ထားေသာ Directory ဆက္သြယ္မႈ တစ္ခုကုိ ထုတ္လႊတ္ေနပါသည္။"
msgctxt "MainWindow"
msgid "Retrieving network status"
-msgstr "နက်ဝက်အခြေအနေကို ရယူခြင်း"
+msgstr "Network အေျခအေနကို ျပန္လည္ ရယူေနပါသည္"
msgctxt "MainWindow"
msgid "Loading network status"
-msgstr "နက်ဝက်အခြေအနေကို ဆွဲတင်ခြင်း"
+msgstr "Network အေျခအေနကုိ တင္ယူေနပါသည္"
msgctxt "MainWindow"
msgid "Loading authority certificates"
-msgstr "လုပ်ပိုင်ခွင့်အသိအမှတ်ပြုလွှာများကို ခေါ်ယူခြင်း"
+msgstr "မွန္ကန္ေၾကာင္းစစ္ေဆးအသိအမွတ္ျပဳမႈ တင္ယူေနပါသည္"
msgctxt "MainWindow"
msgid "Requesting relay information"
-msgstr "Relay"
+msgstr "Relay သတင္းအခ်က္အလက္မ်ား ေတာင္းဆိုေနပါသည္"
msgctxt "MainWindow"
msgid "Loading relay information"
-msgstr "Relay သတင်းအချက်အလက်များကို ဆွဲယူခြင်း"
+msgstr "Relay သတင္းအခ်က္အလက္မ်ား တင္ယူေနပါသည္"
msgctxt "MainWindow"
msgid "Connecting to the Tor network"
-msgstr "Tor နက်ဝက်သို့ ချိတ်ဆက်ခြင်း"
+msgstr "Tor Network ကို ဆက္သြယ္ေနပါသည္"
msgctxt "MainWindow"
msgid "Establishing a Tor circuit"
-msgstr "Tor ဆားကစ်တစ်ခုကို တည်ဆောက်ခြင်း"
+msgstr "Tor ပတ္လမ္းတစ္ခု ထုတ္လႊတ္ေနပါသည္"
msgctxt "MainWindow"
msgid "Connected to the Tor network!"
-msgstr "Tor နက်ဝက်သို့ ချိတ်ဆက်မိပြီ !"
+msgstr "Tor Network သို႕ ခ်ိတ္ဆက္မႈရပါသည္ !"
+
+msgctxt "MainWindow"
+msgid "Unrecognized startup status"
+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 "Host သုိ႕ လမ္းေၾကာင္းမရွိပါ"
msgctxt "MainWindow"
msgid "insufficient resources"
-msgstr "မလုံလောက်သည့် အရင်းအမြစ်များ"
+msgstr "အရင္းအျမစ္မ်ား မလံုေလာက္ပါ"
msgctxt "MainWindow"
msgid "unknown"
-msgstr "အမျိုးအမည်မသိ"
+msgstr "မသိႏိုင္ေသာ"
msgctxt "MainWindow"
msgid "Tor is not running"
-msgstr "Tor အလုပ်မလုပ်ဆောင်ပါ။"
+msgstr "Tor အလုပ္လုပ္မေနပါ"
msgctxt "MainWindow"
msgid "Tor is shutting down"
-msgstr "Tor ကို ပိတ်နေဆဲ"
-
-msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr "%s လိုင်းပြင်ရောက်နေသည်"
+msgstr "Tor ပိတ္သိမ္းေနပါသည္"
msgctxt "MainWindow"
msgid "Stop Tor"
-msgstr "Tor ကို ရပ်ပါ။"
+msgstr "Tor ကုိ ရပ္တန္႕ပါ"
msgctxt "MainWindow"
msgid "Starting the Tor software"
-msgstr "Tor ဆော့ဖ်ဝဲလ် အစပြုခြင်း"
+msgstr "Tor ေဆာ့ဝဲ စတင္ေနပါသည္"
msgctxt "MainWindow"
msgid "Starting Tor"
-msgstr "Tor အစပြုခြင်း"
+msgstr "Tor ေဆာ့ဝဲ စတင္ေနပါသည္"
msgctxt "MainWindow"
msgid "Error Starting Tor"
-msgstr "Tor အစပြုရာ၌ ချို့ယွင်းချက် ရှိနေသည်။"
+msgstr "Tor စတင္မႈ ခ်ဳိ႕ယြင္းေနပါသည္"
msgctxt "MainWindow"
msgid ""
"Vidalia was unable to start Tor. Check your settings to ensure the correct "
"name and location of your Tor executable is specified."
-msgstr "Vidalia သ"
+msgstr "Vidalia သည္ Tor ကုိ မ စတင္ႏုိင္ပါ။ သင္၏ လုပ္ေဆာင္ႏုိင္ေသာ Tor ၏ မွန္ကန္ေသာ အမည္ႏွင့္ ေနရာကို ခ်ိန္ညိႇထားေၾကာင္း ေသခ်ာေစရန္ စစ္ေဆးပါ။"
msgctxt "MainWindow"
msgid "Connecting to Tor"
-msgstr "Tor ကို အင်တာနက်ချိတ်ဆက်ခြင်း"
+msgstr "Tor သို႕ ဆက္သြယ္ေနပါသည္"
msgctxt "MainWindow"
msgid "Connection Error"
-msgstr "အင်တာနက်ချိတ်ဆက်မှုချို့ယွင်းချက်"
+msgstr "ဆက္သြယ္မႈ ခ်ိဳ႕ယြင္းေနပါသည္"
msgctxt "MainWindow"
msgid "Relaying is Enabled"
-msgstr "Relay ပြုလုပ်ခြင်းကို ရစေရန် ပြုလုပ်သည်။"
+msgstr "Relaying လုပ္ေဆာင္ႏုိင္ပါသည္"
msgctxt "MainWindow"
msgid "Error Shutting Down"
-msgstr "စက်ပိတ်ရာ၌ ချို့ယွင်းချက် ရှိသည်။"
+msgstr "ပိတ္သိမ္းမႈ ခ်ဳိ႕ယြင္းေနပါသည္"
msgctxt "MainWindow"
msgid "Vidalia was unable to stop the Tor software."
-msgstr "Tor ဆော့ဝဲလ်ကို ရပ်တန့်ရန် Vidalia မရနိုင်ပါ။"
+msgstr "Vidalia သည္ Tor ေဆာ့ဝဲကို မရပ္တန္႕ႏိုင္ပါ"
msgctxt "MainWindow"
msgid "Unexpected Error"
-msgstr "ထင်မှတ်မထားသော ချို့ယွင်းချက်"
+msgstr "မေမွ်ာ္မွန္းႏိုင္ေသာ ခ်ိဳ႕ယြင္းခ်က္"
msgctxt "MainWindow"
msgid "Authenticating to Tor"
-msgstr "Tor သို့ အထောက်အထားပြခြင်း"
+msgstr "Tor သို႕ မွန္ကန္ေၾကာင္း အစစ္ေဆးခံေနပါသည္"
msgctxt "MainWindow"
msgid "Cookie Authentication Required"
-msgstr "ကွတ်ကီး အထောက်အထားပြခြင်း လိုအပ်သည်။"
+msgstr "မွန္ကန္ေၾကာင္း Cookie လိုအပ္ပါသည္"
msgctxt "MainWindow"
msgid ""
"The Tor software requires Vidalia to send the contents of an authentication "
"cookie, but Vidalia was unable to find one."
-msgstr "အထောက်အထားပြကွတ်ကီး၏ပါဝင်သည့် အကြောင်းအရာများကို ပို့လွှတ်ရန် Tor ဆော့ဖ်ဝဲလ်သည် Vidalia ကို လိုအပ်သည်။ သို့သော် Vidalia သည် အထောက်အထားပြကွတ်ကီးတစ်ခုကိုပင် ရှာမတွေ့ချေ။"
+msgstr "Tor ေဆာ့ဝဲသည္ Vidalia ေဆာ့ဝဲကုိ မွန္ကန္ေၾကာင္း cookie မ်ား ပို႕လႊတ္ရန္ လိုအပ္ပါသည္။ သို႕ေသာ္ Vidalia ရွာေဖြမေတြ႕ရွိႏုိင္ပါ"
msgctxt "MainWindow"
msgid "Would you like to browse for the file 'control_auth_cookie' yourself?"
-msgstr "'control_auth_cookie' ဖိုင်အတွက် သင့်ဘာသာသင် ၀င်ရောက်ကြည့်ရှုလိုပါသလား?"
+msgstr "သင္ 'control_auth_cookie' ဖိုင္ကုိ မိမိဘာသာ ရွာေဖြႏုိင္ပါသလား ?"
msgctxt "MainWindow"
msgid "Data Directory"
-msgstr "ဒေတာဖိုင်လမ်းကြောင်း"
+msgstr "ေဒတာ Directory"
msgctxt "MainWindow"
msgid "Control Cookie (control_auth_cookie)"
-msgstr "ကွတ်ကီးကို ထိန်းချုပ်ပါ။ (control_auth_cookie)"
+msgstr "Control Cookie (control_auth_cookie)"
msgctxt "MainWindow"
msgid "Error Registering for Events"
-msgstr "ဖြစ်ရပ်များအတွက် မှတ်ပုံတင်ရာ၌ ချို့ယွင်းချက် ရှိသည်။"
+msgstr "Events အတြက္ မွတ္ပံုတင္မႈ ခ်ိဳ႕ယြင္းခ်က္"
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 "Tor ဆော့ဝဲလ်ကို ရပ်တန့်ရန် Vidalia မရနိုင်ပါ။"
-
-msgctxt "MainWindow"
-msgid "Please check your control port authentication settings."
-msgstr "သင်၏ထိမ်းချုပ်ပေါက်၏ စစ်မှန်မှု့ဆက်တင်အား စစ်ဆေးပါ"
+msgstr "Vidalia အခ်ိဳ႕ event မ်ားအတြက္ မွတ္ပံုတင္မႈ မျပဳလုပ္ႏိုင္ပါ။ Vidalia ၏ လုပ္ေဆာင္ႏုိင္မႈမ်ား မရရွိႏုိင္ပါ"
msgctxt "MainWindow"
msgid "Tor Update Available"
-msgstr "Tor အဆင့်မြှင့်တင်မှု ရနိုင်သည်။"
+msgstr "Tor အသစ္ျဖည့္သြင္းခ်က္မ်ား ရရွႏုိင္ပါျပီ"
msgctxt "MainWindow"
msgid ""
"The currently installed version of Tor is out of date or no longer "
"recommended. Please visit the Tor website to download the latest version."
-msgstr "လက်ရှိစက်သွင်းထည့်သွင်းထားသည့် Tor ဗားရှင်းသည် သက်တမ်းကုန်သည်။ သို့မဟုတ် နောက်ထပ် အကြံပြုတော့မည် မဟုတ်ပါ။ နောက်ဆုံးဗားရှင်းကို ဒေါင်းလုတ်ပြုလုပ်ရန် Tor ဝက်ဘ်ဆိုက်သို့ ကျေးဇူးပြု၍ သွားပါ။"
+msgstr "လက္ရွိ ထည့္သြင္းထားေသာ Tor ေဆာ့ဝဲသည္ ေခတ္မမီ၊ သို႕မဟုတ္ ထပ္မံ အၾကံဳျပဳ မေထာက္ခံေတာ့ပါ။ ေက်းဇူးျပဳ၍ Tor ဝက္ဘ္ဆုိက္သို႕ သြား၍ ေနာက္ဆံုး version ကို ေဒါင္းလုဒ္လုပ္ပါ။"
msgctxt "MainWindow"
msgid "Tor website: %1"
-msgstr "Tor ဝက်ဘ်ဆိုက် - %1"
+msgstr "Tor ဝက္ဘ္ဆိုက္ : %1"
msgctxt "MainWindow"
msgid ""
"All subsequent connections will appear to be different than your old "
"connections."
-msgstr "နောက်ပိုင်းအင်တာနက်ချိတ်ဆက်မှုများအားလုံးသည် သင်၏ ယခင် အင်တာနက်ချိတ်ဆက်မှု အဟောင်းများနှင့် မတူကွဲပြားခြားနားသည်ဟု ထင်ရလိမ့်မည်။"
+msgstr "ေနာက္ပိုင္း ဆက္သြယ္မႈ အားလံုးသည္ ဆက္သြယ္မႈအေဟာင္းမ်ားႏွင့္ ျခားနားပါလိမ့္မည္။"
msgctxt "MainWindow"
msgid "Failed to Create New Identity"
-msgstr "အထောက်အထားအသစ် ဖန်တီးရန် မအောင်မြင်ပါ။"
+msgstr "ကုိယ္ပိုင္ အမွတ္အသားအသစ္ ဖန္တီးရန္ မေအာင္ျမင္ပါ"
msgctxt "MainWindow"
msgid "Port Forwarding Failed"
-msgstr "Port Forwarding မအောင်မြင်ပါ။"
+msgstr "Port Forwarding မေအာင္ျမင္ပါ"
msgctxt "MainWindow"
msgid "Vidalia was unable to configure automatic port forwarding."
-msgstr "Vidalia မှ အလိုအလျောက် Port Forwarding ပြုလုပ်ခြင်းအား ပုံစံချမှတ်ရန် မတတ်နိုင်ပါ။"
+msgstr "Vidalia သည္ အလိုအေလ်ာက္ port forwarding ကုိ ခ်ိန္ညိႇျခင္း မျပဳလုပ္ႏုိင္ပါ"
msgctxt "MainWindow"
msgid "Vidalia Control Panel"
-msgstr "Vidalia ထိန်းချုပ်မှုနေရာ"
+msgstr "Vidalia Control Panel"
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 "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 "ဤ ဝင်းဒိုးကို ပိတ်ပါ"
+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လုပ်ငန်းစဉ် အလုပ်လုပ်နေခြင်းရှိမရှိစစ်ဆေးပါ "
+msgstr "စကားဝွက္ ျပင္ဆင္သတ္မွတ္ျခင္း မေအာင္ျမင္ပါ"
msgctxt "MainWindow"
msgid ""
"The currently installed version of Tor is out of date or no longer "
"recommended."
-msgstr "လက်ရှိစက်သွင်းထည့်သွင်းထားသည့် Tor ဗားရှင်းသည် သက်တမ်းကုန်သည်။ သို့မဟုတ် နောက်ထပ် အကြံပြုတော့မည် မဟုတ်ပါ။"
+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 "သင်၏ လူမသိသူမသိ သိုသိပ်နေနိုင်ခြင်းကို ကာကွယ်ရန်အလို့ငှာ သင်၏ အင်တာနက်ချိတ်ဆက်မှုကို Tor က အလိုအလျောက် ပိတ်လိုက်သည်။"
+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 "ဤအချိန်၌ သင်၏ကွန်ပျူတာအတွက် ရနိုင်သော Tor ဆော့ဖ်ဝဲလ်အသစ် မရှိပါ။"
+msgstr ""
msgctxt "MainWindow"
msgid "Installation Failed"
-msgstr "စက်တွင်း ထည့်သွင်းမှု မအောင်မြင်ပါ။"
+msgstr ""
msgctxt "MainWindow"
msgid "Vidalia was unable to install your software updates."
-msgstr "သင်၏ဆော့ဝဲလ်အဆင့်မြှင့်တင်မှုများကို စက်တွင်းထည့်သွင်းရန် Vidalia သည် မရနိုင်ပါ။"
+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 ""
"Anything 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 ""
+
+msgctxt "MainWindow"
+msgid "toolBar"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Start"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Stop"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Restart"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Reload Tor's config"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Actions"
+msgstr ""
msgctxt "MainWindow"
msgid "Bootstrapping torrc from %1 to %2"
-msgstr "%1 မှ %2 သို့ torrc ကို ကိုယ့်ဘာသာကိုယ် အလိုလို ပြုလုပ်စေသည်။"
+msgstr ""
msgctxt "MainWindow"
-msgid "(probably Telnet)"
-msgstr "(Telnet ဖြစ်ကောင်းဖြစ်လိမ့်မည်)"
+msgid ""
+"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"\n"
+"Would you like to shutdown gracefully and give clients time to find a new relay?"
+msgstr ""
msgctxt "MainWindow"
-msgid "(probably an email client)"
-msgstr "(အီးမေးလ်ကလိုင်းယင့် ဖြစ်ကောင်းဖြစ်လိမ့်မည်။)"
+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 ""
-"One of your applications %1 appears to be making a potentially unencrypted "
-"and unsafe connection to port %2."
-msgstr " သင်၏ အသုံးချပရိုပရမ်များ %1 အနက်တစ်ခုသည် ဆက်သွယ်ပေါက် %2 သို့ စာဝှက်မဟုတ်သော မလုံခြုံသည့် အင်တာနက်ချိတ်ဆက်မှု ဖြစ်လာရန် အလားအလာရှိသည်။"
+"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)"
+msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
-msgstr "သင်၏ Relay မှာ ပိတ်ချနေသည်။ \nသင်၏ Relay အား ယခု ရပ်တန့်ရန် \"ရပ်တန့်\" ခလုတ်ကို ထပ်မံ နှိပ်ပါ။"
+msgid ", probably Telnet,"
+msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Vidalia can't find out how to talk to Tor because it can't access this file: %1\n"
-"\n"
-"Here's the last error message:\n"
-"%2"
-msgstr "Vidalia သည် ၎င်းဖိုင်အား မဝင်ရောက်နိုင်သောကြောင့် Tor ကို မည်ကဲ့သို့ ဆက်သွယ်သည်ကို မသိရှိနိုင်ပါ။ - %1\n\nနောက်ဆုံး ချို့ယွင်းချက်ပြ သတင်းလွှာ သည်မှာ ရှိသည်။ - \n %2"
+msgid ", probably an email client,"
+msgstr ""
msgctxt "MainWindow"
msgid ""
-"It seems Tor has stopped running since Vidalia started it.\n"
-"\n"
-"See the Advanced Message Log for more information."
-msgstr "Vidalia အစပြုကတည်းက Tor သည် အလုပ်လုပ်ဆောင်မှု ရပ်တန့်သွားသည်ဟု ထင်ရသည်။\n\nနောက်ထပ် သတင်းအချက်အလက်များအတွက် အဆင့်မြှင့် သတင်းလွှာမှတ်တမ်း ကို ကြည့်ပါ။"
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
+msgstr ""
msgctxt "MainWindow"
-msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
-"\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
-msgstr "သင်သည် လက်ရှိ၌ Relay တစ်ခုကို ဖွင့်ထားသည်။ သင်၏ Relay အား အလုပ်လုပ်ဆောင်မှု ရပ်တန့်လိုက်ခြင်းက ကလိုင်းယက်များမှ မည်သည့် ဖွင့်ထားသည့် အင်တာနက်ချိတ်ဆက်မှုများကိုမဆို အနှောင့်အယှက်ဖြစ်စေလိမ့်မည်။\n\nသင်သည် ၎င်း Relay ကို ကြည်ကြည်သာသာ ပိတ်ပစ်လိုက်ပြီး ကလိုင်းယက်များအား Relay အသစ်တစ်ခု ရှာရန် အချိန်ပေးချင်ပါသလား။"
+msgid "Error reloading configuration"
+msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Vidalia detected that the Tor software exited unexpectedly.\n"
-"\n"
-"Please check the message log for recent warning or error messages."
-msgstr "Tor ဆောဝဲလ် မမျှော်လင့်ပဲ ပိတ်သွားကြောင်းကို Vidalia က စစ်ဆေးတွေ့ရှိသည်။\n\nမကြာသေးမီက သတိပေးစာ(သို့)ချို့ယွင်းချက်ပြစာများအတွက် သတင်းလွှာ မှတ်တမ်းကို ကျေးဇူးပြု၍ စစ်ဆေးပါ။"
+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."
-msgstr "Tor ၏ မှတ်တမ်း ဖြစ်ရပ်များအတွက် Vidalia က စာရင်းမသွင်းနိုင်ပါ။"
+msgstr "Vidalia သည္ Tor ၏ မွတ္တမ္း အျဖစ္အပ်က္မ်ားသို႕ မွတ္ပံုတင္ျခင္း မျပဳႏုိင္ပါ"
msgctxt "MessageLog"
msgid "Error Opening Log File"
-msgstr "မှတ်တမ်းဖိုင်ကို ဖွင့်ရာ၌ ချို့ယွင်းချက်ရှိသည်။"
+msgstr "မွတ္တမ္းဖိုင္မ်ား ဖြင့္လွစ္မႈ ခ်ဳ႕ိယြင္းျခင္း"
msgctxt "MessageLog"
msgid "Vidalia was unable to open the specified log file."
-msgstr "သက်ဆိုင်ရာ မှတ်တမ်းဖိုင်ကို ဖွင့်ရန် Vidalia မရနိုင်ပါ။"
+msgstr "Vidalia သည္ ေဖာ္ျပထားေသာ မွတ္တမ္းဖိုင္ကို မဖြင့္လွစ္ႏုိင္ပါ"
msgctxt "MessageLog"
msgid "Log Filename Required"
-msgstr "မှတ်တမ်း ဖိုင်အမည် လိုအပ်သည်။"
+msgstr "မွတ္တမ္းဖုိင္အမည္ လိုအပ္ပါသည္"
msgctxt "MessageLog"
msgid "You must enter a filename to be able to save log messages to a file."
-msgstr "ဖိုင်ထဲသို့ မှတ်တမ်းသတင်းလွှာများ ထည့်သွင်းသိမ်းဆည်းနိုင်ရန် ဖိုင်အမည်ထည့်ပေးရမည်။"
+msgstr "မွတ္တမ္း သတင္းေပးပို႕ခ်က္မ်ားကို ဖုိင္တစ္ခုသို႕ သိမ္းဆည္းႏုိင္ရန္ ဖုိင္အမည္တစ္ခု ေပးသြင္းရပါမည္"
msgctxt "MessageLog"
msgid "Select Log File"
-msgstr "မှတ်တမ်းဖိုင်ကို ရွေးချယ်ပါ။"
+msgstr "မွတ္တမ္းဖိုင္တစ္ခု ေရြးခ်ယ္ပါ"
msgctxt "MessageLog"
msgid "Save Log Messages"
-msgstr "မှတ်တမ်း သတင်းလွှာများကို သိမ်းပါ။"
+msgstr "သတင္းေပးပို႕ခ်က္မွတ္တမ္းမ်ား သိမ္းဆည္းပါ"
msgctxt "MessageLog"
msgid "Text Files (*.txt)"
-msgstr "စာသားဖိုင် (*.txt)"
+msgstr "စာသားဖုိင္မ်ား (*.txt)"
msgctxt "MessageLog"
msgid "Vidalia"
@@ -2182,47 +2078,47 @@ msgstr "Vidalia"
msgctxt "MessageLog"
msgid "Find in Message Log"
-msgstr "သတင်းလွှာ မှတ်တမ်းထဲတွင် ရှာဖွေပါ။"
+msgstr "သတင္းေပးပို႕မႈ မွတ္တမ္းမ်ားထဲတြင္ ရွာရန္"
msgctxt "MessageLog"
msgid "Find:"
-msgstr "ရှာဖွေ -"
+msgstr "ရွာရန္ :"
msgctxt "MessageLog"
msgid "Not Found"
-msgstr "ရှာဖွေမတွေ့ရှိပါ။"
+msgstr "မေတြ႕ရွိပါ"
msgctxt "MessageLog"
msgid "Search found 0 matches."
-msgstr "တူညီသည့်အရာမတွေ့ပါ။"
+msgstr "ရွာေဖြမႈ 0 ခု ကုိက္ညီေတြ႕ရွိပါသည္"
msgctxt "MessageLog"
msgid "Message Log"
-msgstr "သတင်းလွှာ မှတ်တမ်း"
+msgstr "သတင္းေပးပို႕မႈ မွတ္တမ္း"
msgctxt "MessageLog"
msgid "Message Filters..."
-msgstr "သတင်းလွှာ စစ်ထုတ်မှုများ ..."
+msgstr "သတင္းေပးပို႕မႈ စိစစ္ခ်က္မ်ား"
msgctxt "MessageLog"
msgid "Set message filters"
-msgstr "သတင်းလွှာ စစ်ထုတ်မှုများကို သတ်မှတ်ပါ။"
+msgstr "သတင္းေပးပို႕မႈ စိစစ္ခ်က္မ်ား သတ္မွတ္ပါ"
msgctxt "MessageLog"
msgid "History Size..."
-msgstr "ဒေတာအဟောင်းစာရင်း အရေအတွက် .."
+msgstr "History အရြယ္အစား"
msgctxt "MessageLog"
msgid "Set maximum number of messages to display"
-msgstr "ဖော်ပြရန် သတင်းလွှာများ အများဆုံးအရေအတွက် ကို သတ်မှတ်ပါ။"
+msgstr "သတင္းေပးပို႕မႈမ်ား ျပသရန္ အမ်ားဆံုး နံပါတ္သတ္မွတ္ရန္"
msgctxt "MessageLog"
msgid "Clear"
-msgstr "ရှင်းလင်းပါ"
+msgstr "ရွင္းလင္းရန္"
msgctxt "MessageLog"
msgid "Clear all messages from the Message Log (Ctrl+E)"
-msgstr "သတင်းလွှာမှတ်တမ်း (Ctrl+E) မှ သတင်းလွှာများအားလုံးကို ရှင်းလင်းပါ။"
+msgstr "သတင္းေပးပို႕မႈ မွတ္တမ္းမ်ားမွ သတင္းေပးပို႕မ်ား အားလံုး ရွင္းလင္းရန္ (Ctrl+E)"
msgctxt "MessageLog"
msgid "Ctrl+E"
@@ -2230,11 +2126,11 @@ msgstr "Ctrl+E"
msgctxt "MessageLog"
msgid "Copy"
-msgstr "ကူးယူပါ။"
+msgstr "ေကာ္ပီကူးရန္"
msgctxt "MessageLog"
msgid "Copy the selected messages to the clipboard (Ctrl+C)"
-msgstr "ရွေးချယ်လိုက်သည့် သတင်းလွှာများကို မှတ်စရာနေရာသို့ ကူယူပါ။ (Ctrl+C)"
+msgstr "ေရြးခ်ယ္ထားေသာ သတင္းအခ်က္အလက္ကုိ clipboard သို႕ ေကာ္ပီကူးပါ (Ctrl+C)"
msgctxt "MessageLog"
msgid "Ctrl+C"
@@ -2242,11 +2138,11 @@ msgstr "Ctrl+C"
msgctxt "MessageLog"
msgid "Select All"
-msgstr "Aအားလုံး ရွေးချယ်"
+msgstr "Select All"
msgctxt "MessageLog"
msgid "Select all messages (Ctrl+A)"
-msgstr "သတင်းလွှာများအားလုံးကို ရွေးချယ်ပါ။ (Ctrl+A)"
+msgstr "သတင္းေပပို႕မႈအားလံုး မွတ္သားရန္ (Ctrl+A)"
msgctxt "MessageLog"
msgid "Ctrl+A"
@@ -2254,27 +2150,27 @@ msgstr "Ctrl+A"
msgctxt "MessageLog"
msgid "Save All"
-msgstr "အားလုံးကိုသိမ်းပါ။"
+msgstr "အားလံုးကုိ သိမ္းဆည္းရန္"
msgctxt "MessageLog"
msgid "Save all messages to a file"
-msgstr "သတင်းလွှာများအားလုံးကို သိမ်းပါ။"
+msgstr "သတင္းေပးပို႕မႈမ်ားအားလံုး ကို ဖိုင္တစ္ခုသို႕ သိမ္းဆည္းရန္"
msgctxt "MessageLog"
msgid "Save Selected"
-msgstr "ရွေးချယ်ထားသည်ကိုသိမ်းပါ။"
+msgstr "ေရြးခ်ယ္ထားသည္မ်ားကို သိမ္းဆည္းရန္"
msgctxt "MessageLog"
msgid "Save selected messages to a file"
-msgstr "ရွေးချယ်ထားသည့်သတင်းလွှာများကို ဖိုင်ထဲသို့ သိမ်းပါ။"
+msgstr "ေရြးခ်ယ္ထားသည့္ သတင္းေပးပို႕ခ်က္မ်ားကုိ ဖိုင္တစ္ခုသို႕ သိမ္းဆည္းရန္"
msgctxt "MessageLog"
msgid "Settings"
-msgstr "စနစ်ပြင်ဆင်မှုများ"
+msgstr "ခ်ိန္ညိႇခ်က္မ်ား"
msgctxt "MessageLog"
msgid "Adjust Message Log Settings"
-msgstr "သတင်းလွှာမှတ်တမ်း စနစ်ချိန်ညှိမှုများ ပြုလုပ်ပါ။"
+msgstr "သတင္းေပးပို႕မႈ မွတ္တမ္း ခ်ိန္ညိွခ်က္မ်ားကို ျပင္ဆင္ရန္"
msgctxt "MessageLog"
msgid "Ctrl+T"
@@ -2286,7 +2182,7 @@ msgstr "အကူအညီ"
msgctxt "MessageLog"
msgid "Show the help browser"
-msgstr "အကူအညီ ကြည့်ရှုပရိုဂရမ်ကို ပြပါ။"
+msgstr "အကူအညီ browser ျပသပါ"
msgctxt "MessageLog"
msgid "F1"
@@ -2294,11 +2190,11 @@ msgstr "F1"
msgctxt "MessageLog"
msgid "Close"
-msgstr "ပိတ်သိမ်း"
+msgstr "ပိတ္ပါ"
msgctxt "MessageLog"
msgid "Close the Message Log"
-msgstr "သတင်းလွှာ မှတ်တမ်းကို ပိတ်ပါ။"
+msgstr "သတင္းေပးပို႕မႈ မွတ္တမ္းမ်ား ပိတ္ပါ"
msgctxt "MessageLog"
msgid "Esc"
@@ -2306,11 +2202,11 @@ msgstr "Esc"
msgctxt "MessageLog"
msgid "Find"
-msgstr "ရှာ"
+msgstr "ရွာေဖြရန္"
msgctxt "MessageLog"
msgid "Find all messages containing the search text (Ctrl+F)"
-msgstr "ရှာလိုသည့်စာသားပါသည့် သတင်းလွှာများအားလုံးကို ရှာပါ။ (Ctrl+F)"
+msgstr "ရွာေဖြလိုေသာ စာသားပါသည့္သတင္းေပးပို႕မႈအားလံုး ရွာေဖြရန္ (Ctrl+F)"
msgctxt "MessageLog"
msgid "Ctrl+F"
@@ -2318,107 +2214,99 @@ msgstr "Ctrl+F"
msgctxt "MessageLog"
msgid "Time"
-msgstr "အချိန်"
+msgstr "အခ်ိန္"
msgctxt "MessageLog"
msgid "Type"
-msgstr "အမျိုးအစား"
+msgstr "အမ်ိဳးအစား"
msgctxt "MessageLog"
msgid "Message"
-msgstr "ပြောစကား"
+msgstr "သတင္းအခ်က္အလက္"
msgctxt "MessageLog"
msgid "Saves the current Message Log settings"
-msgstr "လက်ရှိ သတင်းလွှာမှတ်တမ်းချိန်ညှိမှုများကို သိမ်းပါ။"
+msgstr "လက္ရွိ သတင္းအခ်က္အလက္ မွတ္တမ္း ခ်ိန္ညိႇခ်က္ကို သိမ္းပါ"
msgctxt "MessageLog"
msgid "Save Settings"
-msgstr "စနစ် ပြင်ဆင်မှုများကို သိမ်းပါ။"
+msgstr "ခ်ိန္ညိႇခ်က္ကုိသိမ္းပါ"
msgctxt "MessageLog"
msgid "Cancels changes made to settings"
-msgstr "စနစ်ချိန်ညှိမှုများသို့ပြုလုပ်ထားသည့်အပြောင်းအလဲများကို ပယ်ဖျက်ပါ။"
+msgstr "ခ်ိန္ညိႇခ်က္ေျပာင္းလဲမႈမ်ားကုိ ဖ်က္သိမ္းပါ"
msgctxt "MessageLog"
msgid "Cancel"
-msgstr "နေတော့"
+msgstr "ဖ်က္သိမ္းပါ"
msgctxt "MessageLog"
msgid "Message Filter"
-msgstr "သတင်းလွှာ စစ်ထုတ်မှု"
+msgstr "သတင္းအခ်က္အလက္ စိစစ္မႈ"
msgctxt "MessageLog"
msgid "Error"
-msgstr "ချို့ယွင်းချက်"
+msgstr "မွားယြင္းမႈ"
msgctxt "MessageLog"
msgid "Warning"
-msgstr "သတိပြုရန်"
+msgstr "သတိေပးခ်က္"
msgctxt "MessageLog"
msgid "Notice"
-msgstr "သတိပြုရန်"
+msgstr "သတိျပဳရန္"
msgctxt "MessageLog"
msgid "Info"
-msgstr "သတင်း"
+msgstr "သတင္းအခ်က္အလက္"
msgctxt "MessageLog"
msgid "Debug"
-msgstr "အမှားစစ်"
+msgstr "Debug"
msgctxt "MessageLog"
msgid "Message Log History"
-msgstr "သတင်းလွှာ မှတ်တမ်း ရာဇဝင်"
+msgstr "သတင္းအခ်က္အလက္ မွတ္တမ္း history"
msgctxt "MessageLog"
msgid "Number of messages to display in the message log window"
-msgstr "သတင်းလွှာမှတ်တမ်း ပြကွက်တွင် ပြသရန် သတင်းလွှာများ အရေအတွက်"
+msgstr "သတင္းအခ်က္အလက္ မွတ္တမ္း window တြင္ျပသရန္ သတင္းအခ်က္အလက္ အေရအတြက္"
msgctxt "MessageLog"
msgid "messages"
-msgstr "သတင်းလွှာများ"
+msgstr "သတင္းအခ်က္အလက္မ်ား"
msgctxt "MessageLog"
msgid "Browse"
-msgstr "ဝင်ရောက်ရှာဖွေပါ။"
+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 "Tor အခြေအနေ"
+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 "တစ်စုံတစ်ရာ လုံးဝ မှားယွင်းနေပြီး Tor သည် ရှေ့ဆက်၍ \nမသွားတော့သောအခါ ပေါ်သည့် သတင်းလွှာများ"
+msgstr ""
msgctxt "MessageLog"
msgid ""
"Messages that only appear when \n"
"something has gone wrong with Tor."
-msgstr "Tor နှင့် ပတ်သက်၍ တစ်စုံတစ်ရာ လုံးဝ\nမှားယွင်းနေသောအခါမှသာ ပေါ်သည့် သတင်းလွှာများ"
+msgstr ""
msgctxt "MessageLog"
msgid ""
@@ -2426,38 +2314,34 @@ msgid ""
"during normal Tor operation and are \n"
"not considered errors, but you may \n"
"care about."
-msgstr "ပုံ Tor စနစ်လည်ပတ်မှု အချိန်များတွင် ပေါ်ချင်သည့်အချိန် ထထ ပေါ်လာတတ်သည့် သတင်းလွှာများ၊ ၎င်း သတင်းလွှာများကို အမှားများဟု မယူဆထားသော်လည်း သင့် အနေဖြင့် အရေးစိုက်ကောင်းစိုက်ရလိမ့်မည်။"
+msgstr ""
msgctxt "MessageLog"
msgid ""
"Messages that appear frequently \n"
"during normal Tor operation."
-msgstr "ပုံမှန် Tor စနစ်လည်ပတ်မှု အချိန်အတွင်း ပေါ်ချင်သည့်အချိန် \nထထ ပေါ်လာတတ်သည့် သတင်းလွှာများ"
+msgstr ""
msgctxt "MessageLog"
msgid ""
"Hyper-verbose messages primarily of \n"
"interest to Tor developers."
-msgstr "အလွန်အမင်း စာသားရှည်သည့် သတင်းလွှာများသည် Tor ဆော့ဖ်ဝဲလ်ရေးသားကြသူများ\nအတွက် အထူးတလည် စိတ်ဝင်စားစေသည်။"
+msgstr ""
msgctxt "MessageLog"
msgid ""
"Cannot write file %1\n"
"\n"
"%2."
-msgstr "%1 ဖိုင်ကို ရေး၍ မရပါ။\n\n%2."
-
-msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr "ကွန်ယက်ပြ မြေပုံကို ပိတ်ပါ။"
+msgstr ""
msgctxt "NetViewer"
msgid "Refresh"
-msgstr "အသစ်တဖန်ပြုလုပ်ပါ။"
+msgstr "ျပန္လည္ အသစ္တင္ျပပါ"
msgctxt "NetViewer"
msgid "Refresh the list of Tor relays and connections"
-msgstr "Tor Relay များနှင့် အင်တာနက်ချိတ်ဆက်မှုများ စာရင်းကို ပြန်လည် ကိုက်ကြည့်ပါ။"
+msgstr "Tor relays မ်ားႏွင့္ ဆက္သြယ္မႈမ်ား၏ စာရင္းကို ျပန္လည္ အသစ္တင္ျပပါ"
msgctxt "NetViewer"
msgid "Ctrl+R"
@@ -2469,11 +2353,11 @@ msgstr "အကူအညီ"
msgctxt "NetViewer"
msgid "Show the network map help"
-msgstr "ကွန်ယက်ပြမြေပုံ အကူအညီကို ပြပါ။"
+msgstr "Network ေျမပံု အကူအညီကုိ ျပသပါ"
msgctxt "NetViewer"
msgid "Show network map help"
-msgstr "ကွန်ယက်ပြ မြေပုံ အကူအညီကို ပြပါ။"
+msgstr "Network ေျမပံု အကူအညီကုိ ျပသပါ"
msgctxt "NetViewer"
msgid "F1"
@@ -2481,11 +2365,11 @@ msgstr "F1"
msgctxt "NetViewer"
msgid "Close"
-msgstr "ပိတ်သိမ်း"
+msgstr "ပိတ္ပါ"
msgctxt "NetViewer"
msgid "Close the network map"
-msgstr "ကွန်ယက်ပြ မြေပုံကို ပိတ်ပါ။"
+msgstr "Network ေျမပံုကုိ ပိတ္ပါ"
msgctxt "NetViewer"
msgid "Esc"
@@ -2493,11 +2377,11 @@ msgstr "Esc"
msgctxt "NetViewer"
msgid "Zoom In"
-msgstr "ချဲ့ပါ"
+msgstr "ျမင္ကြင္းက်ယ္ ခ်ဲ႕ပါ"
msgctxt "NetViewer"
msgid "Zoom in on the network map"
-msgstr "ကွန်ယက်ပြ မြေပုံအား ပုံကြီးချဲ့ပါ။"
+msgstr "Network ေျမပံုကုိ ျမင္ကြင္းက်ယ္ခ်ဲ႕ပါ"
msgctxt "NetViewer"
msgid "+"
@@ -2505,11 +2389,11 @@ msgstr "+"
msgctxt "NetViewer"
msgid "Zoom Out"
-msgstr "ချုံ့ပါ"
+msgstr "ျမင္ကြင္းခ်ံဳ႕ပါ"
msgctxt "NetViewer"
msgid "Zoom out on the network map"
-msgstr "ကွန်ယက်ပြ မြေပုံအား ပုံသေးချုံ့ပါ။"
+msgstr "Network ေျမပံုကုိ ျမင္ကြင္းခ်ံဳ႕ပါ"
msgctxt "NetViewer"
msgid "-"
@@ -2517,11 +2401,11 @@ msgstr "-"
msgctxt "NetViewer"
msgid "Zoom To Fit"
-msgstr "ကွက်တိဖြစ်အောင်လုပ်ပါ။"
+msgstr "ျမင္ကြင္းကို သင့္ေလ်ာ္ေသာ အေနအထားသို႕ ျပဳျပင္ပါ"
msgctxt "NetViewer"
msgid "Zooms to fit all currently displayed circuits"
-msgstr "လက်ရှိ ဖော်ပြထားသည့် ဆားကစ်များအားလုံး အပြည့်ဝင်ရန် ချုံ့ချဲ့ ပြုလုပ်ပါ။"
+msgstr "လက္ရွိ ျပသထားေသာ ဆားကစ္မ်ား၏ ျမင္ကြင္းကုိ သင့္ေလ်ာ္ေသာ အေနအထားသို႕ ျပဳျပင္ပါ"
msgctxt "NetViewer"
msgid "Ctrl+Z"
@@ -2529,291 +2413,315 @@ msgstr "Ctrl+Z"
msgctxt "NetViewer"
msgid "Relay Not Found"
-msgstr "Relay ရှာမတွေ့ပါ။"
+msgstr ""
msgctxt "NetViewer"
msgid "No details on the selected relay are available."
-msgstr "ရွေးချယ်ထားသည့် Relay နှင့် ပတ်သက်၍ အသေးစိတ်များ မရနိုင်ပါ။"
+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 "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"
+
+msgctxt "NetworkPage"
+msgid "The specified bridge identifier is not valid."
+msgstr "ေဖာ္ျပထားေသာ bridge ေဖာ္ျပခ်က္သည္ မဆီေလ်ာ္ပါ"
msgctxt "NetworkPage"
msgid "Copy (Ctrl+C)"
-msgstr "ကူးကူပါ။ (Ctrl+C)"
+msgstr "ကူးယူရန္ (Ctrl+C)"
msgctxt "NetworkPage"
msgid ""
"You must specify both an IP address or hostname and a port number to "
"configure Tor to use a proxy to access the Internet."
-msgstr "အင်တာနက်ကို ဝင်ရောက်သုံးစွဲရန် ပရောင့်ဇီတစ်ခုကို သုံးရန် tor ကို ပုံစံချမှတ်ရန် သင်သည် အိုင်ပီလိပ်စာတစ်ခု (သို့) စက်အမည်တစ်ခု နှင့် ဆက်သွယ်ပေါက်နံပါတ်တစ်ခု တို့ကို သတ်မှတ်သင့်သည်။"
+msgstr "Tor ကုိ အသံုးျပဳ၍ အင္တာနက္ကုိ အသံုးျပဳရန္ အိုင္ပီလိပ္စာႏွင့္ hostname ႏွစ္ခုလံုးကုိ သတ္မွတ္ေဖာ္ျပေပးရမည္"
msgctxt "NetworkPage"
msgid ""
"You must specify one or more ports to which your firewall allows you to "
"connect."
-msgstr "သင်၏ ဖိုင်ယားဝေါကို သင့်အား အင်တာနက်ချိတ်ဆက်နိုင်စေရန် ဆက်သွယ်ပေါက်တစ်ခု(သို့)တစ်ခုထက်မကကို သင်သည် သတ်မှတ်သင့်သည်။"
+msgstr "သင္၏ firewall မွ သင့္ကုိ ဆက္သြယ္ခြင့္ရေစရန္ port တစ္ခုသို႕မဟုတ္ တစ္ခုထက္ပို၍ သတ္မွတ္ေဖာ္ျပေပးရမည္"
msgctxt "NetworkPage"
msgid "'%1' is not a valid port number."
-msgstr "'%1' သည် လက်ခံနိုင်သော ဆက်သွယ်ပေါက် တစ်ခု ဖြစ်သည်။"
+msgstr "'%1' သည္ ဆီေလ်ာ္ေသာ port နံပါတ္မဟုတ္ပါ"
msgctxt "NetworkPage"
msgid "Check if your local network requires a proxy to access the Internet"
-msgstr "သင်၏ လိုကယ် ကွန်ယက် သည် အင်တာနက်သို့ဝင်ရောက်ရန် ပရောင်ဇီ လိုအပ်သလား ဆိုသည်ကို စစ်ဆေးပါ။"
+msgstr "အင္တာနက္အသံုးျပဳခြင့္ရရွိရန္ သင္၏ local network သည္ proxy လိုအပ္မႈ ရွိမရွိ စစ္ေဆးပါ"
msgctxt "NetworkPage"
msgid "I use a proxy to access the Internet"
-msgstr "အင်တာနက်သို့ဝင်ရောက်ရန် ပရောင်ဇီကို သုံးပါ။"
+msgstr "အင္တာနက္အသံုးျပဳႏုိင္ရန္ proxy အသံုးျပဳရပါသည္"
msgctxt "NetworkPage"
msgid "Proxy Settings"
-msgstr "ပရောင့်ဇီ စနစ်ပြင်ဆင်ချက်များ"
+msgstr "proxy သတ္မွတ္ခ်က္မ်ား"
msgctxt "NetworkPage"
msgid "Username:"
-msgstr "သုံးစွဲသူအမည် -"
+msgstr "အသံုးျပဳသူ၏ အမည္ :"
msgctxt "NetworkPage"
msgid "Password:"
-msgstr "စကားဝှက် - "
+msgstr "စကားဝွက္ :"
msgctxt "NetworkPage"
msgid "Port:"
-msgstr "ဆက်သွယ်ပေါက်"
+msgstr "Port:"
msgctxt "NetworkPage"
msgid "Check to only connect to relays using ports allowed by your firewall"
-msgstr "သင်၏ လိုကယ် နက်ဝက် သည် အင်တာနက်သို့ဝင်ရောက်ရန် ပရောင်ဇီ လိုအပ်သလား ဆိုသည်ကို စစ်ဆေးပါ။"
+msgstr "သင္၏ firewall မွ ခြင့္ျပဳေသာ port မ်ားကုိသာအသံုးျပဳ၍ relay မ်ားကို ဆက္သြယ္ေစရန္ စစ္ေဆးပါ"
msgctxt "NetworkPage"
msgid "My firewall only lets me connect to certain ports"
-msgstr "ကျွန်တော်၏ ဖိုင်ယားဝေါသည် သတ်မှတ်ထားသည့် ဆက်သွယ်ပေါက်များသို့သာ အင်တာနက်ချိတ်ဆက်နိုင်စေသည်။"
+msgstr "မိမိ၏ firewall သည္ သတ္မွတ္ထားေသာ port မ်ားကိုသာ ဆက္သြယ္ေစပါသည္"
msgctxt "NetworkPage"
msgid "Firewall Settings"
-msgstr "အင်တာနက် အတားအဆီး စနစ်ပြင်ဆင်ချက်များ"
+msgstr "Firewall သတ္မွတ္ခ်က္မ်ား"
msgctxt "NetworkPage"
msgid "Allowed Ports:"
-msgstr "ခွင့်ပြုထားသည့် ဆက်သွယ်ပေါက်များ -"
+msgstr "ခြင့္ျပဳထားေသာ Ports မ်ား :"
msgctxt "NetworkPage"
msgid "80, 443"
-msgstr "၈၀၊ ၄၄၃"
+msgstr "80, 443"
msgctxt "NetworkPage"
msgid ""
"Check to encrypt directory requests and, optionally, use bridge relays to "
"access the Tor network"
-msgstr "ဖိုင်လမ်းကြောင်း တောင်းဆိုမှုများကို စာဝှက်ရန် စစ်ဆေးပြီး Bridge Relay များကို Tor ကွန်ယက်သို့ ဝင်ရောက်ရန် သင်နှစ်သက်လျှင် အသုံးပြုချင်ပြု၍ရသည်။"
+msgstr "Directory request မ်ားကုိ encrypt ျဖစ္ေစရန္၊ Tor Network ကုိ အသံုးျပဳႏုိင္ရန္ bridge relay မ်ားကို အသံုးျပဳႏုိင္ေၾကာင္း စစ္ေဆးပါ"
msgctxt "NetworkPage"
msgid "My ISP blocks connections to the Tor network"
-msgstr "ကျွန်ုပ်၏ အင်တာနက်ဆားဗစ်ဝန်ဆောင်မှုကုမ္ပဏီက Tor ကွန်ယက်သို့ အင်တာနက်ချိတ်ဆက်မှုများကို ပိတ်ပင်ထားသည်။"
+msgstr "မိမိ၏ ISP မွ Tor Network သို႕ ဆက္သြယ္မႈကို ပိတ္ပင္ထားပါသည္"
msgctxt "NetworkPage"
msgid "Bridge Settings"
-msgstr "Bridge စနစ်ပြင်ဆင်မှုများ"
+msgstr "Bridge သတ္မွတ္ခ်က္မ်ား"
msgctxt "NetworkPage"
msgid "Add a Bridge:"
-msgstr "Bridge ကို ထည့်ပါ။ -"
+msgstr "Bridge တစ္ခု ေပါင္းထည့္ပါ :"
msgctxt "NetworkPage"
msgid "Remove the selected bridges from the list"
-msgstr "စာရင်းထဲမှ ရွေးချယ်ထားသည့် Bridge များကို ဖယ်ရှားပါ။"
+msgstr "ေရြးခ်ယ္ထားေသာ bridges မ်ားကို စာရင္းမွ ဖယ္ရွားေပးပါ"
msgctxt "NetworkPage"
msgid "Copy the selected bridges to the clipboard"
-msgstr "ရွေးချယ်ထားသည့် Bridge များကို ကူးယူမှတ်သားရာနေရာသို့ ကူးယူပါ။"
+msgstr "ေရြးခ်ယ္ထားေသာ bridges မ်ားကုိ clipboard သို႕ ေကာ္ပီ ကူးပါ"
msgctxt "NetworkPage"
msgid "Find Bridges Now"
-msgstr "ယခု Bridge ကို ရှာပါ။"
+msgstr ""
msgctxt "NetworkPage"
msgid "<a href=\"bridges.finding\">How else can I find bridges?</a>"
-msgstr "<a href=\"bridges.finding\">Bridgeများကို အခြား မည်ကဲ့သို့ ရှာနိုင်မည်နည်း?</a>"
+msgstr ""
msgctxt "NetworkPage"
msgid "<a href=\"bridges.finding\">How can I find bridges?</a>"
-msgstr "<a href=\"bridges.finding\">Bridge ကို မည်ကဲ့သို့ ရှာနိုင်မည်နည်း ?</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 "Bridge အသစ်များကို လက်ရှိ၌ မရနိုင်သေးပါ။ သင်သည် ခေတ္တ စောင့်ဆိုငးပြီးမှ ထပ်မံကြိုးစားကြည့်နိုင်သည်။ သို့မဟုတ် Bridge အသစ် ရှာရန် အခြားနည်းလမ်းကို ကြိုးစားကြည့်နိုင်သည်။"
+msgstr ""
msgctxt "NetworkPage"
msgid "Click Help to see other methods of finding new bridges."
-msgstr "Bridge အသစ်များ ရှာဖွေရန် အခြားနည်းလမ်းများကို သိရန် အကူအညီ ကို နှိပ်ပါ။"
+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 / HTTPS"
-msgstr "HTTP / HTTPS"
+msgid "HTTP"
+msgstr ""
msgctxt "NetworkPage"
-msgid "You must specify one or more bridges."
-msgstr "bridge တစ်ခု သို့မဟုတ် တစ်ခုထက်မက ကို သတ်မှတ်ရမည်။"
+msgid "HTTP / HTTPS"
+msgstr ""
msgctxt "Policy"
msgid "accept"
-msgstr "လက်ခံပါ။"
+msgstr "လက္ခံပါသည္"
msgctxt "Policy"
msgid "reject"
-msgstr "ငြင်းပယ်ပါ။"
+msgstr "ျငင္းပယ္ပါသည္"
msgctxt "RouterDescriptor"
msgid "Online"
-msgstr "အွန်လိုင်း"
+msgstr "Online"
msgctxt "RouterDescriptor"
msgid "Hibernating"
-msgstr "စက်အား ခေတ္တ ရပ်နားခြင်း"
+msgstr "Hibernating"
msgctxt "RouterDescriptor"
msgid "Offline"
-msgstr "လိုင်းပြင်ပ"
+msgstr "Offline"
msgctxt "RouterDescriptorView"
msgid "Location:"
-msgstr "ဖိုင်တည်နေရာ :"
+msgstr "တည္ေနရာ :"
msgctxt "RouterDescriptorView"
msgid "IP Address:"
-msgstr "IP လိပ်စာ -"
+msgstr "အိုင္ပီ လိပ္စာ :"
msgctxt "RouterDescriptorView"
msgid "Platform:"
-msgstr "ပလက်ဖောင်း -"
+msgstr "Platform:"
msgctxt "RouterDescriptorView"
msgid "Bandwidth:"
-msgstr "ဘန်ဝင့် - "
+msgstr "Bandwidth:"
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 "Relay အသေးစိတ်အချက်အလက်များ"
+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 "IP လိပ်စာ -"
+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 "Descriptor"
+msgstr ""
msgctxt "RouterListItem"
msgid "Offline"
-msgstr "လိုင်းပြင်ပ"
+msgstr "Offline"
msgctxt "RouterListItem"
msgid "Hibernating"
-msgstr "စက်အား ခေတ္တ ရပ်နားခြင်း"
+msgstr "Hibernating"
msgctxt "RouterListItem"
msgid "%1 KB/s"
-msgstr "တစ်စက္ကန့် လျှင် %1 ကီလိုဘိုက်"
+msgstr "%1 KB/s"
msgctxt "RouterListWidget"
msgid "Relay"
@@ -2821,418 +2729,414 @@ msgstr "Relay"
msgctxt "RouterListWidget"
msgid "Zoom to Relay"
-msgstr "Relay ကို ပုံအရွယ်အစားပြောင်းပါ။"
+msgstr "Relay သုိ႕ တုိးသြားပါ"
msgctxt "RouterListWidget"
msgid "%1 relays online"
-msgstr "%1 relay များ အွန်လိုင်းပေါ်တွင် ရှိသည်။"
+msgstr "%1 relays online"
msgctxt "RouterListWidget"
msgid "Copy"
-msgstr "ကူးယူပါ။"
+msgstr "ေကာ္ပီကူးရန္"
msgctxt "RouterListWidget"
msgid "Nickname"
-msgstr "အမည်ပြောင်"
+msgstr "အမည္ဝွက္"
msgctxt "RouterListWidget"
msgid "Fingerprint"
-msgstr "လက်ဗွေရာ"
+msgstr "လက္ေဗြ"
msgctxt "ServerPage"
msgid "Bridge Support Unavailable"
-msgstr "Bridge အထောက်အပံ့ မရနိုင်ပါ။"
+msgstr "Bridge ေထာက္ပံ့မႈ မရႏုိင္ပါ"
msgctxt "ServerPage"
msgid ""
"You have configured Tor to act as a bridge relay for censored users, but "
"your version of Tor does not support bridges."
-msgstr "တရားမဝင်အသုံးပြုသူများအတွက် Bridge Relay အနေဖြင့် လုပ်ဆောင်ရန် သင်သည် Tor အား ပုံစံချမှတ်လိုက်သည်။ သို့သော် သင်၏ Tor ဗားရှင်းမှာ Bridge များကို မထောက်ပံ့ပါ။"
+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 Relay အနေဖြင့် လုပ်ဆောင်ရန် ကျေးဇူးပြု၍ Tor အား ပုံစံချမှတ်ပါ။"
+msgstr "ေက်းဇူးျပဳ၍ သင္၏ Tor ေဆာ့ဝဲကုိ အဆင့္ျမႇင့္ပါ သို႕မဟုတ္ Tor ကို ပံုမွန္ Tor relay ကဲ့သို႕ ျပင္ဆင္မႈျပဳလုပ္ပါ"
msgctxt "ServerPage"
msgid "Your bridge relay is not running."
-msgstr "သင်၏ Bridge Relay မှာ အလုပ်မလုပ်ဆောင်ပါ။"
+msgstr "သင္၏ bridge relay အလုပ္လုပ္ေဆာင္ေနမႈ မရွိပါ"
msgctxt "ServerPage"
msgid "You must specify at least a relay nickname and port."
-msgstr "သင်သည် အနည်းဆုံး Relay အမည်ပြောင်နှင့် ဆက်သွယ်ပေါက် တို့ကို သတ်မှတ်ပေးရမည်။"
+msgstr "သင္ အနည္းဆံုး relay အမည္ဝွက္ ႏွင့္ port ကုိ သတ္မွတ္ေပးရပါမည္"
msgctxt "ServerPage"
msgid "Run as a client only"
-msgstr "ကလိုင်းယင့်အနေဖြင့်သာ အလုပ်လုပ်ဆောင်စေမည်။"
+msgstr "Client ကဲ့သုိ႕သာ အလုပ္လုပ္ေဆာင္ပါ"
msgctxt "ServerPage"
msgid "Relay Port:"
-msgstr "Relay ဆက်သွယ်ပေါက် -"
+msgstr "Relay Port:"
msgctxt "ServerPage"
msgid "Enable to mirror the relay directory"
-msgstr "Relay ဖိုင်လမ်းကြောင်းကို မိတ္တူပွားနိုင်ရန်ပြုလုပ်ပါ။"
+msgstr "Relay directory ကုိ mirror ျပဳလုပ္ႏုိင္ရန္"
msgctxt "ServerPage"
msgid "Attempt to automatically configure port forwarding"
-msgstr "Port Forwarding ကို အလိုအလျောက် ပုံစံချမှတ်ရန် ကြိုးပမ်းပါ။"
+msgstr "Port forwarding ကို ျပင္ဆင္သတ္မွတ္ျခင္း အလိုအေလ်ာက္ျပဳလုပ္ရန္ လုပ္ေဆာင္မႈ"
msgctxt "ServerPage"
msgid "Test"
-msgstr "စစ်ဆေးမှု"
+msgstr "စမ္းသပ္ရန္"
msgctxt "ServerPage"
msgid "Show help topic on port forwarding"
-msgstr "Port Forwarding နှင့် ပတ်သက်သည့် အကူအညီ ခေါင်းစဉ်ကို ဖော်ပြပါ။"
+msgstr "Port forwarding ေပၚတြင္ အကူအညီ အေၾကာင္းအရာမ်ား ျပသရန္"
msgctxt "ServerPage"
msgid "Directory Port:"
-msgstr "ဖိုင်လမ်းကြောင်းဆက်သွယ်ပေါက် -"
+msgstr "Directory Port:"
msgctxt "ServerPage"
msgid "Directory Port Number"
-msgstr "ဖိုင်လမ်းကြောင်းဆက်သွယ်ပေါက်နံပါတ်"
+msgstr "Directory Port နံပါတ္"
msgctxt "ServerPage"
msgid "Contact Info:"
-msgstr "ဆက်သွယ်ရန် သတင်းအချက်အလက် - "
+msgstr "ဆက္သြယ္ရန္ အခ်က္အလက္မ်ား :"
msgctxt "ServerPage"
msgid "Name of your relay"
-msgstr "သင်၏ Relay အမည်"
+msgstr "သင္၏ relay အမည္"
msgctxt "ServerPage"
msgid "Port on which users and other relays can communicate with your relay"
-msgstr "အသုံးပြုသူများနှင့် အခြား Relay များ ရှိ ဆက်သွယ်ပေါက်သည် သင်၏ Relay နှင့် အပြန်အလှန် ဆက်သွယ်နိုင်သည်။"
+msgstr "အသံုးျပဳသူမ်ားႏွင့္ အျခား relay မ်ားမွ သင္၏ relay သို႕ ဆက္သြယ္ႏုိင္ေသာ port"
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 "ဒေါင်းလုတ်လုပ်နှုန်းမြန်ပြီး အွန်လိုင်းပေါ်ဒေတာတင်နှုန်းနှေးသည့် အင်တာနက် ချိတ်ဆက်မှုများအတွက် ကျေးဇူးပြု၍ သင်၏ အွန်လိုင်းပေါ်ဒေတာတင်သည့်နှုန်းကို သည်နေရာ၌ စာရင်းပြုစုပါ။"
+msgstr "ေဒါင္းလုဒ္ျမန္ဆန္၍ upload ေႏွးေကြးေသာ အင္တာနက္ ဆက္သြယ္မႈမ်ားအတြက္ သင္၏ upload အျမန္ႏႈန္းကို ဤေနရာတြင္ ေဖာ္ျပပါ။"
msgctxt "ServerPage"
msgid "Cable/DSL 256 Kbps"
-msgstr "ကေဘယ်/ဒီအက်စ်အယ်လ် တစ်စက္ကန့်လျှင် ၂၅၆ ကီလိုဘိုက်"
+msgstr "Cable/DSL 256 Kbps"
msgctxt "ServerPage"
msgid "Cable/DSL 512 Kbps"
-msgstr "ကေဘယ်/ဒီအက်စ်အယ်လ် တစ်စက္ကန့်လျှင် ၅၁၂ ကီလိုဘိုက်"
+msgstr "Cable/DSL 512 Kbps"
msgctxt "ServerPage"
msgid "Cable/DSL 768 Kbps"
-msgstr "ကေဘယ်/ဒီအက်စ်အယ်လ် တစ်စက္ကန့်လျှင် ၇၆၈ ကီလိုဘိုက်"
+msgstr "Cable/DSL 768 Kbps"
msgctxt "ServerPage"
msgid "T1/Cable/DSL 1.5 Mbps"
-msgstr "တီ ၁/ကေဘယ်/ဒီအက်စ်အယ်လ် တစ်စက္ကန့်လျှင် ၁.၅ မဂ္ဂါဘိုက်"
+msgstr "T1/Cable/DSL 1.5 Mbps"
msgctxt "ServerPage"
msgid "> 1.5 Mbps"
-msgstr "> တစ်စက္ကန့်လျှင် ၁.၅ မဂ္ဂါဘိုက်"
+msgstr "> 1.5 Mbps"
msgctxt "ServerPage"
msgid "Custom"
-msgstr "စိတ်ကြိုက်"
+msgstr "စိတ္ၾကိဳက္ျပင္ဆင္ရန္"
msgctxt "ServerPage"
msgid "Select the entry that most closely resembles your Internet connection"
-msgstr "သင်၏ အင်တာနက်ချိတ်ဆက်မှုနှင့် အလွန်နီးစပ်စွာ တူညီသည့် အချက်အလက်ကို ရွေးချယ်ပါ။"
+msgstr "သင္၏ အင္တာနက္ ဆက္သြယ္မႈႏွင့္ အနီးစပ္ဆံုး ထည့္သြင္းထားခ်က္ကို ေရြးခ်ယ္ပါ"
msgctxt "ServerPage"
msgid "Show help topic on bandwidth rate limits"
-msgstr "ဘန်ဝင့်နှုန်းကန့်သတ်ချက်များနှင့်ပတ်သက်သည့် အကူအညီပေးခေါင်းစဉ်ကို ပြပါ။"
+msgstr "Bandwidth ႏွန္း ကန္႕သတ္ခ်က္အတြက္ အကူအညီအေၾကာင္းအရာမ်ား ျပသရန္"
msgctxt "ServerPage"
msgid "Average Rate"
-msgstr "ပျမ်းမျှ နှုန်း"
+msgstr "ပ်မ္းမွ် ႏႈန္း"
msgctxt "ServerPage"
msgid "Long-term average bandwidth limit"
-msgstr "ရေရှည် ပျမ်းမျှ ဒေတာကူးပြောင်းနှုန်း ကန့်သတ်ချက်"
+msgstr "ေရရွည္ ပ်မ္းမွ် bandwidth သတ္မွတ္ခ်က္"
msgctxt "ServerPage"
msgid "KB/s"
-msgstr "တစ်စက္ကန့်လျှင် ကီလိုဘိုက်"
+msgstr "KB/s"
msgctxt "ServerPage"
msgid "Maximum Rate"
-msgstr "အမြင့်ဆုံး နှုန်း"
+msgstr "အျမင့္ဆံုး ႏႈန္း"
msgctxt "ServerPage"
msgid "Peak bandwidth rate limit"
-msgstr "အမြင့်ဆုံး ဒေတာကူးပြောင်းနှုန်း ကန့်သတ်ချက်"
+msgstr "အျမင့္ဆံုး bandwidth ႏႈန္း ကန္႕သတ္ခ်က္"
msgctxt "ServerPage"
msgid ""
"Your maximum bandwidth rate must be greater than or equal to your average "
"bandwidth rate. Both values must be at least 20 KB/s."
-msgstr "သင်၏ အများဆုံး ဒေတာကူးပြောင်းနှုန်းသည် သင်၏ ပျမ်းမျှဒေတာကူးပြောင်းနှုန်းထက် ပိုများ (သို့) တူညီ သင့်သည်။ ၎င်းဒေတာကူးပြောင်းနှုန်း တန်ဖိုးများသည် အနည်းဆုံး တစ်စက္ကန့်လျှင် ၂၀ ကီလိုဘိုက် ရှိသင့်သည်။"
+msgstr "သင္၏ အျမင့္ဆံုး bandwidth ႏႈန္း သည္ပ်မ္းမွ် bandwidth ႏႈန္း ထက္ ပိုျခင္း သို႕မဟုတ္ တူညီရပါမည္။ တန္ဖိုး ႏွစ္ခုလံုးသည္ အနည္းဆံုး 20 KB/s ရွိရပါမည္။"
msgctxt "ServerPage"
msgid "Bandwidth Limits"
-msgstr "ဘန်ဝင့်ကန့်သတ်ချက်များ"
+msgstr "Bandwidth ကန္႕သတ္ခ်က္"
msgctxt "ServerPage"
msgid "Ports 6660 - 6669 and 6697"
-msgstr "ဆက်သွက်ပေါက်နံပါတ်များ ၆၆၆၀-၆၆၆၉ နှင့် ၆၆၉၇"
+msgstr "Ports 6660 - 6669 and 6697"
msgctxt "ServerPage"
msgid "Internet Relay Chat (IRC)"
-msgstr "အင်တာနက် ရီလေး စကားပြော ပရိုဂရမ် (IRC)"
+msgstr "Internet Relay Chat (IRC)"
msgctxt "ServerPage"
msgid "Ports 110, 143, 993 and 995"
-msgstr "ဆက်သွယ်ပေါက်နံပါတ်များ ၁၁၀၊ ၁၄၃၊ ၉၉၃ နှင့် ၉၉၅"
+msgstr "Ports 110, 143, 993 and 995"
msgctxt "ServerPage"
msgid "Retrieve Mail (POP, IMAP)"
-msgstr "မေးလ်များ ရယူပါ။ (POP, IMAP)"
+msgstr "စာဆက္သြယ္ ရယူရန္ (POP, IMAP)"
msgctxt "ServerPage"
msgid "Ports unspecified by other checkboxes"
-msgstr "အခြားသော အမှန်ခြစ်ကွက်များမှ မသတ်မှတ်ထားသည့် ဆက်သွယ်ပေါက်များ"
+msgstr "အျခား checkboxes မ်ားမွ သတ္မွတ္မထားေသာ Ports မ်ား"
msgctxt "ServerPage"
msgid "Misc Other Services"
-msgstr " အခြား ဗျောက်သောက် ဝန်ဆောင်မှုများ"
+msgstr "အျခား အေထြေထြ ဝန္ေဆာင္မႈမ်ား"
msgctxt "ServerPage"
msgid "Ports 706, 1863, 5050, 5190, 5222, 5223, 8300 and 8888"
-msgstr "ဆက်သွယ်ပေါက်နံပါတ်များ ၇၀၆၊ ၁၈၆၃၊ ၅၀၅၀၊ ၅၁၉၀၊ ၅၂၂၃၊ ၈၃၀၀ နှင့် ၈၈၈၈"
+msgstr "Ports 706, 1863, 5050, 5190, 5222, 5223, 8300 and 8888"
msgctxt "ServerPage"
msgid "Instant Messaging (IM)"
-msgstr "သတင်းတို ပို့မှု စနစ် (IM)"
+msgstr "မက္ေဆ့ခ်က္ခ်င္းပို႕ေဆာင္မႈမ်ား (IM)"
msgctxt "ServerPage"
msgid "Port 443"
-msgstr "ဆက်သွယ်ပေါက်နံပါတ် ၄၄၃"
+msgstr "Port 443"
msgctxt "ServerPage"
msgid "Secure Websites (SSL)"
-msgstr "စိတ်ချရသည့် ဝက်ဘ်ဆိုက်များ (SSL)"
+msgstr "လံုျခံဳမႈရွိေသာ ဝက္ဘက္ဆုိက္မ်ား (SSL)"
msgctxt "ServerPage"
msgid "Port 80"
-msgstr "ဆက်သွယ်ပေါက်နံပါတ် ၈၀"
+msgstr "Port 80"
msgctxt "ServerPage"
msgid "Websites"
-msgstr "ဝက်ဘ်ဆိုက်များ"
+msgstr "ဝက္ဘ္ဆိုက္မ်ား"
msgctxt "ServerPage"
msgid "Show help topic on exit policies"
-msgstr "Exit Policies နှင့်ပတ်သက်၍ အကူအညီကိုဖော်ပြပါ။"
+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 သည် မလိုအပ်ပဲပို့လာသည့် အီးမေးလ်များနှင့် အခြား ထိပါးပုပ်ခတ်မှုများ လျော့ကျရန် ပုံမှန်အားဖြင့် အီးမေးလ်ထွက်စာအချို့နှင့်ဖိုင်မျှဝေသည့်အသုံးချပရိုဂရမ်များကို ပိတ်ပင်လိမ့်မည်။"
+msgstr "Tor သည္ အခ်ိဳ႕ေသာ ျပင္ပသို႕ ို႕လႊတ္သည့္ ေမးလ္မ်ားႏွင့္ ဖိုင္မွ်ေဝေသာ application မ်ားကို spam ႏွင့္ အျခား အလဲြသံုးမႈမ်ား ေလ်ာ့ခ်ႏုိင္ရန္အတြက္ တားျမစ္ထားပါသည္"
msgctxt "ServerPage"
msgid "Exit Policies"
-msgstr "Exit Policies"
+msgstr "ေပၚလစီမွ ထြက္ရန္"
msgctxt "ServerPage"
msgid "Let others access your bridge by giving them this line:"
-msgstr "ဖော်ပြပါ စာကြောင်းကို အခြားသူများအား ပေးခြင်းအားဖြင့် သင်၏ Bridge ကို ထိုသူများကို ပေး၍ ဝင်ရောက်ခွင့်ပြုပါ။"
+msgstr "အျခားသူမ်ားကုိ သင္၏ bridge ကုိ အသံုးျပဳခြင့္ရေစရန္ ေအာက္ပါစာသားကုိ ၄င္းတို႕အား ေပးပါ :"
msgctxt "ServerPage"
msgid ""
"This is the identity of your bridge relay that you can give to other people"
-msgstr "၎င်းမှာ သင်က အခြားလူများထံသို့ ပေးနိုင်သည့် သင်၏ Bridge Relay ၏ အမှတ်အသား ဖြစ်သည်။"
+msgstr "၄င္းသည္ သင့္ bridge ၏ အျခားသူမ်ားသို႕ ေပးႏုိင္ေသာ အမွတ္အသားျဖစ္သည္"
msgctxt "ServerPage"
msgid "Copy your bridge relay's identity to the clipboard"
-msgstr "သင်၏ Bridge Relay ၏ အမှတ်အသားကို ကူးယူမှတ်သားရာနေရာသို့ ကူးထားပါ။"
+msgstr "သင့္ Bridge ၏ အမွတ္အသားကို clipboard သို႕ ေကာ္ပီကူးပါ"
msgctxt "ServerPage"
msgid "No Recent Usage"
-msgstr "မကြာသေးမီက အသုံးပြုမှုများ မရှိပါ။"
+msgstr ""
msgctxt "ServerPage"
msgid "No clients have used your relay recently."
-msgstr "သင်၏ Relay အား မကြာသေးမီက အသုံးပြုခဲ့သည့် ကလိုင်းယက်များမရှိပါ။"
+msgstr ""
msgctxt "ServerPage"
msgid ""
"Leave your relay running so clients have a better chance of finding and "
"using it."
-msgstr "သင်၏ Relay ကို ဆက်လက် အလုပ်လုပ်ဆောင်စေရန်ပြုလုပ်ထားပါ။ သို့မှသာ ကလိုင်းယင့်များမှာ ၎င်း Relay ကို ရှာဖွေတွေ့မိပြီးအသုံးပြုနိုင်ရန် အခွင့်အရေးပိုမိုရနိုင်မည်ဖြစ်သည်။"
+msgstr ""
msgctxt "ServerPage"
msgid "Bridge History"
-msgstr "Bridge နောက်ခံရာဇဝင်"
+msgstr ""
msgctxt "ServerPage"
msgid "Vidalia was unable to retrieve your bridge's usage history."
-msgstr "Vidalia သည် သင်၏ Bridge ၏ အသုံးပြုမှုရာဇဝင်ကို ရနိုင်ရန် မတတ်နိုင်ပါ။"
+msgstr ""
msgctxt "ServerPage"
msgid ""
"Tor returned an improperly formatted response when Vidalia requested your "
"bridge's usage history."
-msgstr "Vidalia က သင်၏ Bridge အသုံးပြုမှု ရာဇဝင်ကို တောင်းဆိုသည့်အခါ Tor သည် ပုံစံမကျနသည့် ပြန်လည်တုံ့ပြန်ချက်ကို ပြန်လည်ရရှိသည်။"
+msgstr ""
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\">ကျွန်တော်၏ Bridge ကို မည်သူ အသုံးလိုက်သနည်း ?</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 "ကျွန်တော်၏ Bridge လိပ်စာကို အလိုအလျောက် ဖြန့်ဝေပါ။"
+msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network (exit relay)"
-msgstr "Tor ကွန်ယက်အတွက် Relay Traffic (Exit Relay)"
+msgid "Relay traffic inside the Tor network (non-exit relay)"
+msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic inside the Tor network (non-exit relay)"
-msgstr "Tor ကွန်ယက်အတွင်းရှိ Relay Traffic ( Exit Relay မဟုတ်ပါ။)"
+msgid "Relay traffic for the Tor network (exit relay)"
+msgstr ""
msgctxt "ServerPage"
msgid "Mirror the Relay Directory"
-msgstr "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 "သင်၏ Relay နှင့် ပတ်သက်၍ ပြဿနာတစုံတရာ ဖြစ်လျှင် သင် ရောက်ရှိသွားနိုင်သည့် \nအီးမေးလ်လိပ်စာ။ သင်၏ PGP သို့မဟုတ် GPG လက်ဗွေရာစနစ်များလည်း ပါဝင်နိုင်သည်။"
+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 "အနည်းဆုံး ဝန်ဆောင်မှု့လမ်းကြောင်းတစ်ခုအားပြင်ဆင်ပါ ပြီးလျှင် အတုအယောက်ပေါက်၏ ဝန်ဆောင်မှု့တစ်ခုချင်းစီအားသိမ်ဆည်းရန်လိုအပ်သည်။ ပြီးလျှင် အခြားတစ်ခုအားဖယ်ထုတ်ပါ ။"
+msgstr "ေက်းဇူးျပဳ၍ သင္ သိမ္းဆည္းလိုေသာ ဝန္ေဆာင္မႈတစ္ခုစီအတြက္ အနည္းဆံုး service directory ႏွင့္ virtual port တစ္ခုစီ သတ္မွတ္ပါ။ အျခား အရာမ်ားကို ဖယ္ရွားပါ"
msgctxt "ServicePage"
msgid "Error"
-msgstr "ချို့ယွင်းချက်"
+msgstr "ခ်ိဳ႕ယြင္းမႈ"
msgctxt "ServicePage"
msgid "Please select a Service."
-msgstr "ကျေးဇူးပြု၍လမ်းကြောင်းရွှေးပါ"
+msgstr "ဝန္ေဆာင္မႈတစ္ခု ေရြးခ်ယ္ပါ"
msgctxt "ServicePage"
msgid "Select Service Directory"
-msgstr "ကျေးဇူးပြု၍လမ်းကြောင်းရွှေးပါ"
+msgstr "Service directory တစ္ခု ေရြးခ်ယ္ပါ"
msgctxt "ServicePage"
msgid "Virtual Port may only contain valid port numbers [1..65535]."
-msgstr "အတုအယောက်ပေါက်သည့် ဖြစ်နိုင်သည့်အပေါက်နံပတ် [1..65535]များသာပါဝင်သည် ။"
+msgstr "Virtual Port သည္ Port နံပါတ္ ၁ မွ ၆၅၅၃၅ အထိသာ အက်ံဳးဝင္ႏုိင္ပါသည္"
msgctxt "ServicePage"
msgid "Target may only contain address:port, address, or port."
-msgstr "လမ်းကြောင်းသည့် address:port, address, or port.သာပါဝင်သည် ။"
+msgstr "ပစ္မွတ္သည္ လိပ္စာ:port, လိပ္စာ သို႕မဟုတ္ port သာ ပါဝင္ႏုိင္ပါသည္"
msgctxt "ServicePage"
msgid "Directory already in use by another service."
-msgstr "ဖိုင်လမ်းကြောင်းသည် အခြားဝန်ဆောင်မှု့တွင်အသုံးပြုနေသည် "
-
-msgctxt "ServicePage"
-msgid "Form"
-msgstr "ဖောင်"
+msgstr "Directory သည္ အျခား ဝန္ေဆာင္မႈတစ္ခုမွ အသံုးျပဳႏွင့္ျပီး ျဖစ္ပါသည္"
msgctxt "ServicePage"
msgid "Provided Hidden Services"
-msgstr " အခြား ဗျောက်သောက် ဝန်ဆောင်မှုများ"
+msgstr "လွ်ိဳ႕ဝွက္ဝန္ေဆာင္မႈမ်ား ရရွိျပီး ျဖစ္ပါသည္"
msgctxt "ServicePage"
msgid "Onion Address"
-msgstr "_M လျှပ်လိပ်စာ - "
+msgstr "Onion လိပ္စာ"
msgctxt "ServicePage"
msgid "Virtual Port"
-msgstr "_M မိုဒင်း port - "
+msgstr "Virtual Port"
msgctxt "ServicePage"
msgid "Target"
-msgstr "ရည်ညွှန်းငွေကြေး"
+msgstr "ပစ္မွတ္"
msgctxt "ServicePage"
msgid "Directory Path"
-msgstr "_F ဖိုင်တွဲတည်ရှိရာလမ်းကြောင်း −"
+msgstr "Directory လမ္းေၾကာင္း"
msgctxt "ServicePage"
msgid "Enabled"
-msgstr "လက်ခံ"
+msgstr "လုပ္ေဆာင္ႏုိင္ပါသည္"
msgctxt "ServicePage"
msgid "Add new service to list"
-msgstr "မှတ်သားချက်အသစ်ကို iPod ပေါ်တွင်ထည့်ရန်"
+msgstr "စာရင္းထဲသို႕ ဝန္ေဆာင္မႈအသစ္ ထည့္သြင္းရန္"
msgctxt "ServicePage"
msgid "Remove selected service from list"
-msgstr "စာရင်းထဲမှ ရွေးချယ်ထားသည့် Bridge များကို ဖယ်ရှားပါ။"
+msgstr "စာရင္းထဲမွ ေရြးခ်ယ္ထားေသာ ဝန္ေဆာင္မႈကုိ ဖယ္ရွားရန္"
msgctxt "ServicePage"
msgid "Copy onion address of selected service to clipboard"
-msgstr "Onion ၏ရွေးချယ်ထားသည့်လိပ်စာအားရွေးချယ်၍ ကလစ်ဘုတ်သို့ကူးပါ"
+msgstr "ေရြးခ်ယ္ထားေသာ ဝန္ေဆာင္မႈ၏ Onion လိပ္စာကို clipboard သို႕ ကူးရန္"
msgctxt "ServicePage"
msgid "Browse in local file system and choose directory for selected service"
-msgstr "လိုကယ်ဖိုင်စနစ်အားဖွင့်ပါပြီးလျှင် ရွေးချယ်ထားသည့်ဝန်ဆောင်မှု့အတွက်လမ်းကြောင်းကိုရွေးချယ်ပါ"
+msgstr "local ဖိုင္ စနစ္အတြင္းတြင္ ေရြးခ်ယ္ထားေသာ ဝန္ေဆာင္မႈအတြက္ directory ေရြးခ်ယ္ေပးပါ"
msgctxt "ServicePage"
msgid "Created by Tor"
-msgstr "Tor ပုံစံချမှတ်ဖိုင်"
+msgstr "Tor မွ တီထြင္ဖန္တီးသည္"
msgctxt "StatusEventWidget"
msgid "Copy to Clipboard"
-msgstr "မှတ်စရာနေရာသို့ ကူးယူပါ။"
+msgstr ""
msgctxt "StatusEventWidget"
msgid "The Tor Software is Running"
-msgstr "Tor ဆော့ဖ်ဝဲလ်သည် အလုပ်လုပ်ဆောင်နေသည်။"
+msgstr ""
msgctxt "StatusEventWidget"
msgid "You are currently running version \"%1\" of the Tor software."
-msgstr "Tor ဆော့ဖ်ဝဲလ် ဗားရှင်း \"%1\" ကို လက်ရှိ အသုံးပြုနေသည်။"
+msgstr ""
msgctxt "StatusEventWidget"
msgid "The Tor Software is not Running"
-msgstr "Tor ဆော့ဖ်ဝဲလ်သည် အလုပ်မလုပ်ဆောင်ပါ။"
+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 "Tor ဆော့ဖ်ဝဲလ်ကို အစမှ ပြန်စ ရန် Vidalia ထိန်းချုပ်မှုနေရာတွင် \"Start Tor\" ကို နှိပ်ပါ။ အကယ်၍ Tor သည် မမျှော်လင့်ပဲ ထွက်သွားလျှင် ဖြစ်ပွားသည့် မည်သည့်ချို့ယွင်းချက်များနှင့်ပတ်သက်၍ အသေးစိတ် သိရှိရန် \"Advanced\" တက်ဘ် ကို ရွေးချယ်ပါ။"
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
@@ -3240,7 +3144,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 ""
msgctxt "StatusEventWidget"
msgid ""
@@ -3248,31 +3152,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 "သင်သည် နောက်ထပ် အကြံပြုထားခြင်း မရှိတော့သော Tor ဆော့ဖ်ဝဲလ်၏ ဗားရှင်း \"%1\" ကို လက်ရှိတွင် ဖွင့်ထားခြင်း ဖြစ်သည်။ ကျေးဇူးပြု၍ အရေးကြီးသည့် လုံခြုံမှု။ ယုံကြည်စိတ်ချရမှုနှင့် လုပ်ဆောင်မှုပြင်ဆင်မှုများ ပါဝင်သည့် မကြာသေးမီက ထုတ်သော ဆော့ဖ်ဝဲလ်သို့ အဆင့်တိုးမြှင့်ပါ။"
+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 ""
"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: \"%1\" ရှိ Tor ဆော့ဖ်ဝဲလ် ရေးသားကြသူများထံသို့ ဖော်ပြပါ ချို့ယွင်းချက်သတင်းလွှာကို ကျေးဇူးပြု၍ အစီရင်ခံစာတင်ပါ။"
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
@@ -3280,7 +3184,7 @@ msgid ""
"the past compared to the source \"%2\". If your clock is not correct, Tor "
"will not be able to function. Please verify your computer displays the "
"correct time."
-msgstr "သင်၏ ကွန်ပျူတာရှိ နာရီသည် မူလရင်းမြ်စ် \"%2\" နှင့် နှိုင်းယှဉ်လျှင် ယခင်က %1 စက္ကန့်ဟု သတ်မှတ်ကောင်းသတ်မှတ်လိမ့်မည်ဟု Tor က စစ်ဆေးတွေ့ရှိသည်။ အကယ်၍ သင်၏ နာရီသည် မမှန်ကန်လျှင် Tor သည် အလုပ်ကို ကောင်းစွာ လုပ်နိုင်တော့မည်မဟုတ်ပါ။ သင်၏ ကွန်ပျူတာသည် နာရီအမှန် ပြသ ကြောင်းကို ကျေးဇူးပြု၍ သေချာစွာ စစ်ဆေးအတည်ပြုပါ။"
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
@@ -3288,11 +3192,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 "သင်၏ ကွန်ပျူတာရှိ နာရီသည် မူလရင်းမြ်စ် \"%2\" နှင့် နှိုင်းယှဉ်လျှင် နောင်လာမည့် အချိန်ကာလ၌ %1 စက္ကန့်ဟု သတ်မှတ်ကောင်းသတ်မှတ်လိမ့်မည်ဟု Tor က စစ်ဆေးတွေ့ရှိသည်။ အကယ်၍ သင်၏ နာရီသည် မမှန်ကန်လျှင် Tor သည် အလုပ်ကို ကောင်းစွာ လုပ်နိုင်တော့မည်မဟုတ်ပါ။ သင်၏ ကွန်ပျူတာသည် နာရီအမှန် ပြသ ကြောင်းကို ကျေးဇူးပြု၍ သေချာစွာ စစ်ဆေးအတည်ပြုပါ။"
+msgstr ""
msgctxt "StatusEventWidget"
msgid "Your Computer's Clock is Potentially Incorrect"
-msgstr "သင်၏ကွန်ပျူတာရှိ နာရီသည် မှားယွင်းနေကြောင်း အလားအလာရှိသည်။"
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
@@ -3300,18 +3204,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 "သင်၏ ကွန်ပျူတာရှိ အသုံးချပရိုဂရမ်များအနက်တစ်ခုသည် ဆက်သွယ်ပေါက် %1 သို့ Tor မှတဆင့် စာဝှက်မဟုတ်သော အင်တာနက်ချိတ်ဆက်မှုတစ်ခု တည်ဆောက်ရန် ကြိုးစားလာခဲ့သည်။ Tor ကွန်ယက်မှ စာဝှက်မဟုတ်သောသတင်းအချက်အလက်ကို ပို့လွှတ်ခြင်းသည် အန္တရာယ်ရှိပြီး အကြံပြုတိုက်တွန်းထားခြင်း မရှိပါ။ သင်၏ အကာအကွယ်အတွက် Tor သည် ယင်း အင်တာနက်ချိတ်ဆက်မှုကို အလိုအလျောက် ပိတ်လိုက်သည်။"
+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 "သင်၏ကွန်ပျူတာရှိ အသုံးချပရိုဂရမ်များအနက် တစ်ခု သည် %1ဆက်သွယ်ပေါက်သို့ Tor မှတဆင့် စာမဝှက်ထားသည့် အင်တာနက်ချိတ်ဆက်မှုကို တည်ဆောက်ရန် ကြိုးစားခဲ့ကောင်းကြိုးစားခဲ့မည်။ Tor ကွန်ယက်မှတဆင့် မလုံခြုံသည့် သတင်းအချက်အလက်များကို ပို့လွှတ်ခြင်းသည် အန္တရာယ်များပြီး အကြံပြုတိုက်တွန်းထားခြင်းမရှိပါ။"
+msgstr ""
msgctxt "StatusEventWidget"
msgid "Potentially Dangerous Connection!"
-msgstr "အန္တရာယ်များသော အင်တာနက်ချိတ်ဆက်မှု ဖြစ်ကြောင်း အလားအလာရှိသည် !"
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
@@ -3319,81 +3223,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 "သင်၏ အသုံးချပရိုဂရမ်များအနက်တစ်ခုသည် သင်၏ဦးတည်ရာနှင့်ပတ်သက်၍ သတင်းအချက်အလက်များ ပေါက်ကြားကောင်းပေါက်ကြားနိုင်သည့် ပရိုတိုကောတစ်ခုကို အသုံးပြုထားသည့် \"%1\" သို့ Tor မှတဆင့် အင်တာနက်ချိတ်ဆက်မှုကို တည်ဆောက်ခဲ့သည်။ အဝေးရှိ စက်အမည် ဖန်သားပြင်အချိုးအစားနှင့်အတူ SOCKS4a သို့ SOCKS5 မျှသာ အသုံးပြုရန် ကျေးဇူးပြု၍ သင်၏ အသုံးချပရိုဂရမ်များကို ပုံစံချမှတ်သည်မှာ သေချာစေရန် ပြုလုပ်ပါ။"
+msgstr ""
msgctxt "StatusEventWidget"
msgid "Unknown SOCKS Protocol"
-msgstr "အမျိုးအမည်မသိသည့် SOCKS ပရိုတိုကော"
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
"One of your applications tried to establish a connection through Tor using a"
" protocol that Tor does not understand. Please ensure you configure your "
"applications to use only SOCKS4a or SOCKS5 with remote hostname resolution."
-msgstr "သင်၏ အသုံးချပရိုဂရမ်များအနက်တစ်ခုသည် Tor က နားမလည်သည့် ပရိုတိုကောတစ်ခုကို သုံး၍ Tor မှတဆင့် အင်တာနက်ချိတ်ဆက်မှုကို တည်ဆောက်ရန်ကြိုးစားခဲ့သည်။ အဝေးရှိ စက်အမည် ဖန်သားပြင်အချိုးအစားနှင့်အတူ SOCKS4 သို့ SOCKS5 မျှသာ အသုံးပြုရန် သင်၏ အသုံးချပရိုဂရမ်များကို ကျေးဇူးပြု၍ ပုံစံချမှတ်ထားသည်မှာ သေချာစေရန် ပြုလုပ်ပါ။"
+msgstr ""
msgctxt "StatusEventWidget"
msgid "Invalid Destination Hostname"
-msgstr "လက်သင့်မခံနိုင်သော ဦးတည်ရာ စက်အမည်"
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
"One of your applications tried to establish a connection through Tor to "
"\"%1\", which Tor does not recognize as a valid hostname. Please check your "
"application's configuration."
-msgstr "သင်၏ အသုံးချပရိုဂရမ်များအနက် တစ်ခုသည် လက်ခံနိုင်သည့် စက်နာမည်အဖြစ် Tor က မသိနိုင်သည့် \"%1\" သို့ Tor မှတဆင့် အင်တာနက်ချိတ်ဆက်မှု တည်ဆောက်ရန် ကြိုးစားသည်။ ကျေးဇူးပြု၍ သင်၏ အသုံးချပရိုဂရမ်၏ ပုံစံချမှတ်ခြင်းကို စစ်ဆေးပါ။"
+msgstr ""
msgctxt "StatusEventWidget"
msgid "External IP Address Changed"
-msgstr "ပြင်ပ အိုင်ပီ လိပ်စာ ပြောင်းလဲထားသည်။"
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
"Tor has determined your relay's public IP address is currently %1%2. If that"
" is not correct, please consider setting the 'Address' option in your "
"relay's configuration."
-msgstr "သင်၏ Relay ၏ အများသုံး အင်တာနက်လိပ်စာမှာ လက်ရှိ၌ %1%2 ဖြစ်ကြောင်းကို Tor သည် သိရှိထားသည်။ အကယ်၍ ၎င်းမှာ မမှန်ကန်ပါလျှင် သင်၏ Relay ၏ ပုံစံချမှတ်ချက်၌ \"လိပ်စာ\" ရွေးချယ်ချက်ကို ကျေးဇူးပြု၍ ထည့်သွင်း စဉ်းစားပေးပါ။"
+msgstr ""
msgctxt "StatusEventWidget"
msgid "DNS Hijacking Detected"
-msgstr "DNS နေရာခိုးယူခြင်း စစ်ဆေးတွေ့ရှိသည်။"
+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 "သင်၏ ဒိုမိန်းအမည်ဝန်ဆောင်မှုကုမ္ပဏီသည် တကယ်မရှိသည့် ဒိုမိန်းများအတွက် မှားယွင်းသည့် ပြန်လည်တုံ့ပြန်မှုများကို ရယူနေသည်ဟု Tor က သိရှိသွားသည်။ ဖော်ပြပါ လုပ်ဆောင်မှုများမှာ အချို့သော အင်တာနက်ဝန်ဆောင်မှုကုမ္ပဏီများနှင့် OpenDNS ကဲ့သို့သော အခြား ဒိုမိန်းအမည်ဝန်ဆောင်မှုကုမ္ပဏီများသည် သူတို့ဘာသာသူတို့ ရှာဖွေမှုပြုလုပ်ရန် (သို့) ကြော်ငြာစာမျက်နှာများကို ဖော်ပြရန် အလို့ငှာ လုပ်ဆောင်ခြင်း ဖြစ်သည်။"
+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 "သင်၏ ဒိုမိန်းအမည်ဝန်ဆောင်မှုကုမ္ပဏီသည် လူသိများသည့် ဒိုမိန်းများအတွက် မှားယွင်းသည့် ပြန်လည်တုံ့ပြန်မှုများကို ရယူနေသည်ဟု Tor က သိရှိသွားသည်။ တိကျသည့် DNS ပြန်လည်တုံ့ပြန်ချက်များ ရယူရန် Tor ကွန်ယက် Relay များအပေါ် ကလိုင်းယက်များက မှီခိုအားထားရကတည်းက သင်၏ Relay အား Exit Relay အနေဖြင့် ပုံစံချမှတ်မည် မဟုတ်ပါ။"
+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 "သင်၏ Relay ရှိ ဖိုင်လမ်းကြောင်းဆက်သွယ်ပေါက်က Tor ကွန်ယက်မှ %1:%2 ၌ သူ့ဘာသာသူ ချိတ်ဆက်ခြင်းဖြင့် ရောက်ရှိနိုင်ကြောင်းကို Tor သည် ဆုံးဖြတ်ရန် ကြိုးစားနေသည်။ ၎င်းစစ်ဆေးမှုမှာ မိနစ်အတန်ကြာ ကြာမြင့်နိုင်သည်။"
+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 "သင်၏ Relay ရှိ ဆာဗာ ဆက်သွယ်ပေါက်သည် Tor ကွန်ယက်မှ ရောက်နိုင်သည် !"
+msgstr ""
msgctxt "StatusEventWidget"
msgid "Server Port Reachability Test Failed"
-msgstr "ဆာဗာ ဆက်သွယ်ပေါက် ရောက်ရှိနိုင်စွမ်း စစ်ဆေးမှု မအောင်မြင်ပါ။"
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
@@ -3401,30 +3305,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 "သင်၏ Relay ၏ ဖိုင်လမ်းကြောင်းဆက်သွယ်ပေါက်သို့ အခြားသော Tor ကလိုင်းယက်များမှ မရောက်ရှိနိုင်ပါ။ အကယ်၍ သင်သည် Port Forwarding တည်ဆောက်ရန် လိုအပ်သည့် Router သို့မဟုတ် Firewall တစ်ခုခု နောက်၌ ရှိနေပါလျှင် ၎င်းသည် ဖြစ်နိုင်သည်။ အကယ်၍ %1:%2 သည် သင်၏ မှန်ကန်သည့် အင်တာနက်လိပ်စာ နှင့် ဖိုင်လမ်းကြောင်းဆက်သွယ်ပေါက်တို့ မဟုတ်လျှင် ကျေးဇူးပြု၍ သင်၏ Relay ၏ ပုံစံချမှတ်ချက်ကို စစ်ဆေးပါ။"
+msgstr ""
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 "သင်၏ Relay ရှိ ဖိုင်လမ်းကြောင်းဆက်သွယ်ပေါက်က Tor ကွန်ယက်မှ %1:%2 ၌ သူ့ဘာသာသူ ချိတ်ဆက်ခြင်းဖြင့် ရောက်ရှိနိုင်ကြောင်းကို Tor သည် ဆုံးဖြတ်ရန် ကြိုးစားနေသည်။ ၎င်းစစ်ဆေးမှုမှာ မိနစ်အတန်ကြာ ကြာမြင့်နိုင်သည်။"
+msgstr ""
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 "သင်၏ Relay မှ ဖိုင်လမ်းကြောင်းဆက်သွယ်ပေါက်သည် Tor ကွန်ယက်မှ ရောက်ရှိနိုင်သည် !"
+msgstr ""
msgctxt "StatusEventWidget"
msgid "Directory Port Reachability Test Failed"
-msgstr "ဖိုင်လမ်းကြောင်း ဆက်သွယ်ပေါက် ရောက်ရှိနိုင်စွမ်း စစ်ဆေးမှု မအောင်မြင်ပါ။"
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
@@ -3432,21 +3336,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 "သင်၏ Relay ၏ ဖိုင်လမ်းကြောင်းဆက်သွယ်ပေါက်သို့ အခြားသော Tor ကလိုင်းယက်များမှ မရောက်ရှိနိုင်ပါ။ အကယ်၍ သင်သည် Port Forwarding တည်ဆောက်ရန် လိုအပ်သည့် Router သို့မဟုတ် Firewall တစ်ခုခု နောက်၌ ရှိနေပါလျှင် ၎င်းသည် ဖြစ်နိုင်သည်။ အကယ်၍ %1:%2 သည် သင်၏ မှန်ကန်သည့် အင်တာနက်လိပ်စာ နှင့် ဖိုင်လမ်းကြောင်းဆက်သွယ်ပေါက်တို့ မဟုတ်လျှင် ကျေးဇူးပြု၍ သင်၏ Relay ၏ ပုံစံချမှတ်ချက်ကို စစ်ဆေးပါ။"
+msgstr ""
msgctxt "StatusEventWidget"
msgid "Relay Descriptor Rejected"
-msgstr "Relay Descriptor အား ငြင်းဆန်ထားသည်။"
+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 "ကလိုင်းယက်များ သင်၏ Relay သို့ ဆက်သွယ်နိုင်စေရန် သင်၏ Relay ၏ Descriptor ကို ဖိုင်လမ်းကြောင်းဆာဗာမှ %1:%2 .၌ ငြင်းဆန်လိုက်သည်။ ပေးထားသည့် အကြောင်းပြချက်မှာ %3 ဟူ၍ ဖြစ်သည်။"
+msgstr ""
msgctxt "StatusEventWidget"
msgid "Your Relay is Online"
-msgstr "သင်၏ Relay မှာ အင်တာနက်ချိတ်ဆက်ထားသည်။"
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
@@ -3454,393 +3358,443 @@ msgid ""
"see an increase in network traffic shown by the Bandwidth Graph within a few"
" hours as more clients learn about your relay. Thank you for contributing to"
" the Tor network!"
-msgstr "သင်၏ Relay သည် ယခု အွန်လိုင်းပေါ်ရောက်ရှိနေပြီး Tor ကလိုင်းယက်များအတွက် အသုံးပြုရန် ရနိုင်သည်။ နောက်ထပ်ကလိုင်းယက်များက သင်၏ Relay အကြောင်းကို လေ့လာသိရှိလာသည်နှင့်အမျှ နာရီအနည်းငယ်အတွင်း ဘန်ဝင့်ပြဂရပ်မှ ဖော်ပြထားသည့် ကွန်ယက် အသွားအလာ ရှုပ်ထွေးမှု ပိုများလာသည်ကို သင်သည် တွေ့ရလိမ့်မည်။ Tor ကွန်ယက်သို့ ပါဝင်ပံ့ပိုးပေးခြင်းအတွက် ကျေးဇူးတင်ပါသည်။"
+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 " Remap ျပဳလုပ္ျပီးပါျပီ"
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 "လုပ္ေဆာင္မႈ %1 ရပ္တန္႕ရန္ မေအာင္ျမင္ပါ [%2]"
msgctxt "TorService"
msgid "The Tor service is not installed."
-msgstr "Tor ဆားဗစ်ကို စက်တွင်းသို့ မထည့်သွင်းထားပါ။"
+msgstr "The Tor ဝန္ေဆာင္မႈ ထည့္သြင္းမထားပါ"
msgctxt "TorService"
msgid "Unable to start the Tor service."
-msgstr "Tor ဝန်ဆောင်မှုကို အစ မပြုနိုင်ပါ။"
+msgstr "Tor ဝန္ေဆာင္မႈ မစတင္ႏုိင္ပါ"
msgctxt "TorSettings"
msgid "Failed to hash the control password."
-msgstr "ထိန်းချုပ် စကားဝှက်ကို Hash ရန် မအောင်မြင်ပါ။"
+msgstr "စကားဝွက္ထိန္းခ်ဳပ္ရန္ Hash လုပ္ေဆာင္မႈ မေအာင္ျမင္ပါ"
msgctxt "TorrcDialog"
msgid "Editing torrc"
-msgstr "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 "Aအားလုံး ရွေးချယ်"
+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\""
+msgstr ""
msgctxt "TorrcDialog"
msgid "Error at line %1: \"%2\""
-msgstr "%4: ချို့ယွင်းချက်: စာကြောင်းရေ: %1 - အတိုင်: %2\n%3"
+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 "UPnP လုပ္ေဆာင္ႏုိင္ေသာ ပစၥည္းကိရိယာမ်ား မေတြ႕ရိွပါ"
msgctxt "UPNPControl"
msgid "No valid UPnP-enabled Internet gateway devices found"
-msgstr "UPnP ကို ရနိုင်သည့် အင်တာနက် ကြားခံ စက်ပစ္စည်းများကို ရှာဖွေမတွေ့ရှိပါ။"
+msgstr "သင့္ေလွ်ာ္ေသာ UPnP လုပ္ေဆာင္ႏုိင္ေသာ အင္တာနက္ gateway ပစၥည္းကိရိယာမ်ား မေတြ႕ရွိပါ"
msgctxt "UPNPControl"
msgid "WSAStartup failed"
-msgstr "WSAStartUp စနစ် မအောင်မြင်ပါ။"
+msgstr "WSA စတင္မႈ မေအာင္ျမင္ပါ"
msgctxt "UPNPControl"
msgid "Failed to add a port mapping"
-msgstr "ဆက်သွယ်ပေါက်ချိတ်ဆက်မှုထည့်ရန်မအောင်မြင်ပါ။"
+msgstr "Port mapping ထည့္သြင္းမႈ မေအာင္ျမင္ပါ"
msgctxt "UPNPControl"
msgid "Failed to retrieve a port mapping"
-msgstr "ဆက်သွယ်ပေါက်ချိတ်ဆက်မှုကို ရယူရန် မအောင်မြင်ပါ။"
+msgstr "Port mapping ျပန္လည္ ရယူရန္ မေအာင္ျမင္ပါ"
msgctxt "UPNPControl"
msgid "Failed to remove a port mapping"
-msgstr "ဆက်သွယ်ပေါက်ချိတ်ဆက်မှုကို ဖယ်ရှားရန် မအောင်မြင်ပါ။"
+msgstr "Port mapping ဖယ္ရွားရန္ မေအာင္ျမင္ပါ"
msgctxt "UPNPControl"
msgid "Unknown error"
-msgstr "အမည်မသိအမှား"
+msgstr "အမည္မသိ ခ်ိဳ႕ယြင္းမႈ"
msgctxt "UPNPTestDialog"
msgid "Discovering UPnP-enabled devices"
-msgstr "UPnP ကို ရနိုင်သည့် စက်ပစ္စည်းများကို လိုက်လံရှာဖွေခြင်း"
+msgstr "UPnP လုပ္ေဆာင္ႏုိင္ေသာ ပစၥည္းကိရိယာမ်ား ရွာေဖြေနပါသည္"
msgctxt "UPNPTestDialog"
msgid "Updating directory port mapping"
-msgstr "ဖိုင်လမ်းကြောင်းဆက်သွယ်ပေါက်ချိတ်ဆက်မှုကို အဆင့်တိုးမြှင့်ခြင်း"
+msgstr "Directory port mapping ကို အသစ္ထည့္သြင္းေနပါသည္"
msgctxt "UPNPTestDialog"
msgid "Updating relay port mapping"
-msgstr "Relay ဆက်သွယ်ပေါက် ချိတ်ဆက်မှုကို အဆင့် တိုးမြှင့်ခြင်း"
+msgstr "Relay port mapping ကုိ အသစ္ထည့္သြင္းေနပါသည္"
msgctxt "UPNPTestDialog"
msgid "Test completed successfully!"
-msgstr "စစ်ဆေးမှု အောင်မြင်စွာ ပြီးမြောက်ပါပြီ!"
+msgstr "စမ္းသပ္မႈ ေအာင္ျမင္စြာ ျပီးစီးပါျပီ!"
msgctxt "UPNPTestDialog"
msgid "Testing UPnP Support"
-msgstr "UPnP အထောက်အကူကို စစ်ဆေးခြင်း"
+msgstr "UPnP ေထာက္ပံ့မႈ စမ္းသပ္ေနပါသည္"
msgctxt "UPNPTestDialog"
msgid "Testing Universal Plug & Play Support"
-msgstr "စက်များကို အလွယ်တကူ ဖြုတ်နိုင်၊ တပ်နိုင်မှု အထောက်အပံ့ကို စစ်ဆေးခြင်း"
+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 က မစစ်ဆေးပေးနိုင်ပါ။"
+msgstr ""
msgctxt "UpdateProcess"
msgid ""
"Vidalia was unable to check for available software updates because Tor's "
"update process exited unexpectedly."
-msgstr "Tor ၏ အဆင့်မြှင့်တင်မှုအလုပ်လုပ်ဆောင်မှုမှာ မမျှော်လင့်ပဲ ရပ်တန့်သွားသောကြောင့် Vidalia သည် ရနိုင်သည့် ဆော့ဖ်ဝဲလ် အဆင့်မြှင့်တင်မှုများကို စစ်ဆေးရန် မရနိုင်ပါ။"
+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 "Browse"
msgctxt "Vidalia"
msgid "Invalid Argument"
-msgstr "လက်သင့်မခံသော ပေးချက်"
+msgstr "မမွန္ကန္ေသာ Argument"
msgctxt "Vidalia"
msgid "Vidalia is already running"
-msgstr "Vidalia သည် အလုပ်လုပ်ဆောင်နေနှင့်ပြီ။"
+msgstr "Vidalia အလုပ္လုပ္ေဆာင္ေနျပီးျဖစ္ပါသည္"
msgctxt "Vidalia"
msgid "Displays this usage message and exits."
-msgstr "အသုံးပြုမှုပြသတင်းလွှာကိုပြသပြီးထွက်သွားပါ။"
+msgstr "ဤ လုပ္ေဆာင္မႈ သတင္းအခ်က္အလက္ကို ျပသ၍ ထြက္ပါ"
msgctxt "Vidalia"
msgid "Resets ALL stored Vidalia settings."
-msgstr "အားလုံးသော သိမ်းထားသည့် Vidalia စနစ်ပြင်ဆင်မှုများကို ပြန်လည်သတ်မှတ်ပါ။"
+msgstr "Vidalia ျပင္ဆင္ထိန္းညိွမႈမ်ား အားလံုးကုိ မူလသို႕ ျပန္လည္ ျပင္ဆင္ပါ"
msgctxt "Vidalia"
msgid "Sets the directory Vidalia uses for data files."
-msgstr "ဒေတာဖိုင်များအတွက် Vidalia သုံးရန် ဖိုင်လမ်းကြောင်းကို သတ်မှတ်ပါ။"
+msgstr "Vidalia data file မ်ား အတြက္ directory သတ္မွတ္ပါ"
msgctxt "Vidalia"
msgid "Sets the name and location of Vidalia's pidfile."
-msgstr "Vidalia ၏ pidfile အမည်နှင့် တည်နေရာ တို့ကို သတ်မှတ်ပါ။"
+msgstr "Vidalia ၏ pidfile ကုိ အမည္ႏွင့္ေနရာကုိ သတ္မွတ္ပါ"
msgctxt "Vidalia"
msgid "Sets the name and location of Vidalia's logfile."
-msgstr "Vidalia ၏ မှတ်တမ်းဖိုင် ၏ အမည်နှင့် တည်နေရာကို သတ်မှတ်ပါ။"
+msgstr "Vidalia ၏ မွတ္တမ္းဖုိင္ကုိ အမည္ႏွင့္ေနရာကုိ သတ္မွတ္ပါ"
msgctxt "Vidalia"
msgid "Sets the verbosity of Vidalia's logging."
-msgstr "Vidalia ၏ မှတ်တမ်းသိမ်းခြင်း၏ verbosity ကို သတ်မှတ်ပါ။"
+msgstr "Vidalia ၏ မွတ္တမ္းတင္ျခင္း မည္မွ် ရွည္ၾကာစြာထားရွိမည္ဆိုသည္ကုိ သတ္မွတ္ပါ"
msgctxt "Vidalia"
msgid "Sets Vidalia's interface style."
-msgstr "Vidalia ၏ မျက်နှာစာ ဒီဇိုင်းပုံစံကို သတ်မှတ်ပါ။"
+msgstr "Vidalia ၏ ၾကားခံဆက္သြယ္မႈ ပံုစံကုိ သတ္မွတ္ပါ"
msgctxt "Vidalia"
msgid "Sets Vidalia's language."
-msgstr "Vidalia ၏ ဘာသာစကား ကို သတ်မှတ်ပါ။"
+msgstr "Vidalia ၏ ဘာသာစကားကုိ သတ္မွတ္ပါ"
msgctxt "Vidalia"
msgid "Vidalia Usage Information"
-msgstr "Vidalia သုံးစွဲမှု သတင်းအချက်အလက်"
+msgstr "Vidalia အသံုးျပဳမႈ သတင္းအခ်က္အလက္မ်ား"
msgctxt "Vidalia"
msgid "Unable to open log file '%1': %2"
-msgstr "မှတ်တမ်းဖိုင် '%1': %2 ကို မဖွင့်နိုင်ပါ။"
-
-msgctxt "Vidalia"
-msgid "Value required for parameter :"
-msgstr "ပါရာမီတာအတွက် လိုအပ်သော တန်ဖိုး -"
+msgstr "မွတ္တမ္း ဖုိင္ကုိ မဖြင့္ႏိုင္ပါ '%1': %2"
msgctxt "Vidalia"
msgid "Invalid language code specified:"
-msgstr "မမှန်ကန်သော ဘာသာစကား ကုဒ်နံပါတ် သတ်မှတ်ချက် - "
+msgstr ""
msgctxt "Vidalia"
msgid "Invalid GUI style specified:"
-msgstr "မမှန်ကန်သော မျက်နှာစာအသွင်အပြင်စတိုင်သတ်မှတ်ချက် -"
+msgstr ""
msgctxt "Vidalia"
msgid "Invalid log level specified:"
-msgstr "မမှန်ကန်သော မှတ်တမ်း အဆင့်အတန်း သတ်မှတ်ချက် -"
+msgstr ""
msgctxt "Vidalia"
msgid ""
"Another Vidalia process is possibly already running. If there really is not another Vidalia process running, you can choose to continue anyway.\n"
"\n"
"Would you like to continue starting Vidalia?"
-msgstr "အခြား Vidalia အလုပ်လုပ်ဆောင်ချက်မှာ အလုပ်လုပ်ကောင်းလုပ်နေသည်။ အကယ်၍ အခြား Vidalia အလုပ်လုပ်ဆောင်ချက်မှာ အမှန်တကယ် အလုပ်လုပ်နေလျှင် မည်သည့်နည်းလမ်းဖြင့်မဆို ဆက်သွားရန် ရွေးချယ်နိုင်သည်။\n\nVidalia ကို အစပြု၍ ဆက်သွားချင်ပါသလား။"
+msgstr ""
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/nah/qt_nah.po b/src/vidalia/i18n/po/nah/qt_nah.po
index 7e81cec..90d2fc4 100644
--- a/src/vidalia/i18n/po/nah/qt_nah.po
+++ b/src/vidalia/i18n/po/nah/qt_nah.po
@@ -1,11 +1,10 @@
#
-# Translators:
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-08-20 03:25+0000\n"
-"PO-Revision-Date: 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"
@@ -431,5 +430,3 @@ msgstr ""
msgctxt "QFileSystemModel"
msgid "%1 bytes"
msgstr ""
-
-
diff --git a/src/vidalia/i18n/po/nah/vidalia_nah.po b/src/vidalia/i18n/po/nah/vidalia_nah.po
index 2548a22..d85f07d 100644
--- a/src/vidalia/i18n/po/nah/vidalia_nah.po
+++ b/src/vidalia/i18n/po/nah/vidalia_nah.po
@@ -1,11 +1,10 @@
#
-# Translators:
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-09-07 14:40+0000\n"
-"PO-Revision-Date: 2010-12-05 20:03+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"
@@ -193,10 +192,6 @@ 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"
@@ -236,10 +231,6 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr ""
-
-msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -279,6 +270,10 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr ""
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -432,17 +427,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"
@@ -1266,44 +1270,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"
@@ -1331,10 +1342,6 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr ""
-
-msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1362,6 +1369,10 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr ""
+
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1644,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 ""
@@ -1680,10 +1663,6 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1796,10 +1775,6 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1882,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 ""
@@ -1934,82 +1897,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 ""
@@ -2057,19 +1949,39 @@ 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)"
+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"
@@ -2091,17 +2003,35 @@ msgid ""
msgstr ""
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"
@@ -2357,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"
@@ -2412,10 +2334,6 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2515,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 ""
@@ -2840,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 ""
@@ -3088,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 ""
@@ -3132,10 +3070,6 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
-msgid "Form"
-msgstr ""
-
-msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3424,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 ""
@@ -3460,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 ""
@@ -3538,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 ""
@@ -3666,6 +3646,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 ""
@@ -3759,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 ""
@@ -3812,5 +3796,3 @@ msgstr ""
msgctxt "stringutil.h"
msgid "%1 mins"
msgstr ""
-
-
diff --git a/src/vidalia/i18n/po/nap/qt_nap.po b/src/vidalia/i18n/po/nap/qt_nap.po
index b06e33a..075d88b 100644
--- a/src/vidalia/i18n/po/nap/qt_nap.po
+++ b/src/vidalia/i18n/po/nap/qt_nap.po
@@ -1,11 +1,10 @@
#
-# Translators:
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-08-20 03:25+0000\n"
-"PO-Revision-Date: 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"
@@ -431,5 +430,3 @@ msgstr ""
msgctxt "QFileSystemModel"
msgid "%1 bytes"
msgstr ""
-
-
diff --git a/src/vidalia/i18n/po/nap/vidalia_nap.po b/src/vidalia/i18n/po/nap/vidalia_nap.po
index 2d86fa5..e29d861 100644
--- a/src/vidalia/i18n/po/nap/vidalia_nap.po
+++ b/src/vidalia/i18n/po/nap/vidalia_nap.po
@@ -1,11 +1,10 @@
#
-# Translators:
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-09-07 14:40+0000\n"
-"PO-Revision-Date: 2010-12-05 20:03+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"
@@ -193,10 +192,6 @@ 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"
@@ -236,10 +231,6 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr ""
-
-msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -279,6 +270,10 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr ""
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -432,17 +427,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"
@@ -1266,44 +1270,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"
@@ -1331,10 +1342,6 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr ""
-
-msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1362,6 +1369,10 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr ""
+
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1644,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 ""
@@ -1680,10 +1663,6 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1796,10 +1775,6 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1882,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 ""
@@ -1934,82 +1897,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 ""
@@ -2057,19 +1949,39 @@ 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)"
+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"
@@ -2091,17 +2003,35 @@ msgid ""
msgstr ""
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"
@@ -2357,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"
@@ -2412,10 +2334,6 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2515,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 ""
@@ -2840,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 ""
@@ -3088,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 ""
@@ -3132,10 +3070,6 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
-msgid "Form"
-msgstr ""
-
-msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3424,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 ""
@@ -3460,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 ""
@@ -3538,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 ""
@@ -3666,6 +3646,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 ""
@@ -3759,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 ""
@@ -3812,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 569ee75..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:
-# 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"
@@ -201,7 +199,9 @@ msgctxt "QFileDialog"
msgid ""
"%1 already exists.\n"
"Do you want to replace it?"
-msgstr "%1 finnes allerede.\nVil du overskrive?"
+msgstr ""
+"%1 finnes allerede.\n"
+"Vil du overskrive?"
#: qfiledialog.cpp:1690
msgctxt "QFileDialog"
@@ -209,7 +209,10 @@ msgid ""
"%1\n"
"File not found.\n"
"Please verify the correct file name was given."
-msgstr "%1\nFilen ble ikke funnet.\nVennligst se at riktig filnavn ble angitt."
+msgstr ""
+"%1\n"
+"Filen ble ikke funnet.\n"
+"Vennligst se at riktig filnavn ble angitt."
#: qdirmodel.cpp:833
msgctxt "QFileDialog"
@@ -267,14 +270,19 @@ msgid ""
"%1\n"
"Directory not found.\n"
"Please verify the correct directory name was given."
-msgstr "%1\nKatalogen ble ikke funnet.\nVennligst se at riktig katalognavn ble angitt."
+msgstr ""
+"%1\n"
+"Katalogen ble ikke funnet.\n"
+"Vennligst se at riktig katalognavn ble angitt."
#: qfiledialog.cpp:2281
msgctxt "QFileDialog"
msgid ""
"'%1' is write protected.\n"
"Do you want to delete it anyway?"
-msgstr "'%1' er skrivebeskyttet.\n Vil du slette den allikevel?"
+msgstr ""
+"'%1' er skrivebeskyttet.\n"
+" Vil du slette den allikevel?"
#: qfiledialog.cpp:2286
msgctxt "QFileDialog"
@@ -371,7 +379,9 @@ msgctxt "QFileSystemModel"
msgid ""
"<b>The name \"%1\" can not be used.</b><p>Try using another name, with fewer"
" characters or no punctuations marks."
-msgstr "<b>Navnet \"%1\" kunne ikke bli brukt.</b><p>Prøv å bruke et annet navn, med færre bokstaver eller ingen punktumer."
+msgstr ""
+"<b>Navnet \"%1\" kunne ikke bli brukt.</b><p>Prøv å bruke et annet navn, med"
+" færre bokstaver eller ingen punktumer."
#: qfilesystemmodel.cpp:832
msgctxt "QFileSystemModel"
diff --git a/src/vidalia/i18n/po/nb/vidalia_nb.po b/src/vidalia/i18n/po/nb/vidalia_nb.po
index 8f3b20d..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: 2012-03-21 17:52+0000\n"
-"PO-Revision-Date: 2012-03-22 08:51+0000\n"
-"Last-Translator: FreedomIsGreat <kmdl at hotmail.no>\n"
+"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"
@@ -140,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)"
@@ -156,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."
@@ -176,11 +175,11 @@ msgctxt "AdvancedPage"
msgid ""
"The specified Tor data directory location contains characters that cannot be"
" represented in your system's current 8-bit character encoding."
-msgstr "Den følgende mappe plasseringen inneholder tegn som ikke kan brukes i ditt system sitt 8-bit karakter kodifikasjon"
+msgstr ""
msgctxt "AdvancedPage"
msgid "Warning"
-msgstr "Advarsel"
+msgstr ""
msgctxt "AdvancedPage"
msgid "You changed torrc path, would you like to restart Tor?"
@@ -195,17 +194,6 @@ msgid "Select a file to use for Tor socket path"
msgstr ""
msgctxt "AdvancedPage"
-msgid "Configure ControlPort automatically"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid ""
-"You've checked the autoconfiguration option for the ControlPort, but "
-"provided no Data Directory. Please add one, or uncheck the \"Configure "
-"ControlPort automatically\" option."
-msgstr ""
-
-msgctxt "AdvancedPage"
msgid ""
"Vidalia was unable to remove the Tor service.\n"
"\n"
@@ -232,23 +220,6 @@ msgctxt "AppearancePage"
msgid "Vidalia was unable to load the selected language translation."
msgstr "Vidalia kunne ikke laste inn den valgte språkoversettelsen"
-msgctxt "AppearancePage"
-msgid ""
-"System Icon Preferences (changes will take effect when you restart Vidalia)"
-msgstr ""
-
-msgctxt "AppearancePage"
-msgid "Show the Tray Icon and Dock Icon (default)"
-msgstr ""
-
-msgctxt "AppearancePage"
-msgid "Hide the Tray Icon"
-msgstr ""
-
-msgctxt "AppearancePage"
-msgid "Hide the Dock Icon"
-msgstr ""
-
msgctxt "BandwidthGraph"
msgid "Since:"
msgstr "Siden:"
@@ -262,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"
@@ -305,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"
@@ -458,18 +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 "Remember my password"
-msgstr "Husk passordet"
+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:"
-msgstr "Vidalia har koblet seg til en Tor-prosess som krever et passord. Vennligst skriv inn ditt kontrollpassord:"
+"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"
msgid "Control socket is not connected."
@@ -1285,51 +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 ""
+"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 "Start Vidalia på nytt"
+msgstr ""
msgctxt "CrashReportDialog"
msgid "Don't Restart"
-msgstr "Ikke gjenoppta"
+msgstr ""
msgctxt "CrashReportDialog"
msgid "Unable to restart Vidalia"
-msgstr "Kunne ikke starte Vidalia på nytt"
+msgstr ""
msgctxt "CrashReportDialog"
msgid ""
"We were unable to automatically restart Vidalia. Please restart Vidalia "
"manually."
-msgstr "Vi kunne ikke starte Vidalia på nytt automastisk. Gjenoppta Vidalia manuelt."
-
-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"
@@ -1357,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"
@@ -1388,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"
@@ -1607,11 +1594,11 @@ msgstr "Ukjent"
msgctxt "LogTreeItem"
msgid "Debug"
-msgstr "Debug"
+msgstr ""
msgctxt "LogTreeItem"
msgid "Info"
-msgstr "Informasjon"
+msgstr ""
msgctxt "LogTreeItem"
msgid "Notice"
@@ -1619,11 +1606,11 @@ msgstr ""
msgctxt "LogTreeItem"
msgid "Warning"
-msgstr "Advarsel"
+msgstr ""
msgctxt "LogTreeItem"
msgid "Error"
-msgstr "Feil"
+msgstr ""
msgctxt "LogTreeItem"
msgid "Unknown"
@@ -1670,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"
@@ -1706,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"
@@ -1774,6 +1729,10 @@ msgid "Connected to the Tor network!"
msgstr "Koblet til Tor-nettverket!"
msgctxt "MainWindow"
+msgid "Unrecognized startup status"
+msgstr "Ukjent oppstartstatus."
+
+msgctxt "MainWindow"
msgid "miscellaneous"
msgstr "diverse"
@@ -1818,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"
@@ -1904,18 +1859,6 @@ msgid ""
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"
-
-msgctxt "MainWindow"
msgid "Tor Update Available"
msgstr "Tor-oppdatering tilgjengelig"
@@ -1956,82 +1899,11 @@ 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."
@@ -2079,52 +1951,43 @@ 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 "Bootstrapping torrc from %1 to %2"
+msgid "toolBar"
msgstr ""
msgctxt "MainWindow"
-msgid "(probably Telnet)"
+msgid "Start"
msgstr ""
msgctxt "MainWindow"
-msgid "(probably an email client)"
+msgid "Stop"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"One of your applications %1 appears to be making a potentially unencrypted "
-"and unsafe connection to port %2."
+msgid "Restart"
msgstr ""
msgctxt "MainWindow"
-msgid "failed (%1)"
-msgstr "feilet (%1)"
-
-msgctxt "MainWindow"
-msgid ""
-"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å."
+msgid "Reload Tor's config"
+msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Vidalia can't find out how to talk to Tor because it can't access this file: %1\n"
-"\n"
-"Here's the last error message:\n"
-"%2"
+msgid "Actions"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"It seems Tor has stopped running since Vidalia started it.\n"
-"\n"
-"See the Advanced Message Log for more information."
+msgid "Bootstrapping torrc from %1 to %2"
msgstr ""
msgctxt "MainWindow"
@@ -2141,6 +2004,38 @@ msgid ""
"Please check the message log for recent warning or error messages."
msgstr "Vidalia oppdaget at Tor-programvaren avsluttet uforventet.\n\nVennligst sjekk meldingshistorikken for en nylig advarsel eller feilmelding."
+msgctxt "MainWindow"
+msgid ""
+"Vidalia tried to restart Tor, but was not able to. Please check your Task "
+"Manager to ensure there are no other Tor processes running."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "failed (%1)"
+msgstr "feilet (%1)"
+
+msgctxt "MainWindow"
+msgid ", probably Telnet,"
+msgstr ", sannsynligvis Telnet,"
+
+msgctxt "MainWindow"
+msgid ", probably an email client,"
+msgstr ", sannsynligvis en epostklient,"
+
+msgctxt "MainWindow"
+msgid ""
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
+msgstr "Din relé stenges ned.\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"
msgid "Error Setting Filter"
msgstr "Feilet ved innstilling av Filter"
@@ -2394,22 +2289,14 @@ 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."
@@ -2449,10 +2336,6 @@ msgid ""
msgstr "Kan ikke skrive til fil %1\n\n%2."
msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr "Tor Nettverkskart"
-
-msgctxt "NetViewer"
msgid "Refresh"
msgstr "Oppdater"
@@ -2552,6 +2435,30 @@ 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"
+
+msgctxt "NetworkPage"
+msgid "The specified bridge identifier is not valid."
+msgstr "Den oppgitte broidentifikatoren er ikke gyldig"
+
msgctxt "NetworkPage"
msgid "Copy (Ctrl+C)"
msgstr "Kopier (Ctrl+C)"
@@ -2666,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:"
@@ -2674,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"
@@ -2685,11 +2592,11 @@ msgid "SOCKS 5"
msgstr ""
msgctxt "NetworkPage"
-msgid "HTTP / HTTPS"
-msgstr "HTTP / HTTPS"
+msgid "HTTP"
+msgstr ""
msgctxt "NetworkPage"
-msgid "You must specify one or more bridges."
+msgid "HTTP / HTTPS"
msgstr ""
msgctxt "Policy"
@@ -3113,11 +3020,11 @@ msgid "Automatically distribute my bridge address"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network (exit relay)"
+msgid "Relay traffic inside the Tor network (non-exit relay)"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic inside the Tor network (non-exit relay)"
+msgid "Relay traffic for the Tor network (exit relay)"
msgstr ""
msgctxt "ServerPage"
@@ -3165,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"
@@ -3218,22 +3121,22 @@ 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 ""
"Click \"Start Tor\" in the Vidalia Control Panel to restart the Tor "
"software. If Tor exited unexpectedly, select the \"Advanced\" tab above for "
"details about any errors encountered."
-msgstr "Klikk \"start Tor\" ved Vidalia kontroll panelet for og starte Tor programmet på nytt. Hvis Tor avsluttet uventet, Velg \"Avansert\" ovenfor, for informasjon om eventuelle feil som oppstod. "
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
@@ -3457,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"
@@ -3493,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]"
@@ -3571,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"
@@ -3699,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"
@@ -3792,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:"
diff --git a/src/vidalia/i18n/po/ne/qt_ne.po b/src/vidalia/i18n/po/ne/qt_ne.po
index 44ab9a6..5e57801 100644
--- a/src/vidalia/i18n/po/ne/qt_ne.po
+++ b/src/vidalia/i18n/po/ne/qt_ne.po
@@ -1,11 +1,10 @@
#
-# Translators:
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-08-20 03:25+0000\n"
-"PO-Revision-Date: 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"
@@ -431,5 +430,3 @@ msgstr ""
msgctxt "QFileSystemModel"
msgid "%1 bytes"
msgstr ""
-
-
diff --git a/src/vidalia/i18n/po/ne/vidalia_ne.po b/src/vidalia/i18n/po/ne/vidalia_ne.po
index 899d9d7..32a07d6 100644
--- a/src/vidalia/i18n/po/ne/vidalia_ne.po
+++ b/src/vidalia/i18n/po/ne/vidalia_ne.po
@@ -1,11 +1,10 @@
#
-# Translators:
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-09-07 14:40+0000\n"
-"PO-Revision-Date: 2010-12-05 20:03+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"
@@ -193,10 +192,6 @@ 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"
@@ -236,10 +231,6 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr ""
-
-msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -279,6 +270,10 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr ""
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -432,17 +427,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"
@@ -1266,44 +1270,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"
@@ -1331,10 +1342,6 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr ""
-
-msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1362,6 +1369,10 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr ""
+
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1644,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 ""
@@ -1680,10 +1663,6 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1796,10 +1775,6 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1882,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 ""
@@ -1934,82 +1897,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 ""
@@ -2057,19 +1949,39 @@ 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)"
+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"
@@ -2091,17 +2003,35 @@ msgid ""
msgstr ""
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"
@@ -2357,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"
@@ -2412,10 +2334,6 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2515,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 ""
@@ -2840,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 ""
@@ -3088,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 ""
@@ -3132,10 +3070,6 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
-msgid "Form"
-msgstr ""
-
-msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3424,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 ""
@@ -3460,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 ""
@@ -3538,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 ""
@@ -3666,6 +3646,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 ""
@@ -3759,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 ""
@@ -3812,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 2fbd4e3..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:
-# 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: 2012-02-14 09:46+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"
@@ -202,7 +199,9 @@ msgctxt "QFileDialog"
msgid ""
"%1 already exists.\n"
"Do you want to replace it?"
-msgstr "%1 bestaat al.\nWilt u het vervangen?"
+msgstr ""
+"%1 bestaat al.\n"
+"Wil U het vervangen?"
#: qfiledialog.cpp:1690
msgctxt "QFileDialog"
@@ -210,12 +209,15 @@ msgid ""
"%1\n"
"File not found.\n"
"Please verify the correct file name was given."
-msgstr "%1\nBestand niet gevonden.\nControleer of de bestandsnaam correct is."
+msgstr ""
+"%1\n"
+"Bestand niet gevonden.\n"
+"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"
@@ -268,24 +270,29 @@ msgid ""
"%1\n"
"Directory not found.\n"
"Please verify the correct directory name was given."
-msgstr "%1\nMap niet gevonden.\nGelieve te controleren of de juiste mapnaam werd gegeven."
+msgstr ""
+"%1\n"
+"Map niet gevonden.\n"
+"Gelieve te controlleren of de juiste mapnaam werd gegeven."
#: qfiledialog.cpp:2281
msgctxt "QFileDialog"
msgid ""
"'%1' is write protected.\n"
"Do you want to delete it anyway?"
-msgstr "'%1' is beschermd tegen overschrijven.\nWilt u het toch verwijderen?"
+msgstr ""
+"'%1' is beschermd tegen overschrijven.\n"
+"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"
@@ -372,7 +379,9 @@ msgctxt "QFileSystemModel"
msgid ""
"<b>The name \"%1\" can not be used.</b><p>Try using another name, with fewer"
" characters or no punctuations marks."
-msgstr "<b>De naam \"%1\" kan niet worden gebruikt.</b><p>Probeer een andere naam te gebruiken met minder letters of zonder punten of komma's."
+msgstr ""
+"<b>De naam \"%1\" kan niet gebruikt worden.</b><p>Probeer een andere naam te"
+" gebruiken met minder letters of zonder punten of komma's."
#: qfilesystemmodel.cpp:832
msgctxt "QFileSystemModel"
diff --git a/src/vidalia/i18n/po/nl/vidalia_nl.po b/src/vidalia/i18n/po/nl/vidalia_nl.po
index 221a484..ab83aef 100644
--- a/src/vidalia/i18n/po/nl/vidalia_nl.po
+++ b/src/vidalia/i18n/po/nl/vidalia_nl.po
@@ -1,17 +1,13 @@
#
# 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, 2012.
-# <zero.point.transifex at tweebs.nl>, 2012.
+# 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: 2012-03-21 17:52+0000\n"
-"PO-Revision-Date: 2012-03-30 21:13+0000\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"
@@ -48,7 +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"
@@ -68,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"
@@ -96,7 +92,7 @@ msgstr "Adres:"
msgctxt "AdvancedPage"
msgid "None"
-msgstr "Geen"
+msgstr "geen"
msgctxt "AdvancedPage"
msgid "Cookie"
@@ -104,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 ":"
@@ -144,11 +140,11 @@ msgstr "Selecteer de map om de gegevens van Tor op te slaan"
msgctxt "AdvancedPage"
msgid "Tor Control"
-msgstr "Tor-beheer"
+msgstr "Tor beheer"
msgctxt "AdvancedPage"
msgid "Use TCP connection (ControlPort)"
-msgstr "Gebruik TCP-verbinding (ControlPort)"
+msgstr "Gebruik TCP verbinding (ControlPort)"
msgctxt "AdvancedPage"
msgid "Path:"
@@ -160,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."
@@ -174,13 +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"
@@ -188,33 +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"
-
-msgctxt "AdvancedPage"
-msgid ""
-"You've checked the autoconfiguration option for the ControlPort, but "
-"provided no Data Directory. Please add one, or uncheck the \"Configure "
-"ControlPort automatically\" option."
-msgstr "Je hebt de autoconfiguratie optie aangevinkt voor de ControlPort, maar hebt geen data folder opgegeven. Voeg er één toe of vink \"Configureer ControlPort automatisch\" uit."
+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\nDe 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"
@@ -222,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"
@@ -230,29 +215,12 @@ 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."
msgstr "Vidalia kon de gekozen taal niet laden."
-msgctxt "AppearancePage"
-msgid ""
-"System Icon Preferences (changes will take effect when you restart Vidalia)"
-msgstr "Systeem-icoon instellingen (aanpassingen zijn effectief wanneer je Vidalia herstart)"
-
-msgctxt "AppearancePage"
-msgid "Show the Tray Icon and Dock Icon (default)"
-msgstr "Geef het systeemvak- en het dock-icoon weer (standaard)"
-
-msgctxt "AppearancePage"
-msgid "Hide the Tray Icon"
-msgstr "Verberg het systeemvak-icoon"
-
-msgctxt "AppearancePage"
-msgid "Hide the Dock Icon"
-msgstr "Verberg het dock-icoon"
-
msgctxt "BandwidthGraph"
msgid "Since:"
msgstr "Sinds:"
@@ -263,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"
@@ -309,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..."
@@ -319,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"
@@ -347,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"
@@ -363,7 +331,7 @@ msgstr "Nieuw"
msgctxt "Circuit"
msgid "Open"
-msgstr "Open"
+msgstr "Openen"
msgctxt "Circuit"
msgid "Building"
@@ -383,7 +351,7 @@ msgstr "Onbekend"
msgctxt "CircuitItem"
msgid "<Path Empty>"
-msgstr "<Leeg Pad>"
+msgstr "<Pad Leeg>"
msgctxt "CircuitListWidget"
msgid "Connection"
@@ -399,11 +367,11 @@ msgstr "Zoom in op circuit"
msgctxt "CircuitListWidget"
msgid "Close Circuit (Del)"
-msgstr "Sluit circuit (Del)"
+msgstr "Circuit sluiten (del)"
msgctxt "CircuitListWidget"
msgid "Close Stream (Del)"
-msgstr "Sluit stream (Del)"
+msgstr "Stream sluiten (del)"
msgctxt "ConfigDialog"
msgid "General"
@@ -419,7 +387,7 @@ msgstr "Delen"
msgctxt "ConfigDialog"
msgid "Services"
-msgstr "Services"
+msgstr "Diensten"
msgctxt "ConfigDialog"
msgid "Appearance"
@@ -462,18 +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."
@@ -601,7 +578,7 @@ msgstr "Kaap Verdië"
msgctxt "CountryInfo"
msgid "Central African Republic"
-msgstr "Centraal Afrikaanse Republiek"
+msgstr "Centraal Afrikaanse republiek"
msgctxt "CountryInfo"
msgid "Chad"
@@ -1289,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"
@@ -1301,40 +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 "CrashReportUploader"
+msgid "Sending crash report..."
+msgstr "Bezig met crashraport versturen..."
-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 "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)"
@@ -1350,7 +1334,7 @@ msgstr "Proxy-toepassing selecteren"
msgctxt "GeneralPage"
msgid "You must specify the name of your Tor executable."
-msgstr "Je moet de naam opgeven van je Tor-executable"
+msgstr "Er moet een naam gekozen worden voor de tor-toepassing"
msgctxt "GeneralPage"
msgid "Start Vidalia when my system starts"
@@ -1361,10 +1345,6 @@ msgid "Browse"
msgstr "Bladeren"
msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr "Start de Tor-applicatie wanneer Vidalia start"
-
-msgctxt "GeneralPage"
msgid "Tor"
msgstr "Tor"
@@ -1374,7 +1354,7 @@ msgstr "Proxy toepassing (optioneel)"
msgctxt "GeneralPage"
msgid "Start a proxy application when Tor starts"
-msgstr "Start een proxy-applicatie wanneer Tor start"
+msgstr "De proxy toepassing starten als Tor start"
msgctxt "GeneralPage"
msgid "Proxy Application Arguments:"
@@ -1386,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"
@@ -1490,7 +1474,7 @@ msgstr "(Ctrl+F)"
msgctxt "HelpBrowser"
msgid "Close"
-msgstr "Sluit"
+msgstr "Sluiten"
msgctxt "HelpBrowser"
msgid "Close Vidalia Help"
@@ -1518,7 +1502,7 @@ msgstr "Hoofdlettergevoelig"
msgctxt "HelpBrowser"
msgid "Whole words only"
-msgstr "Alleen volledige woorden"
+msgstr "Enkel volledige woorden"
msgctxt "HelpBrowser"
msgid "Help Topics"
@@ -1546,28 +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:"
@@ -1583,7 +1567,7 @@ msgstr "Licentie"
msgctxt "LicenseDialog"
msgid "Credits"
-msgstr "Met dank aan"
+msgstr "Dank aan"
msgctxt "LogEvent"
msgid "Debug"
@@ -1631,7 +1615,7 @@ msgstr "Fout"
msgctxt "LogTreeItem"
msgid "Unknown"
-msgstr "Onbekende"
+msgstr "Onbekend"
msgctxt "MainWindow"
msgid "Start Tor"
@@ -1639,15 +1623,15 @@ msgstr "Tor starten"
msgctxt "MainWindow"
msgid "Exit"
-msgstr "Sluit af"
+msgstr "Sluiten"
msgctxt "MainWindow"
msgid "Bandwidth Graph"
-msgstr "Bandbreedtegrafiek"
+msgstr "Bandbreedte Grafiek"
msgctxt "MainWindow"
msgid "Message Log"
-msgstr "Berichtenlogboek"
+msgstr "Berichten Logboek"
msgctxt "MainWindow"
msgid "Network Map"
@@ -1671,35 +1655,7 @@ msgstr "Help"
msgctxt "MainWindow"
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"
+msgstr "Nieuwe Identiteit"
msgctxt "MainWindow"
msgid "Tor"
@@ -1710,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"
@@ -1723,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"
@@ -1739,7 +1691,7 @@ msgstr "Vidalia kon de geconfigureerde proxy server niet starten"
msgctxt "MainWindow"
msgid "Connecting to a relay directory"
-msgstr "Verbinden met een relay directory"
+msgstr "Verbinden met een verbindingslijst"
msgctxt "MainWindow"
msgid "Establishing an encrypted directory connection"
@@ -1767,7 +1719,7 @@ msgstr "Laden van verbindingsinformatie"
msgctxt "MainWindow"
msgid "Connecting to the Tor network"
-msgstr "Verbinden met het Tor-netwerk"
+msgstr "Verbinden met het Tor netwerk"
msgctxt "MainWindow"
msgid "Establishing a Tor circuit"
@@ -1775,7 +1727,11 @@ msgstr "Maken van een Tor circuit"
msgctxt "MainWindow"
msgid "Connected to the Tor network!"
-msgstr "Verbonden met het Tor-netwerk!"
+msgstr "Verbonden met het Tor netwerk!"
+
+msgctxt "MainWindow"
+msgid "Unrecognized startup status"
+msgstr "Onbekende opstartstatus"
msgctxt "MainWindow"
msgid "miscellaneous"
@@ -1807,7 +1763,7 @@ msgstr "geen route naar de server"
msgctxt "MainWindow"
msgid "insufficient resources"
-msgstr "onvoldoende resources"
+msgstr "onvoldoende resourcen"
msgctxt "MainWindow"
msgid "unknown"
@@ -1822,12 +1778,8 @@ msgid "Tor is shutting down"
msgstr "Tor is bezig met afsluiten."
msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr "Stop Tor nu"
-
-msgctxt "MainWindow"
msgid "Stop Tor"
-msgstr "Stop Tor"
+msgstr "Tor stoppen"
msgctxt "MainWindow"
msgid "Starting the Tor software"
@@ -1857,7 +1809,7 @@ msgstr "Verbindingsfout"
msgctxt "MainWindow"
msgid "Relaying is Enabled"
-msgstr "Relaying is ingeschakeld"
+msgstr "Doorsturen is ingeschakeld"
msgctxt "MainWindow"
msgid "Error Shutting Down"
@@ -1869,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"
@@ -1908,18 +1860,6 @@ msgid ""
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."
-
-msgctxt "MainWindow"
msgid "Tor Update Available"
msgstr "Tor update beschikbaar"
@@ -1941,7 +1881,7 @@ msgstr "Alle eerstvolgende verbindingen zullen anders lijken dan uw oude verbind
msgctxt "MainWindow"
msgid "Failed to Create New Identity"
-msgstr "Creëren van nieuwe identiteit mislukt"
+msgstr "Creëren van Nieuwe Identiteit Mislukt"
msgctxt "MainWindow"
msgid "Port Forwarding Failed"
@@ -1960,79 +1900,8 @@ 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 "Sluit Vidalia af"
-
-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 ""
@@ -2061,7 +1930,7 @@ 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 ""
@@ -2079,87 +1948,110 @@ 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 "Bootstrapping torrc from %1 to %2"
-msgstr "Opstarten van torrc van %1 tot %2"
+msgid "toolBar"
+msgstr "Werkbalk"
msgctxt "MainWindow"
-msgid "(probably Telnet)"
-msgstr "(waarschijnlijk Telnet)"
+msgid "Start"
+msgstr "Start"
msgctxt "MainWindow"
-msgid "(probably an email client)"
-msgstr "(waarschijnlijk een e-mail client)"
+msgid "Stop"
+msgstr "Stop"
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."
+msgid "Restart"
+msgstr "Herstart"
msgctxt "MainWindow"
-msgid "failed (%1)"
-msgstr "mislukt (%1)"
+msgid "Reload Tor's config"
+msgstr "Herlaad Tor's configuratie"
msgctxt "MainWindow"
-msgid ""
-"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."
+msgid "Actions"
+msgstr "Acties"
msgctxt "MainWindow"
-msgid ""
-"Vidalia can't find out how to talk to Tor because it can't access this file: %1\n"
-"\n"
-"Here's the last error message:\n"
-"%2"
-msgstr "Vidalia weet niet hoe met Tor te communiceren omdat hij het volgende bestand niet kan openen: %1\n\nHier is het laatste foutbericht: %2"
-
-msgctxt "MainWindow"
-msgid ""
-"It seems Tor has stopped running since Vidalia started it.\n"
-"\n"
-"See the Advanced Message Log for more information."
-msgstr "Het lijkt er op dat Tor gestopt is sinds Vidalia het gestart heeft.\n\nZie de geavanceerde berichten log voor meer informatie."
+msgid "Bootstrapping torrc from %1 to %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\nWilt 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\nControleert 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 ""
+"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 "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 ""
+"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"
-msgstr "Fout bij openen logboekbestand"
+msgstr "Fout bij Openen Logboek Bestand"
msgctxt "MessageLog"
msgid "Vidalia was unable to open the specified log file."
-msgstr "Vidalia was niet in staat het opgegeven logboekbestand te openen."
+msgstr "Vidalia was niet in staat het opgegeven logboek bestand te openen."
msgctxt "MessageLog"
msgid "Log Filename Required"
@@ -2171,11 +2063,11 @@ msgstr "U dient een bestandsnaam op te geven om logberichten op te kunnen slaan
msgctxt "MessageLog"
msgid "Select Log File"
-msgstr "Selecteer logboekbestand"
+msgstr "Selecteer Logboek Bestand"
msgctxt "MessageLog"
msgid "Save Log Messages"
-msgstr "Logboekberichten opslaan"
+msgstr "Logboek Berichten Opslaan"
msgctxt "MessageLog"
msgid "Text Files (*.txt)"
@@ -2187,7 +2079,7 @@ msgstr "Vidalia"
msgctxt "MessageLog"
msgid "Find in Message Log"
-msgstr "Vind in berichtenlogboek"
+msgstr "Vind in Berichten Logboek"
msgctxt "MessageLog"
msgid "Find:"
@@ -2199,19 +2091,19 @@ 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"
-msgstr "Berichtenlogboek"
+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..."
@@ -2227,7 +2119,7 @@ msgstr "Wissen"
msgctxt "MessageLog"
msgid "Clear all messages from the Message Log (Ctrl+E)"
-msgstr "Wis alle berichten van het berichtenlogboek (Ctrl+E)"
+msgstr "Wis alle berichten van het Berichten Logboek (Ctrl+E)"
msgctxt "MessageLog"
msgid "Ctrl+E"
@@ -2263,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"
@@ -2279,7 +2171,7 @@ msgstr "Instellingen"
msgctxt "MessageLog"
msgid "Adjust Message Log Settings"
-msgstr "Pas berichtenlogboek instellingen aan"
+msgstr "Verander Berichten Logboek Instellingen"
msgctxt "MessageLog"
msgid "Ctrl+T"
@@ -2299,11 +2191,11 @@ msgstr "F1"
msgctxt "MessageLog"
msgid "Close"
-msgstr "Sluit"
+msgstr "Sluiten"
msgctxt "MessageLog"
msgid "Close the Message Log"
-msgstr "Sluit het berichtenlogboek"
+msgstr "Sluit het Berichten Logboek"
msgctxt "MessageLog"
msgid "Esc"
@@ -2335,7 +2227,7 @@ msgstr "Bericht"
msgctxt "MessageLog"
msgid "Saves the current Message Log settings"
-msgstr "Slaat de huidige berichtenlogboek instellingen op"
+msgstr "Slaat de huidige Berichten Logboek instellingen op"
msgctxt "MessageLog"
msgid "Save Settings"
@@ -2343,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"
@@ -2351,7 +2243,7 @@ msgstr "Annuleren"
msgctxt "MessageLog"
msgid "Message Filter"
-msgstr "Berichtfilter"
+msgstr "Berichten Filter"
msgctxt "MessageLog"
msgid "Error"
@@ -2379,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"
@@ -2395,35 +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\nhelemaal 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 \niets is fout gegaan met Tor."
+msgstr "Berichten die alleen verschijnen wanneer er iets mis is gegaan met Tor."
msgctxt "MessageLog"
msgid ""
@@ -2431,19 +2315,19 @@ 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 \ntijdens 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 ""
@@ -2453,16 +2337,12 @@ msgid ""
msgstr "Kan niet schrijven naar het bestand %1\n\n%2."
msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr "Tor-netwerkkaart"
-
-msgctxt "NetViewer"
msgid "Refresh"
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"
@@ -2486,7 +2366,7 @@ msgstr "F1"
msgctxt "NetViewer"
msgid "Close"
-msgstr "Sluit"
+msgstr "Sluiten"
msgctxt "NetViewer"
msgid "Close the network map"
@@ -2538,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"
@@ -2556,37 +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 Brug"
+
+msgctxt "NetworkPage"
+msgid "The specified bridge identifier is not valid."
+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:"
@@ -2602,19 +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"
@@ -2624,49 +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:"
@@ -2678,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"
@@ -2689,12 +2593,12 @@ msgid "SOCKS 5"
msgstr "SOCKS 5"
msgctxt "NetworkPage"
-msgid "HTTP / HTTPS"
-msgstr "HTTP / HTTPS"
+msgid "HTTP"
+msgstr "HTTP"
msgctxt "NetworkPage"
-msgid "You must specify one or more bridges."
-msgstr "Je moet één of meer bridges opgeven."
+msgid "HTTP / HTTPS"
+msgstr "HTTP / HTTPS"
msgctxt "Policy"
msgid "accept"
@@ -2762,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:"
@@ -2806,7 +2710,7 @@ msgstr "Laatst Bijgewerkt:"
msgctxt "RouterInfoDialog"
msgid "Descriptor"
-msgstr "Descriptor"
+msgstr "Beschrijving"
msgctxt "RouterListItem"
msgid "Offline"
@@ -2826,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"
@@ -2838,39 +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 "Gebruik alleen als client"
+msgstr "Draai alleen als client"
msgctxt "ServerPage"
msgid "Relay Port:"
@@ -2878,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"
@@ -2890,15 +2794,15 @@ 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:"
-msgstr "Directory poort:"
+msgstr "Directory Poort:"
msgctxt "ServerPage"
msgid "Directory Port Number"
-msgstr "Directory poort nummer"
+msgstr "Directory Poort Nummer"
msgctxt "ServerPage"
msgid "Contact Info:"
@@ -2906,11 +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:"
@@ -2952,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"
@@ -2982,7 +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"
@@ -3006,11 +2910,11 @@ 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"
-msgstr "Overige services"
+msgstr "Overige Andere Diensten"
msgctxt "ServerPage"
msgid "Ports 706, 1863, 5050, 5190, 5222, 5223, 8300 and 8888"
@@ -3043,13 +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"
@@ -3057,30 +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"
@@ -3094,19 +2998,19 @@ 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>"
@@ -3114,35 +3018,35 @@ msgstr "<a href=\"#bridgeHelp\">Wat is dit?</a>"
msgctxt "ServerPage"
msgid "Automatically distribute my bridge address"
-msgstr "Verdeel automatisch mijn bridge adres"
-
-msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network (exit relay)"
-msgstr "Herleid verkeer voor het Tor netwerk (exit relay)"
+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 services"
+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 service map en één virtuele poort voor elke service 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"
@@ -3150,11 +3054,11 @@ msgstr "Fout"
msgctxt "ServicePage"
msgid "Please select a Service."
-msgstr "Selecteer een service."
+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]."
@@ -3162,19 +3066,15 @@ 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 "Map al in gebruik door een andere service."
-
-msgctxt "ServicePage"
-msgid "Form"
-msgstr "Formulier"
+msgstr "Folder is al in gebruik door een andere service."
msgctxt "ServicePage"
msgid "Provided Hidden Services"
-msgstr "Aangeboden verborgen services"
+msgstr "Aangeboden hidden services"
msgctxt "ServicePage"
msgid "Onion Address"
@@ -3190,7 +3090,7 @@ msgstr "Doel"
msgctxt "ServicePage"
msgid "Directory Path"
-msgstr "Pad van map"
+msgstr "Directory pad"
msgctxt "ServicePage"
msgid "Enabled"
@@ -3198,11 +3098,11 @@ msgstr "Ingeschakeld"
msgctxt "ServicePage"
msgid "Add new service to list"
-msgstr "Voeg een nieuwe service 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 services uit de lijst"
+msgstr "Verwijder geselecteerde service uit de lijst"
msgctxt "ServicePage"
msgid "Copy onion address of selected service to clipboard"
@@ -3210,15 +3110,15 @@ 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 map voor de gekozen service"
+msgstr "Blader in het lokale bestandssysteem en folder voor de gekozen service"
msgctxt "ServicePage"
msgid "Created by Tor"
-msgstr "Aangemaakt door Tor"
+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"
@@ -3226,18 +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 ""
@@ -3245,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 "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 ""
@@ -3253,31 +3153,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 "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"
-msgstr "Verbonden met het Tor-netwerk"
+msgstr "Verbonden met het Tor netwerk"
msgctxt "StatusEventWidget"
msgid ""
"We were able to successfully establish a connection to the Tor network. You "
"can now configure your applications to use the Internet anonymously."
-msgstr "We hebben succesvol verbinding met het Tor-netwerk gemaakt. U kunt nu uw toepassingen configureren om anoniem het internet te gebruiken."
+msgstr "We 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 ""
@@ -3285,7 +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 ""
@@ -3293,11 +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 ""
@@ -3305,18 +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 ""
@@ -3324,7 +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"
@@ -3335,70 +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 ""
@@ -3406,30 +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 "Controleren bereikbaarheid directorypoort"
+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 ""
@@ -3437,7 +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"
@@ -3447,11 +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 ""
@@ -3459,7 +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"
@@ -3487,7 +3403,7 @@ msgstr "Gesloten"
msgctxt "Stream"
msgid "Retrying"
-msgstr "Opnieuw proberen"
+msgstr "Opnieuw"
msgctxt "Stream"
msgid "Remapped"
@@ -3497,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."
@@ -3511,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"
@@ -3521,7 +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"
@@ -3541,7 +3463,7 @@ msgstr "Ongedaan maken"
msgctxt "TorrcDialog"
msgid "Redo"
-msgstr "Vorige ingave herstellen"
+msgstr "Opnieuw"
msgctxt "TorrcDialog"
msgid "Select All"
@@ -3549,19 +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\""
@@ -3573,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"
@@ -3585,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"
@@ -3593,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"
@@ -3609,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!"
@@ -3625,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"
@@ -3635,17 +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"
@@ -3653,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..."
@@ -3661,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"
@@ -3673,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"
@@ -3685,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"
@@ -3693,16 +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"
@@ -3725,7 +3679,7 @@ msgstr "Help"
msgctxt "VMessageBox"
msgid "Retry"
-msgstr "Opnieuw proberen"
+msgstr "Opnieuw"
msgctxt "VMessageBox"
msgid "Show Log"
@@ -3737,11 +3691,11 @@ msgstr "Instellingen Weergeven"
msgctxt "VMessageBox"
msgid "Continue"
-msgstr "Doorgaan"
+msgstr "Verder"
msgctxt "VMessageBox"
msgid "Quit"
-msgstr "Sluit af"
+msgstr "Afsluiten"
msgctxt "VMessageBox"
msgid "Browse"
@@ -3777,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."
@@ -3793,34 +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. \nWilt 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"
diff --git a/src/vidalia/i18n/po/nn/qt_nn.po b/src/vidalia/i18n/po/nn/qt_nn.po
index b21c8ed..957291a 100644
--- a/src/vidalia/i18n/po/nn/qt_nn.po
+++ b/src/vidalia/i18n/po/nn/qt_nn.po
@@ -1,11 +1,10 @@
#
-# Translators:
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-08-20 03:25+0000\n"
-"PO-Revision-Date: 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"
@@ -431,5 +430,3 @@ msgstr ""
msgctxt "QFileSystemModel"
msgid "%1 bytes"
msgstr ""
-
-
diff --git a/src/vidalia/i18n/po/nn/vidalia_nn.po b/src/vidalia/i18n/po/nn/vidalia_nn.po
index de56e31..24c55b4 100644
--- a/src/vidalia/i18n/po/nn/vidalia_nn.po
+++ b/src/vidalia/i18n/po/nn/vidalia_nn.po
@@ -1,11 +1,10 @@
#
-# Translators:
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-09-07 14:40+0000\n"
-"PO-Revision-Date: 2010-12-05 20:03+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"
@@ -193,10 +192,6 @@ 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"
@@ -236,10 +231,6 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr ""
-
-msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -279,6 +270,10 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr ""
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -432,17 +427,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"
@@ -1266,44 +1270,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"
@@ -1331,10 +1342,6 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr ""
-
-msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1362,6 +1369,10 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr ""
+
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1644,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 ""
@@ -1680,10 +1663,6 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1796,10 +1775,6 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1882,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 ""
@@ -1934,82 +1897,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 ""
@@ -2057,19 +1949,39 @@ 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)"
+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"
@@ -2091,17 +2003,35 @@ msgid ""
msgstr ""
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"
@@ -2357,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"
@@ -2412,10 +2334,6 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2515,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 ""
@@ -2840,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 ""
@@ -3088,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 ""
@@ -3132,10 +3070,6 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
-msgid "Form"
-msgstr ""
-
-msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3424,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 ""
@@ -3460,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 ""
@@ -3538,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 ""
@@ -3666,6 +3646,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 ""
@@ -3759,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 ""
@@ -3812,5 +3796,3 @@ msgstr ""
msgctxt "stringutil.h"
msgid "%1 mins"
msgstr ""
-
-
diff --git a/src/vidalia/i18n/po/nso/qt_nso.po b/src/vidalia/i18n/po/nso/qt_nso.po
index 5f40997..276f29b 100644
--- a/src/vidalia/i18n/po/nso/qt_nso.po
+++ b/src/vidalia/i18n/po/nso/qt_nso.po
@@ -1,11 +1,10 @@
#
-# Translators:
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-08-20 03:25+0000\n"
-"PO-Revision-Date: 2010-12-05 19:59+0000\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"
@@ -431,5 +430,3 @@ msgstr ""
msgctxt "QFileSystemModel"
msgid "%1 bytes"
msgstr ""
-
-
diff --git a/src/vidalia/i18n/po/nso/vidalia_nso.po b/src/vidalia/i18n/po/nso/vidalia_nso.po
index 2a97c8f..b966b2a 100644
--- a/src/vidalia/i18n/po/nso/vidalia_nso.po
+++ b/src/vidalia/i18n/po/nso/vidalia_nso.po
@@ -1,11 +1,10 @@
#
-# Translators:
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-09-07 14:40+0000\n"
-"PO-Revision-Date: 2010-12-05 20:03+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"
@@ -193,10 +192,6 @@ 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"
@@ -236,10 +231,6 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr ""
-
-msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -279,6 +270,10 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr ""
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -432,17 +427,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"
@@ -1266,44 +1270,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"
@@ -1331,10 +1342,6 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr ""
-
-msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1362,6 +1369,10 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr ""
+
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1644,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 ""
@@ -1680,10 +1663,6 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1796,10 +1775,6 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1882,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 ""
@@ -1934,82 +1897,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 ""
@@ -2057,19 +1949,39 @@ 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)"
+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"
@@ -2091,17 +2003,35 @@ msgid ""
msgstr ""
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"
@@ -2357,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"
@@ -2412,10 +2334,6 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2515,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 ""
@@ -2840,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 ""
@@ -3088,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 ""
@@ -3132,10 +3070,6 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
-msgid "Form"
-msgstr ""
-
-msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3424,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 ""
@@ -3460,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 ""
@@ -3538,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 ""
@@ -3666,6 +3646,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 ""
@@ -3759,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 ""
@@ -3812,5 +3796,3 @@ msgstr ""
msgctxt "stringutil.h"
msgid "%1 mins"
msgstr ""
-
-
diff --git a/src/vidalia/i18n/po/oc/qt_oc.po b/src/vidalia/i18n/po/oc/qt_oc.po
index b824048..fd2926a 100644
--- a/src/vidalia/i18n/po/oc/qt_oc.po
+++ b/src/vidalia/i18n/po/oc/qt_oc.po
@@ -1,11 +1,10 @@
#
-# Translators:
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-08-20 03:25+0000\n"
-"PO-Revision-Date: 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"
@@ -431,5 +430,3 @@ msgstr ""
msgctxt "QFileSystemModel"
msgid "%1 bytes"
msgstr ""
-
-
diff --git a/src/vidalia/i18n/po/oc/vidalia_oc.po b/src/vidalia/i18n/po/oc/vidalia_oc.po
index 213346e..ed69d19 100644
--- a/src/vidalia/i18n/po/oc/vidalia_oc.po
+++ b/src/vidalia/i18n/po/oc/vidalia_oc.po
@@ -1,11 +1,10 @@
#
-# Translators:
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-09-07 14:40+0000\n"
-"PO-Revision-Date: 2010-12-05 20:03+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"
@@ -193,10 +192,6 @@ 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"
@@ -236,10 +231,6 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr ""
-
-msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -279,6 +270,10 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr ""
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -432,17 +427,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"
@@ -1266,44 +1270,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"
@@ -1331,10 +1342,6 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr ""
-
-msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1362,6 +1369,10 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr ""
+
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1644,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 ""
@@ -1680,10 +1663,6 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1796,10 +1775,6 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1882,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 ""
@@ -1934,82 +1897,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 ""
@@ -2057,19 +1949,39 @@ 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)"
+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"
@@ -2091,17 +2003,35 @@ msgid ""
msgstr ""
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"
@@ -2357,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"
@@ -2412,10 +2334,6 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2515,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 ""
@@ -2840,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 ""
@@ -3088,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 ""
@@ -3132,10 +3070,6 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
-msgid "Form"
-msgstr ""
-
-msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3424,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 ""
@@ -3460,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 ""
@@ -3538,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 ""
@@ -3666,6 +3646,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 ""
@@ -3759,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 ""
@@ -3812,5 +3796,3 @@ msgstr ""
msgctxt "stringutil.h"
msgid "%1 mins"
msgstr ""
-
-
diff --git a/src/vidalia/i18n/po/or/qt_or.po b/src/vidalia/i18n/po/or/qt_or.po
index 455e1be..7ab26b8 100644
--- a/src/vidalia/i18n/po/or/qt_or.po
+++ b/src/vidalia/i18n/po/or/qt_or.po
@@ -1,11 +1,10 @@
#
-# Translators:
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-08-20 03:25+0000\n"
-"PO-Revision-Date: 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"
@@ -431,5 +430,3 @@ msgstr ""
msgctxt "QFileSystemModel"
msgid "%1 bytes"
msgstr ""
-
-
diff --git a/src/vidalia/i18n/po/or/vidalia_or.po b/src/vidalia/i18n/po/or/vidalia_or.po
index b16302b..22b0f4e 100644
--- a/src/vidalia/i18n/po/or/vidalia_or.po
+++ b/src/vidalia/i18n/po/or/vidalia_or.po
@@ -1,18 +1,15 @@
-#
-# Translators:
+#, fuzzy
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: 2010-12-05 20:03+0000\n"
-"Last-Translator: \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: 2009-05-19 23:56+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
+"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: or\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
"X-Generator: Vidalia ts2po 0.2\n"
msgctxt "AboutDialog"
@@ -35,13 +32,28 @@ msgctxt "AboutDialog"
msgid "Qt 4.4.2"
msgstr ""
+msgctxt "AboutDialog"
+msgid "Vidalia"
+msgstr ""
+
+msgctxt "AboutDialog"
+msgid "Tor"
+msgstr ""
+
+msgctxt "AboutDialog"
+msgid "Qt"
+msgstr ""
+
+msgctxt "AboutDialog"
+msgid "version"
+msgstr ""
+
msgctxt "AdvancedPage"
msgid "'%1' is not a valid IP address."
msgstr ""
msgctxt "AdvancedPage"
-msgid ""
-"You selected 'Password' authentication, but did not specify a password."
+msgid "You selected 'Password' authentication, but did not specify a password."
msgstr ""
msgctxt "AdvancedPage"
@@ -81,6 +93,10 @@ msgid "Vidalia was unable to install the Tor service."
msgstr ""
msgctxt "AdvancedPage"
+msgid "Control Port"
+msgstr ""
+
+msgctxt "AdvancedPage"
msgid "Authentication:"
msgstr ""
@@ -137,68 +153,7 @@ msgid "Select the directory used to store data for the Tor software"
msgstr ""
msgctxt "AdvancedPage"
-msgid "Tor Control"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "Use TCP connection (ControlPort)"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "Path:"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "Use Unix domain socket (ControlSocket)"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "Edit current torrc"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "NOTE: this will edit the currently loaded torrc"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "ControlSocket path doesn't exist."
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid ""
-"The specified Tor configuration file location contains characters that "
-"cannot be represented in your system's current 8-bit character encoding."
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid ""
-"The specified Tor data directory location contains characters that cannot be"
-" represented in your system's current 8-bit character encoding."
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "Warning"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "You changed torrc path, would you like to restart Tor?"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "Tor Configuration File (torrc);;All Files (*)"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "Select a file to use for Tor socket path"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "Configure ControlPort automatically"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid ""
-"Vidalia was unable to remove the Tor service.\n"
+msgid "Vidalia was unable to remove the Tor service.\n"
"\n"
"You may need to remove it manually."
msgstr ""
@@ -440,9 +395,7 @@ msgid "Remember my password"
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid ""
-"Vidalia has connected to a running Tor process that requires a password. "
-"Please enter your control password:"
+msgid "Vidalia has connected to a running Tor process that requires a password. Please enter your control password:"
msgstr ""
msgctxt "ControlSocket"
@@ -1158,10 +1111,6 @@ msgid "Zimbabwe"
msgstr ""
msgctxt "CountryInfo"
-msgid "Zaire"
-msgstr ""
-
-msgctxt "CountryInfo"
msgid "Albania"
msgstr ""
@@ -1257,55 +1206,6 @@ msgctxt "CountryInfo"
msgid "Taiwan"
msgstr ""
-msgctxt "CrashReportDialog"
-msgid "Submit a Crash Report"
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid "Vidalia encountered an error and needed to close"
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid "Restart Vidalia"
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid "Don't Restart"
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid "Unable to restart Vidalia"
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid ""
-"We were unable to automatically restart Vidalia. Please restart Vidalia "
-"manually."
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid "Please fill a ticket in:"
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid ""
-"<a "
-"href=\"https://trac.torproject.org/projects/tor/newticket\">https://trac.torproject.org/projects/tor/newticket</a>"
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid ""
-"A crash report has been created that you can send to the Vidalia developers "
-"to help identify and fix the problem. The submitted report does not contain "
-"any personally identifying information."
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid ""
-"with a description of what you were doing before the application crashed, "
-"along with the following files corresponding to the crash report:"
-msgstr ""
-
msgctxt "GeneralPage"
msgid "Executables (*.exe)"
msgstr ""
@@ -1323,6 +1223,10 @@ msgid "You must specify the name of your Tor executable."
msgstr ""
msgctxt "GeneralPage"
+msgid "The proxy arguments specified are not properly formatted."
+msgstr ""
+
+msgctxt "GeneralPage"
msgid "Start Vidalia when my system starts"
msgstr ""
@@ -1519,10 +1423,7 @@ msgid "Opening External Link"
msgstr ""
msgctxt "HelpTextBrowser"
-msgid ""
-"Vidalia can open the link you selected in your default Web browser. If your "
-"browser is not currently configured to use Tor then the request will not be "
-"anonymous."
+msgid "Vidalia can open the link you selected in your default Web browser. If your browser is not currently configured to use Tor then the request will not be anonymous."
msgstr ""
msgctxt "HelpTextBrowser"
@@ -1534,9 +1435,7 @@ msgid "Unable to Open Link"
msgstr ""
msgctxt "HelpTextBrowser"
-msgid ""
-"Vidalia was unable to open the selected link in your Web browser. You can "
-"still copy the URL and paste it into your browser."
+msgid "Vidalia was unable to open the selected link in your Web browser. You can still copy the URL and paste it into your browser."
msgstr ""
msgctxt "HelpTextBrowser"
@@ -1579,30 +1478,6 @@ msgctxt "LogEvent"
msgid "Unknown"
msgstr ""
-msgctxt "LogTreeItem"
-msgid "Debug"
-msgstr ""
-
-msgctxt "LogTreeItem"
-msgid "Info"
-msgstr ""
-
-msgctxt "LogTreeItem"
-msgid "Notice"
-msgstr ""
-
-msgctxt "LogTreeItem"
-msgid "Warning"
-msgstr ""
-
-msgctxt "LogTreeItem"
-msgid "Error"
-msgstr ""
-
-msgctxt "LogTreeItem"
-msgid "Unknown"
-msgstr ""
-
msgctxt "MainWindow"
msgid "Start Tor"
msgstr ""
@@ -1816,9 +1691,7 @@ msgid "Error Starting Tor"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Vidalia was unable to start Tor. Check your settings to ensure the correct "
-"name and location of your Tor executable is specified."
+msgid "Vidalia was unable to start Tor. Check your settings to ensure the correct name and location of your Tor executable is specified."
msgstr ""
msgctxt "MainWindow"
@@ -1854,9 +1727,7 @@ msgid "Cookie Authentication Required"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"The Tor software requires Vidalia to send the contents of an authentication "
-"cookie, but Vidalia was unable to find one."
+msgid "The Tor software requires Vidalia to send the contents of an authentication cookie, but Vidalia was unable to find one."
msgstr ""
msgctxt "MainWindow"
@@ -1876,9 +1747,7 @@ msgid "Error Registering for Events"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Vidalia was unable to register for some events. Many of Vidalia's features "
-"may be unavailable."
+msgid "Vidalia was unable to register for some events. Many of Vidalia's features may be unavailable."
msgstr ""
msgctxt "MainWindow"
@@ -1898,9 +1767,7 @@ msgid "Tor Update Available"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended. Please visit the Tor website to download the latest version."
+msgid "The currently installed version of Tor is out of date or no longer recommended. Please visit the Tor website to download the latest version."
msgstr ""
msgctxt "MainWindow"
@@ -1908,9 +1775,7 @@ msgid "Tor website: %1"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"All subsequent connections will appear to be different than your old "
-"connections."
+msgid "All subsequent connections will appear to be different than your old connections."
msgstr ""
msgctxt "MainWindow"
@@ -2002,21 +1867,15 @@ msgid "Password Reset Failed"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Vidalia tried to reset Tor's control password, but was not able to restart "
-"the Tor software. Please check your Task Manager to ensure there are no "
-"other Tor processes running."
+msgid "Vidalia tried to reset Tor's control password, but was not able to restart the Tor software. Please check your Task Manager to ensure there are no other Tor processes running."
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended."
+msgid "The currently installed version of Tor is out of date or no longer recommended."
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Would you like to check if a newer package is available for installation?"
+msgid "Would you like to check if a newer package is available for installation?"
msgstr ""
msgctxt "MainWindow"
@@ -2024,9 +1883,11 @@ msgid "Potentially Unsafe Connection"
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 ""
msgctxt "MainWindow"
@@ -2038,9 +1899,7 @@ msgid "Your software is up to date"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"There are no new Tor software packages available for your computer at this "
-"time."
+msgid "There are no new Tor software packages available for your computer at this time."
msgstr ""
msgctxt "MainWindow"
@@ -2056,52 +1915,52 @@ msgid "The following error occurred:"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Anything sent over this connection could be monitored. Please check your "
-"application's configuration and use only encrypted protocols, such as SSL, "
-"if possible."
-msgstr ""
-
-msgctxt "MainWindow"
msgid "failed (%1)"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
+msgid "Your relay is shutting down.\n"
"Click 'Stop' again to stop your relay now."
msgstr ""
msgctxt "MainWindow"
-msgid "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 ""
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 ""
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 ""
+
+msgctxt "MainWindow"
+msgid "File"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "About Vidalia"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Home"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Check For Updates"
msgstr ""
msgctxt "MessageLog"
@@ -2345,68 +2204,50 @@ 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"
+msgid "Always Save New Log Messages"
msgstr ""
msgctxt "MessageLog"
-msgid "Tor Status"
+msgid "Browse"
msgstr ""
msgctxt "MessageLog"
-msgid "Advanced"
+msgid "Enable automatically saving all new log messages to a file"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
+msgid "Automatically save new log messages to a file"
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 ""
msgctxt "MessageLog"
-msgid ""
-"Messages that only appear when \n"
+msgid "Messages that only appear when \n"
"something has gone wrong with Tor."
msgstr ""
msgctxt "MessageLog"
-msgid ""
-"Messages that appear infrequently \n"
+msgid "Messages that appear infrequently \n"
"during normal Tor operation and are \n"
"not considered errors, but you may \n"
"care about."
msgstr ""
msgctxt "MessageLog"
-msgid ""
-"Messages that appear frequently \n"
+msgid "Messages that appear frequently \n"
"during normal Tor operation."
msgstr ""
msgctxt "MessageLog"
-msgid ""
-"Hyper-verbose messages primarily of \n"
+msgid "Hyper-verbose messages primarily of \n"
"interest to Tor developers."
msgstr ""
msgctxt "MessageLog"
-msgid ""
-"Cannot write file %1\n"
+msgid "Cannot write file %1\n"
"\n"
"%2."
msgstr ""
@@ -2528,15 +2369,11 @@ msgid "Copy (Ctrl+C)"
msgstr ""
msgctxt "NetworkPage"
-msgid ""
-"You must specify both an IP address or hostname and a port number to "
-"configure Tor to use a proxy to access the Internet."
+msgid "You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet."
msgstr ""
msgctxt "NetworkPage"
-msgid ""
-"You must specify one or more ports to which your firewall allows you to "
-"connect."
+msgid "You must specify one or more ports to which your firewall allows you to connect."
msgstr ""
msgctxt "NetworkPage"
@@ -2556,10 +2393,18 @@ msgid "Proxy Settings"
msgstr ""
msgctxt "NetworkPage"
+msgid "HTTP Proxy:"
+msgstr ""
+
+msgctxt "NetworkPage"
msgid "Username:"
msgstr ""
msgctxt "NetworkPage"
+msgid "Use this proxy for HTTPS also"
+msgstr ""
+
+msgctxt "NetworkPage"
msgid "Password:"
msgstr ""
@@ -2588,9 +2433,7 @@ msgid "80, 443"
msgstr ""
msgctxt "NetworkPage"
-msgid ""
-"Check to encrypt directory requests and, optionally, use bridge relays to "
-"access the Tor network"
+msgid "Check to encrypt directory requests and, optionally, use bridge relays to access the Tor network"
msgstr ""
msgctxt "NetworkPage"
@@ -2602,10 +2445,18 @@ msgid "Bridge Settings"
msgstr ""
msgctxt "NetworkPage"
+msgid "The Tor software you are currently running does not support bridges. <br>Directory connections will still be encrypted."
+msgstr ""
+
+msgctxt "NetworkPage"
msgid "Add a Bridge:"
msgstr ""
msgctxt "NetworkPage"
+msgid "<a href=\"bridges.finding\">How do I find a bridge?</a>"
+msgstr ""
+
+msgctxt "NetworkPage"
msgid "Remove the selected bridges from the list"
msgstr ""
@@ -2626,43 +2477,13 @@ msgid "<a href=\"bridges.finding\">How can I find bridges?</a>"
msgstr ""
msgctxt "NetworkPage"
-msgid ""
-"No new bridges are currently available. You can either wait a while and try "
-"again, or try another method of finding new bridges."
+msgid "No new bridges are currently available. You can either wait a while and try again, or try another method of finding new bridges."
msgstr ""
msgctxt "NetworkPage"
msgid "Click Help to see other methods of finding new bridges."
msgstr ""
-msgctxt "NetworkPage"
-msgid "Address:"
-msgstr ""
-
-msgctxt "NetworkPage"
-msgid "Type:"
-msgstr ""
-
-msgctxt "NetworkPage"
-msgid "You must select the proxy type."
-msgstr ""
-
-msgctxt "NetworkPage"
-msgid "SOCKS 4"
-msgstr ""
-
-msgctxt "NetworkPage"
-msgid "SOCKS 5"
-msgstr ""
-
-msgctxt "NetworkPage"
-msgid "HTTP"
-msgstr ""
-
-msgctxt "NetworkPage"
-msgid "HTTP / HTTPS"
-msgstr ""
-
msgctxt "Policy"
msgid "accept"
msgstr ""
@@ -2816,15 +2637,11 @@ msgid "Bridge Support Unavailable"
msgstr ""
msgctxt "ServerPage"
-msgid ""
-"You have configured Tor to act as a bridge relay for censored users, but "
-"your version of Tor does not support bridges."
+msgid "You have configured Tor to act as a bridge relay for censored users, but your version of Tor does not support bridges."
msgstr ""
msgctxt "ServerPage"
-msgid ""
-"Please upgrade your Tor software or configure Tor to act as a normal Tor "
-"relay."
+msgid "Please upgrade your Tor software or configure Tor to act as a normal Tor relay."
msgstr ""
msgctxt "ServerPage"
@@ -2892,9 +2709,7 @@ msgid "Basic Settings"
msgstr ""
msgctxt "ServerPage"
-msgid ""
-"For Internet connections with fast download speed but slow upload, please "
-"list your upload speed here."
+msgid "For Internet connections with fast download speed but slow upload, please list your upload speed here."
msgstr ""
msgctxt "ServerPage"
@@ -2950,9 +2765,7 @@ msgid "Peak bandwidth rate limit"
msgstr ""
msgctxt "ServerPage"
-msgid ""
-"Your maximum bandwidth rate must be greater than or equal to your average "
-"bandwidth rate. Both values must be at least 20 KB/s."
+msgid "Your maximum bandwidth rate must be greater than or equal to your average bandwidth rate. Both values must be at least 20 KB/s."
msgstr ""
msgctxt "ServerPage"
@@ -3012,14 +2825,11 @@ msgid "Show help topic on exit policies"
msgstr ""
msgctxt "ServerPage"
-msgid ""
-"What Internet resources should users be able to access from your relay?"
+msgid "What Internet resources should users be able to access from your relay?"
msgstr ""
msgctxt "ServerPage"
-msgid ""
-"Tor will still block some outgoing mail and file sharing applications by "
-"default to reduce spam and other abuse."
+msgid "Tor will still block some outgoing mail and file sharing applications by default to reduce spam and other abuse."
msgstr ""
msgctxt "ServerPage"
@@ -3031,8 +2841,7 @@ msgid "Let others access your bridge by giving them this line:"
msgstr ""
msgctxt "ServerPage"
-msgid ""
-"This is the identity of your bridge relay that you can give to other people"
+msgid "This is the identity of your bridge relay that you can give to other people"
msgstr ""
msgctxt "ServerPage"
@@ -3048,9 +2857,7 @@ msgid "No clients have used your relay recently."
msgstr ""
msgctxt "ServerPage"
-msgid ""
-"Leave your relay running so clients have a better chance of finding and "
-"using it."
+msgid "Leave your relay running so clients have a better chance of finding and using it."
msgstr ""
msgctxt "ServerPage"
@@ -3062,9 +2869,7 @@ msgid "Vidalia was unable to retrieve your bridge's usage history."
msgstr ""
msgctxt "ServerPage"
-msgid ""
-"Tor returned an improperly formatted response when Vidalia requested your "
-"bridge's usage history."
+msgid "Tor returned an improperly formatted response when Vidalia requested your bridge's usage history."
msgstr ""
msgctxt "ServerPage"
@@ -3080,20 +2885,11 @@ msgid "<a href=\"#bridgeUsage\">Who has used my bridge?</a>"
msgstr ""
msgctxt "ServerPage"
-msgid "<a href=\"#bridgeHelp\">What's this?</a>"
-msgstr ""
-
-msgctxt "ServerPage"
-msgid "Automatically distribute my bridge address"
-msgstr ""
-
-msgctxt "ServerPage"
msgid "Mirror the Relay Directory"
msgstr ""
msgctxt "ServerPage"
-msgid ""
-"Email address at which you may be reached if there is a\n"
+msgid "Email address at which you may be reached if there is a\n"
"problem with your relay. You might also include your PGP or GPG fingerprint."
msgstr ""
@@ -3102,9 +2898,7 @@ msgid "Error while trying to unpublish all services"
msgstr ""
msgctxt "ServicePage"
-msgid ""
-"Please configure at least a service directory and a virtual port for each "
-"service you want to save. Remove the other ones."
+msgid "Please configure at least a service directory and a virtual port for each service you want to save. Remove the other ones."
msgstr ""
msgctxt "ServicePage"
@@ -3179,251 +2973,6 @@ msgctxt "ServicePage"
msgid "Created by Tor"
msgstr ""
-msgctxt "StatusEventWidget"
-msgid "Copy to Clipboard"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "The Tor Software is Running"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "You are currently running version \"%1\" of the Tor software."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "The Tor Software is not Running"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Click \"Start Tor\" in the Vidalia Control Panel to restart the Tor "
-"software. If Tor exited unexpectedly, select the \"Advanced\" tab above for "
-"details about any errors encountered."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"You are currently running version \"%1\" of the Tor software, which is no "
-"longer recommended. Please upgrade to the most recent version of the "
-"software, which may contain important security, reliability and performance "
-"fixes."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"You are currently running version \"%1\" of the Tor software, which may no "
-"longer work with the current Tor network. Please upgrade to the most recent "
-"version of the software, which may contain important security, reliability "
-"and performance fixes."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Your Tor Software is Out-of-date"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Connected to the Tor Network"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"We were able to successfully establish a connection to the Tor network. You "
-"can now configure your applications to use the Internet anonymously."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Tor Software Error"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"The Tor software encountered an internal bug. Please report the following "
-"error message to the Tor developers at bugs.torproject.org: \"%1\""
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Tor has determined that your computer's clock may be set to %1 seconds in "
-"the past compared to the source \"%2\". If your clock is not correct, Tor "
-"will not be able to function. Please verify your computer displays the "
-"correct time."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Tor has determined that your computer's clock may be set to %1 seconds in "
-"the future compared to the source \"%2\". If your clock is not correct, Tor "
-"will not be able to function. Please verify your computer displays the "
-"correct time."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Your Computer's Clock is Potentially Incorrect"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"One of the applications on your computer may have attempted to make an "
-"unencrypted connection through Tor to port %1. Sending unencrypted "
-"information over the Tor network is dangerous and not recommended. For your "
-"protection, Tor has automatically closed this connection."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"One of the applications on your computer may have attempted to make an "
-"unencrypted connection through Tor to port %1. Sending unencrypted "
-"information over the Tor network is dangerous and not recommended."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Potentially Dangerous Connection!"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"One of your applications established a connection through Tor to \"%1\" "
-"using a protocol that may leak information about your destination. Please "
-"ensure you configure your applications to use only SOCKS4a or SOCKS5 with "
-"remote hostname resolution."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Unknown SOCKS Protocol"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"One of your applications tried to establish a connection through Tor using a"
-" protocol that Tor does not understand. Please ensure you configure your "
-"applications to use only SOCKS4a or SOCKS5 with remote hostname resolution."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Invalid Destination Hostname"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"One of your applications tried to establish a connection through Tor to "
-"\"%1\", which Tor does not recognize as a valid hostname. Please check your "
-"application's configuration."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "External IP Address Changed"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Tor has determined your relay's public IP address is currently %1%2. If that"
-" is not correct, please consider setting the 'Address' option in your "
-"relay's configuration."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "DNS Hijacking Detected"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Tor detected that your DNS provider is providing false responses for domains"
-" that do not exist. Some ISPs and other DNS providers, such as OpenDNS, are "
-"known to do this in order to display their own search or advertising pages."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Tor detected that your DNS provider is providing false responses for well "
-"known domains. Since clients rely on Tor network relays to provide accurate "
-"DNS repsonses, your relay will not be configured as an exit relay."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Checking Server Port Reachability"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Tor is trying to determine if your relay's server port is reachable from the"
-" Tor network by connecting to itself at %1:%2. This test could take several "
-"minutes."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Server Port Reachability Test Successful!"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Your relay's server port is reachable from the Tor network!"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Server Port Reachability Test Failed"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Your relay's server port is not reachable by other Tor clients. This can "
-"happen if you are behind a router or firewall that requires you to set up "
-"port forwarding. If %1:%2 is not your correct IP address and server port, "
-"please check your relay's configuration."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Checking Directory Port Reachability"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Tor is trying to determine if your relay's directory port is reachable from "
-"the Tor network by connecting to itself at %1:%2. This test could take "
-"several minutes."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Directory Port Reachability Test Successful!"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Your relay's directory port is reachable from the Tor network!"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Directory Port Reachability Test Failed"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Your relay's directory port is not reachable by other Tor clients. This can "
-"happen if you are behind a router or firewall that requires you to set up "
-"port forwarding. If %1:%2 is not your correct IP address and directory port,"
-" please check your relay's configuration."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Relay Descriptor Rejected"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Your relay's descriptor, which enables clients to connect to your relay, was"
-" rejected by the directory server at %1:%2. The reason given was: %3"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Your Relay is Online"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Your relay is now online and available for Tor clients to use. You should "
-"see an increase in network traffic shown by the Bandwidth Graph within a few"
-" hours as more clients learn about your relay. Thank you for contributing to"
-" the Tor network!"
-msgstr ""
-
msgctxt "Stream"
msgid "New"
msgstr ""
@@ -3476,68 +3025,6 @@ msgctxt "TorSettings"
msgid "Failed to hash the control password."
msgstr ""
-msgctxt "TorrcDialog"
-msgid "Editing torrc"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid ""
-"Save settings. If unchecked it will only apply settings to the current Tor "
-"instance."
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Cut"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Copy"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Paste"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Undo"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Redo"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Select All"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Apply all"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Apply selection only"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Error connecting to Tor"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Selection is empty. Please select some text, or check \"Apply all\""
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Error at line %1: \"%2\""
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Error"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "An error ocurred while opening torrc file"
-msgstr ""
-
msgctxt "UPNPControl"
msgid "Success"
msgstr ""
@@ -3595,15 +3082,11 @@ msgid "Testing Universal Plug & Play Support"
msgstr ""
msgctxt "UpdateProcess"
-msgid ""
-"Vidalia was unable to check for available software updates because it could "
-"not find '%1'."
+msgid "Vidalia was unable to check for available software updates because it could not find '%1'."
msgstr ""
msgctxt "UpdateProcess"
-msgid ""
-"Vidalia was unable to check for available software updates because Tor's "
-"update process exited unexpectedly."
+msgid "Vidalia was unable to check for available software updates because Tor's update process exited unexpectedly."
msgstr ""
msgctxt "UpdateProgressDialog"
@@ -3759,10 +3242,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 ""
@@ -3775,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 ""
@@ -3812,5 +3290,3 @@ msgstr ""
msgctxt "stringutil.h"
msgid "%1 mins"
msgstr ""
-
-
diff --git a/src/vidalia/i18n/po/pa/qt_pa.po b/src/vidalia/i18n/po/pa/qt_pa.po
index 75e5b14..74bee92 100644
--- a/src/vidalia/i18n/po/pa/qt_pa.po
+++ b/src/vidalia/i18n/po/pa/qt_pa.po
@@ -1,11 +1,10 @@
#
-# Translators:
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-08-20 03:25+0000\n"
-"PO-Revision-Date: 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"
@@ -431,5 +430,3 @@ msgstr ""
msgctxt "QFileSystemModel"
msgid "%1 bytes"
msgstr ""
-
-
diff --git a/src/vidalia/i18n/po/pa/vidalia_pa.po b/src/vidalia/i18n/po/pa/vidalia_pa.po
index a276fa6..67b1b2c 100755
--- a/src/vidalia/i18n/po/pa/vidalia_pa.po
+++ b/src/vidalia/i18n/po/pa/vidalia_pa.po
@@ -1,11 +1,10 @@
#
-# Translators:
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-09-07 14:40+0000\n"
-"PO-Revision-Date: 2010-12-05 20:03+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"
@@ -193,10 +192,6 @@ 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"
@@ -236,10 +231,6 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr ""
-
-msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -279,6 +270,10 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr ""
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -432,17 +427,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"
@@ -1266,44 +1270,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"
@@ -1331,10 +1342,6 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr ""
-
-msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1362,6 +1369,10 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr ""
+
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1644,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 ""
@@ -1680,10 +1663,6 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1796,10 +1775,6 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1882,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 ""
@@ -1934,82 +1897,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 ""
@@ -2057,19 +1949,39 @@ 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)"
+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"
@@ -2091,17 +2003,35 @@ msgid ""
msgstr ""
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"
@@ -2357,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"
@@ -2412,10 +2334,6 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2515,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 ""
@@ -2840,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 ""
@@ -3088,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 ""
@@ -3132,10 +3070,6 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
-msgid "Form"
-msgstr ""
-
-msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3424,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 ""
@@ -3460,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 ""
@@ -3538,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 ""
@@ -3666,6 +3646,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 ""
@@ -3759,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 ""
@@ -3812,5 +3796,3 @@ msgstr ""
msgctxt "stringutil.h"
msgid "%1 mins"
msgstr ""
-
-
diff --git a/src/vidalia/i18n/po/pap/qt_pap.po b/src/vidalia/i18n/po/pap/qt_pap.po
index d5db222..d305973 100644
--- a/src/vidalia/i18n/po/pap/qt_pap.po
+++ b/src/vidalia/i18n/po/pap/qt_pap.po
@@ -1,11 +1,10 @@
#
-# Translators:
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-08-20 03:25+0000\n"
-"PO-Revision-Date: 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"
@@ -431,5 +430,3 @@ msgstr ""
msgctxt "QFileSystemModel"
msgid "%1 bytes"
msgstr ""
-
-
diff --git a/src/vidalia/i18n/po/pap/vidalia_pap.po b/src/vidalia/i18n/po/pap/vidalia_pap.po
index 371b707..965c5e9 100644
--- a/src/vidalia/i18n/po/pap/vidalia_pap.po
+++ b/src/vidalia/i18n/po/pap/vidalia_pap.po
@@ -1,11 +1,10 @@
#
-# Translators:
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-09-07 14:40+0000\n"
-"PO-Revision-Date: 2010-12-05 20:03+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"
@@ -193,10 +192,6 @@ 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"
@@ -236,10 +231,6 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr ""
-
-msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -279,6 +270,10 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr ""
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -432,17 +427,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"
@@ -1266,44 +1270,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"
@@ -1331,10 +1342,6 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr ""
-
-msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1362,6 +1369,10 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr ""
+
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1644,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 ""
@@ -1680,10 +1663,6 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1796,10 +1775,6 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1882,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 ""
@@ -1934,82 +1897,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 ""
@@ -2057,19 +1949,39 @@ 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)"
+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"
@@ -2091,17 +2003,35 @@ msgid ""
msgstr ""
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"
@@ -2357,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"
@@ -2412,10 +2334,6 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2515,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 ""
@@ -2840,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 ""
@@ -3088,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 ""
@@ -3132,10 +3070,6 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
-msgid "Form"
-msgstr ""
-
-msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3424,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 ""
@@ -3460,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 ""
@@ -3538,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 ""
@@ -3666,6 +3646,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 ""
@@ -3759,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 ""
@@ -3812,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 23dd665..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:
-# 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"
@@ -201,7 +199,9 @@ msgctxt "QFileDialog"
msgid ""
"%1 already exists.\n"
"Do you want to replace it?"
-msgstr "%1 już istnieje.\nCzy chcesz go zamienić?"
+msgstr ""
+"%1 już istnieje.\n"
+"Czy chcesz go zamienić?"
#: qfiledialog.cpp:1690
msgctxt "QFileDialog"
@@ -209,7 +209,10 @@ msgid ""
"%1\n"
"File not found.\n"
"Please verify the correct file name was given."
-msgstr "%1\nPlik nie znaleziony.\nProszę o sprawdzenie podanej nazwy pliku."
+msgstr ""
+"%1\n"
+"Plik nie znaleziony.\n"
+"Proszę o sprawdzenie podanej nazwy pliku."
#: qdirmodel.cpp:833
msgctxt "QFileDialog"
@@ -267,14 +270,19 @@ msgid ""
"%1\n"
"Directory not found.\n"
"Please verify the correct directory name was given."
-msgstr "%1\nKatalog nie znaleziony.\nSprawdź podaną nazwę katalogu."
+msgstr ""
+"%1\n"
+"Katalog nie znaleziony.\n"
+"Sprawdź podaną nazwę katalogu."
#: qfiledialog.cpp:2281
msgctxt "QFileDialog"
msgid ""
"'%1' is write protected.\n"
"Do you want to delete it anyway?"
-msgstr "'%1' jest zabezpieczony przed zapisem.\nCzy na pewno chcesz go skasować?"
+msgstr ""
+"'%1' jest zabezpieczony przed zapisem.\n"
+"Czy na pewno chcesz go skasować?"
#: qfiledialog.cpp:2286
msgctxt "QFileDialog"
@@ -371,7 +379,9 @@ msgctxt "QFileSystemModel"
msgid ""
"<b>The name \"%1\" can not be used.</b><p>Try using another name, with fewer"
" characters or no punctuations marks."
-msgstr "<b>Nazwa \"%1\" nie może zostać użyta.</b><p>Spróbuj użyć nowej nazwy z mniejszą liczbą znaków lub bez znaków przystankowych."
+msgstr ""
+"<b>Nazwa \"%1\" nie może zostać użyta.</b><p>Spróbuj użyć nowej nazwy z "
+"mniejszą liczbą znaków lub bez znaków przystankowych."
#: qfilesystemmodel.cpp:832
msgctxt "QFileSystemModel"
diff --git a/src/vidalia/i18n/po/pl/vidalia_pl.po b/src/vidalia/i18n/po/pl/vidalia_pl.po
index 3b41c73..614fba8 100644
--- a/src/vidalia/i18n/po/pl/vidalia_pl.po
+++ b/src/vidalia/i18n/po/pl/vidalia_pl.po
@@ -1,15 +1,14 @@
#
# Translators:
-# <achevallier at hush.ai>, 2012.
-# <ipjsdfpojsdf at mailinator.com>, 2012.
+# <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: 2012-03-21 17:52+0000\n"
-"PO-Revision-Date: 2012-04-22 18:06+0000\n"
-"Last-Translator: achevallier <achevallier at hush.ai>\n"
+"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"
@@ -36,7 +35,7 @@ msgstr "Tor 0.2.0.32"
msgctxt "AboutDialog"
msgid "Qt 4.4.2"
-msgstr "Qt 4.4.2"
+msgstr "4.4.2"
msgctxt "AdvancedPage"
msgid "'%1' is not a valid IP address."
@@ -141,43 +140,43 @@ msgstr "Wybierz katalog używany do zapisu danych przez Tora"
msgctxt "AdvancedPage"
msgid "Tor Control"
-msgstr "Ustawienia Tor'a"
+msgstr ""
msgctxt "AdvancedPage"
msgid "Use TCP connection (ControlPort)"
-msgstr "Użyj połączeń TCP (ControlPort)"
+msgstr ""
msgctxt "AdvancedPage"
msgid "Path:"
-msgstr "Ścieżka:"
+msgstr ""
msgctxt "AdvancedPage"
msgid "Use Unix domain socket (ControlSocket)"
-msgstr "Użyj gniazd domeny Uniksa (ControlSocket)"
+msgstr ""
msgctxt "AdvancedPage"
msgid "Edit current torrc"
-msgstr "Edytuj aktualny plik torrc"
+msgstr ""
msgctxt "AdvancedPage"
msgid "NOTE: this will edit the currently loaded torrc"
-msgstr "UWAGA: edytuje aktualnie załadowany plik torrc"
+msgstr ""
msgctxt "AdvancedPage"
msgid "ControlSocket path doesn't exist."
-msgstr "Podana ścieżka nie istnieje."
+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 "Podana ścieżka pliku konfiguracyjnego Tora zawiera znaki, które nie mogą zostać wyświetlone poprawnie w aktualnym 8-bitowym kodowaniu."
+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 "Podana ścieżka katalogu danych Tora zawiera znaki, które nie mogą zostać wyświetlone poprawnie w aktualnym 8-bitowym kodowaniu."
+msgstr ""
msgctxt "AdvancedPage"
msgid "Warning"
@@ -185,26 +184,15 @@ msgstr "Ostrzeżenie"
msgctxt "AdvancedPage"
msgid "You changed torrc path, would you like to restart Tor?"
-msgstr "Zmieniłeś ścieżkę do pliku torrc, zrestartować Tora ?"
+msgstr ""
msgctxt "AdvancedPage"
msgid "Tor Configuration File (torrc);;All Files (*)"
-msgstr "Plik konfiguracyjny Tora (torrc);;Wszystkie pliki (*)"
+msgstr ""
msgctxt "AdvancedPage"
msgid "Select a file to use for Tor socket path"
-msgstr "Wybierz ścieżkę do Tora"
-
-msgctxt "AdvancedPage"
-msgid "Configure ControlPort automatically"
-msgstr "Konfiguruj Port Kontrolny automatycznie"
-
-msgctxt "AdvancedPage"
-msgid ""
-"You've checked the autoconfiguration option for the ControlPort, but "
-"provided no Data Directory. Please add one, or uncheck the \"Configure "
-"ControlPort automatically\" option."
-msgstr "Sprawdziłeś autokonfigurację dla ControlPort, ale nie dostarczyłeś Katalogu Danych. Dodaj go, albo odznacz opcję \"Skonfiguruj ControlPort automatycznie\""
+msgstr ""
msgctxt "AdvancedPage"
msgid ""
@@ -233,23 +221,6 @@ msgctxt "AppearancePage"
msgid "Vidalia was unable to load the selected language translation."
msgstr "Vidalia nie mogła wczytać wybranego języka."
-msgctxt "AppearancePage"
-msgid ""
-"System Icon Preferences (changes will take effect when you restart Vidalia)"
-msgstr "Preferencje ikon (ujrzysz zmiany po ponownym włączeniu Vidalii)"
-
-msgctxt "AppearancePage"
-msgid "Show the Tray Icon and Dock Icon (default)"
-msgstr "Pokaż ikonę na pasku zadań i przyczep ikonę (domyślne)"
-
-msgctxt "AppearancePage"
-msgid "Hide the Tray Icon"
-msgstr "Schowaj ikonę z paska zadań"
-
-msgctxt "AppearancePage"
-msgid "Hide the Dock Icon"
-msgstr "Schowaj przyczepioną ikonę"
-
msgctxt "BandwidthGraph"
msgid "Since:"
msgstr "Wykres od:"
@@ -263,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"
@@ -280,7 +247,7 @@ msgstr "Pokaż wysyłanie"
msgctxt "BandwidthGraph"
msgid "Always on Top"
-msgstr "Zawsze na wierzchu"
+msgstr "Na wierzchu"
msgctxt "BandwidthGraph"
msgid "Style"
@@ -306,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..."
@@ -459,18 +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 ""
+"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 połączyła się z usługą Tora, który wymaga hasła. Proszę wprowadzić hasło:"
+"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."
@@ -1186,7 +1166,7 @@ msgstr "Zimbabwe"
msgctxt "CountryInfo"
msgid "Zaire"
-msgstr "Zair"
+msgstr ""
msgctxt "CountryInfo"
msgid "Albania"
@@ -1286,52 +1266,59 @@ msgstr "Tajwan"
msgctxt "CrashReportDialog"
msgid "Submit a Crash Report"
-msgstr "Wyślij raport o błędzie"
+msgstr "Wyślij raport błędów"
msgctxt "CrashReportDialog"
msgid "Vidalia encountered an error and needed to close"
-msgstr "Vidalia napotkała problem i musi zostać zamknięta"
+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 "Wyślij raport błędów do developerów Vidalia"
msgctxt "CrashReportDialog"
msgid "Restart Vidalia"
-msgstr "Uruchom Vidalię ponownie"
+msgstr "Restart Vidalia"
msgctxt "CrashReportDialog"
msgid "Don't Restart"
-msgstr "Nie uruchamiaj ponownie"
+msgstr "Nie restartuj"
msgctxt "CrashReportDialog"
msgid "Unable to restart Vidalia"
-msgstr "Ponowne uruchomienie Vidalia nie powiodło się"
+msgstr "Nie można zrestartować Vidalia"
msgctxt "CrashReportDialog"
msgid ""
"We were unable to automatically restart Vidalia. Please restart Vidalia "
"manually."
-msgstr "Nie udało się automatycznie uruchomić Vidalii. Proszę uruchomić ponownie ręcznie."
-
-msgctxt "CrashReportDialog"
-msgid "Please fill a ticket in:"
-msgstr "Wypełnij kartę w:"
+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 "Connecting..."
+msgstr "Łączę..."
-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 "Został utworzony raport błędu, który możesz przesłać do zespołu Vidalii aby pomóc zidentyfikować i usunąć usterkę. Przesyłany raport nie zawiera żadnych informacji poufnych."
+msgctxt "CrashReportUploader"
+msgid "Sending crash report..."
+msgstr "Wysyłam raport błędów..."
-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 "wraz z opisem tego co robiłeś przed wystąpieniem usterki, oraz następującymi plikami odnośnie raportu o błędzie:"
+msgctxt "CrashReportUploader"
+msgid "Receiving response..."
+msgstr "Otrzymuję odpowiedź..."
msgctxt "GeneralPage"
msgid "Executables (*.exe)"
@@ -1358,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"
@@ -1389,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"
@@ -1608,15 +1595,15 @@ msgstr "Nieznany"
msgctxt "LogTreeItem"
msgid "Debug"
-msgstr "Debug"
+msgstr ""
msgctxt "LogTreeItem"
msgid "Info"
-msgstr "Informacja"
+msgstr "Info"
msgctxt "LogTreeItem"
msgid "Notice"
-msgstr "Powiadomienie"
+msgstr ""
msgctxt "LogTreeItem"
msgid "Warning"
@@ -1628,7 +1615,7 @@ msgstr "Błąd"
msgctxt "LogTreeItem"
msgid "Unknown"
-msgstr "Nieznany"
+msgstr ""
msgctxt "MainWindow"
msgid "Start Tor"
@@ -1671,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"
@@ -1707,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"
@@ -1775,6 +1730,10 @@ msgid "Connected to the Tor network!"
msgstr "Połączony z siecią Tor!"
msgctxt "MainWindow"
+msgid "Unrecognized startup status"
+msgstr "Nierozpoznany stan początkowy"
+
+msgctxt "MainWindow"
msgid "miscellaneous"
msgstr "różne"
@@ -1819,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"
@@ -1905,18 +1860,6 @@ msgid ""
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ą."
-
-msgctxt "MainWindow"
msgid "Tor Update Available"
msgstr "Aktualizacja Tora jest dostępna"
@@ -1957,82 +1900,11 @@ msgid "Status"
msgstr "Status"
msgctxt "MainWindow"
-msgid "Vidalia Shortcuts"
-msgstr "Skróty Vidalii"
-
-msgctxt "MainWindow"
-msgid "Setup Relaying"
-msgstr "Ustawienia węzła"
-
-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ę."
@@ -2080,53 +1952,44 @@ 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 "Każda informacja przesłana przy użyciu tego połączenia może być monitorowana. Sprawdź ustawienia aplikacji i używaj tylko protokołów szyfrowanych, jak np. SSL, jeśli to możliwe."
-
-msgctxt "MainWindow"
-msgid "Bootstrapping torrc from %1 to %2"
-msgstr "Ładowanie początkowe torrc z %1 do %2"
+msgstr ""
msgctxt "MainWindow"
-msgid "(probably Telnet)"
-msgstr "(prawdopodobnie Telnet)"
+msgid "toolBar"
+msgstr ""
msgctxt "MainWindow"
-msgid "(probably an email client)"
-msgstr "(pradwopodobnie klient email)"
+msgid "Start"
+msgstr "Start"
msgctxt "MainWindow"
-msgid ""
-"One of your applications %1 appears to be making a potentially unencrypted "
-"and unsafe connection to port %2."
-msgstr "Jedna z uruchomionych aplikacji %1 próbuje nawiązać potencjalnie nieszyfrowane i niebezpieczne połączenie z portem %2."
+msgid "Stop"
+msgstr "Stop"
msgctxt "MainWindow"
-msgid "failed (%1)"
-msgstr "nie powiodło się (%1)"
+msgid "Restart"
+msgstr "Restart"
msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
-msgstr "Twój węzeł zostanie wyłączony.\n\"Kliknij na 'Zatrzymaj' aby go teraz zatrzymać."
+msgid "Reload Tor's config"
+msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Vidalia can't find out how to talk to Tor because it can't access this file: %1\n"
-"\n"
-"Here's the last error message:\n"
-"%2"
-msgstr "Vidalia nie wie jak porozumieć się z Torem, ponieważ nie może uzyskać dostępu do tego pliku: %1 ⏎\n⏎\nTutaj jest ostatni błąd:⏎\n%2"
+msgid "Actions"
+msgstr ""
msgctxt "MainWindow"
-msgid ""
-"It seems Tor has stopped running since Vidalia started it.\n"
-"\n"
-"See the Advanced Message Log for more information."
-msgstr "Wygląda na to, że Tor przestał działać zanim Vidalia go włączyła ⏎\n⏎\nZobacz Logi aby uzyskać więcej informacji."
+msgid "Bootstrapping torrc from %1 to %2"
+msgstr ""
msgctxt "MainWindow"
msgid ""
@@ -2142,6 +2005,38 @@ msgid ""
"Please check the message log for recent warning or error messages."
msgstr "Vidalia wykryła, że Tor nieoczekiwanie zakończył działanie.\n\nProszę sprawdzić logi w celu poznania przyczyny."
+msgctxt "MainWindow"
+msgid ""
+"Vidalia tried to restart Tor, but was not able to. Please check your Task "
+"Manager to ensure there are no other Tor processes running."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "failed (%1)"
+msgstr "nie powiodło się (%1)"
+
+msgctxt "MainWindow"
+msgid ", probably Telnet,"
+msgstr ", prawdopodobnie Telnet,"
+
+msgctxt "MainWindow"
+msgid ", probably an email client,"
+msgstr ", prawdopodobnie klient e-mail,"
+
+msgctxt "MainWindow"
+msgid ""
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
+msgstr "Twój węzeł zostanie wyłączony.\n\"Kliknij na 'Zatrzymaj' aby go teraz zatrzymać."
+
+msgctxt "MainWindow"
+msgid "Error reloading configuration"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to reload Tor's configuration."
+msgstr ""
+
msgctxt "MessageLog"
msgid "Error Setting Filter"
msgstr "Błąd ustawiania filtru"
@@ -2395,22 +2290,14 @@ msgid "Automatically save new log messages to a file"
msgstr "Automatycznie zapisuj wiadomości do pliku"
msgctxt "MessageLog"
-msgid "Basic"
-msgstr "Podstawowe"
-
-msgctxt "MessageLog"
-msgid "Tor Status"
-msgstr "Status Tor"
-
-msgctxt "MessageLog"
-msgid "Advanced"
-msgstr "Zaawansowane"
-
-msgctxt "MessageLog"
msgid "Always Save New Log Messages"
msgstr "Zawsze zapisuj nowe wiadomości"
msgctxt "MessageLog"
+msgid "toolbar"
+msgstr ""
+
+msgctxt "MessageLog"
msgid ""
"Messages that appear when something has \n"
"gone very wrong and Tor cannot proceed."
@@ -2450,10 +2337,6 @@ msgid ""
msgstr "Nie można zapisywać do pliku %1\n\n%2."
msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr "Mapa Sieci"
-
-msgctxt "NetViewer"
msgid "Refresh"
msgstr "Odśwież"
@@ -2553,6 +2436,30 @@ 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"
+
+msgctxt "NetworkPage"
+msgid "The specified bridge identifier is not valid."
+msgstr "Określony identyfikator Węzła-Mostu nie jest poprawny."
+
msgctxt "NetworkPage"
msgid "Copy (Ctrl+C)"
msgstr "Kopiuj (Ctrl+C)"
@@ -2595,7 +2502,7 @@ msgstr "Hasło:"
msgctxt "NetworkPage"
msgid "Port:"
-msgstr "Port:"
+msgstr "Port"
msgctxt "NetworkPage"
msgid "Check to only connect to relays using ports allowed by your firewall"
@@ -2667,31 +2574,31 @@ msgstr "Kliknij Pomoc, aby zobaczyć inne metody znajdywania węzłów-mostów."
msgctxt "NetworkPage"
msgid "Address:"
-msgstr "Adres:"
+msgstr ""
msgctxt "NetworkPage"
msgid "Type:"
-msgstr "Typ:"
+msgstr ""
msgctxt "NetworkPage"
msgid "You must select the proxy type."
-msgstr "Musisz wybrać 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 / HTTPS"
-msgstr "HTTP / HTTPS"
+msgid "HTTP"
+msgstr ""
msgctxt "NetworkPage"
-msgid "You must specify one or more bridges."
-msgstr "Musisz wyszczególnić jeden lub więcej przekaźników."
+msgid "HTTP / HTTPS"
+msgstr ""
msgctxt "Policy"
msgid "accept"
@@ -3011,7 +2918,7 @@ msgstr "Inne usługi"
msgctxt "ServerPage"
msgid "Ports 706, 1863, 5050, 5190, 5222, 5223, 8300 and 8888"
-msgstr "Porty 706, 1863, 5050, 5190, 5222, 5223, 8300 i 8888"
+msgstr "Porty 706, 1863, 5050, 5190, 5222, 8300 i 8888"
msgctxt "ServerPage"
msgid "Instant Messaging (IM)"
@@ -3107,19 +3014,19 @@ msgstr "<a href=\"bridges.finding\">Jak mam znaleźć węzeł-most?</a>"
msgctxt "ServerPage"
msgid "<a href=\"#bridgeHelp\">What's this?</a>"
-msgstr "<a href=\"#bridgeHelp\">Co to jest?</a>"
+msgstr ""
msgctxt "ServerPage"
msgid "Automatically distribute my bridge address"
-msgstr "Automatycznie udostępniaj mój adres Mostu"
+msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network (exit relay)"
-msgstr "Ruch przekaźników w sieci Tor (przekaźnik wyjścia)"
+msgid "Relay traffic inside the Tor network (non-exit relay)"
+msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic inside the Tor network (non-exit relay)"
-msgstr "Ruch przekaźników w sieci Tor (przekaźnik bez wyjścia)"
+msgid "Relay traffic for the Tor network (exit relay)"
+msgstr ""
msgctxt "ServerPage"
msgid "Mirror the Relay Directory"
@@ -3166,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"
@@ -3215,26 +3118,26 @@ msgstr "Utworzone przez Tora"
msgctxt "StatusEventWidget"
msgid "Copy to Clipboard"
-msgstr "Kopiuj do Schowka"
+msgstr ""
msgctxt "StatusEventWidget"
msgid "The Tor Software is Running"
-msgstr "Tor jest uruchomiony"
+msgstr ""
msgctxt "StatusEventWidget"
msgid "You are currently running version \"%1\" of the Tor software."
-msgstr "Aktualna wersja Tor to \"%1\"."
+msgstr ""
msgctxt "StatusEventWidget"
msgid "The Tor Software is not Running"
-msgstr "Tor nie jest uruchomiony"
+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 "Wybierz \"Uruchom Tor\" w Panelu Kontrolnym aby zrestartować Tor. Jeśli Tor został zamknięty niespodziewanie, wybierz zakładkę \"Zaawansowane\" aby poznać szczegóły błędów."
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
@@ -3242,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 "Twoja aktualna wersja Tor \"%1\" nie jest zalecana. Zaktualizuj do najnowszej wersji, która może zawierać ważne poprawki bezpieczeństwa, stabilności i wydajności."
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
@@ -3250,11 +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 "Twoja aktualna wersja Tor \"%1\" może nie działać poprawnie z aktualną siecią Tor. Zaktualizuj do najnowszej wersji, która może zawierać ważne poprawki bezpieczeństwa, stabilności i wydajności."
+msgstr ""
msgctxt "StatusEventWidget"
msgid "Your Tor Software is Out-of-date"
-msgstr "Twoja wersja Tor jest nieaktualna"
+msgstr ""
msgctxt "StatusEventWidget"
msgid "Connected to the Tor Network"
@@ -3264,17 +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 "Udało się nawiązać połączenie z siecią Tor. Możesz teraz skonfigurować swoje aplikacje do korzystania z internetu anonimowo."
+msgstr ""
msgctxt "StatusEventWidget"
msgid "Tor Software Error"
-msgstr "Błąd Tor"
+msgstr "Błąd programu 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 "Wewnętrzny błąd Tor. Wyślij tą wiadomość do deweloperów Tora na bugs.torproject.org: \"%1\""
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
@@ -3282,7 +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 ustalił, że zegar Twojego komputera może być przestawiony o %1 sekund wstecz w porównaniu do \"%2\". Jeśli ustawienie zegara jest niepoprawne, Tor nie będzie działał poprawnie. Upewnij się, że czas wyświetlany przez zegar jest prawidłowy."
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
@@ -3290,11 +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 ustalił, że zegar Twojego komputera może być przestawiony o %1 sekund wprzód w porównaniu do \"%2\". Jeśli ustawienie zegara jest niepoprawne, Tor nie będzie działał poprawnie. Upewnij się, że czas wyświetlany przez zegar jest prawidłowy."
+msgstr ""
msgctxt "StatusEventWidget"
msgid "Your Computer's Clock is Potentially Incorrect"
-msgstr "Ustawienia Zegara Twojego komputera mogą być nieprawidłowe"
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
@@ -3302,18 +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 "Jedna z aplikacji na Twoim komputerze probowała nawiązać nieszyfrowane połączenie poprzez Tor na porcie %1. Wysyłanie nieszyfrowanych informacji przez sieć Tor jest niebezpieczne. Dla Twojej ochrony, Tor automatycznie zamknął to połączenie."
+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 "Jedna z aplikacji na Twoim komputerze probowała nawiązać nieszyfrowane połączenie poprzez Tor na porcie %1. Wysyłanie nieszyfrowanych informacji przez sieć Tor jest niebezpieczne."
+msgstr ""
msgctxt "StatusEventWidget"
msgid "Potentially Dangerous Connection!"
-msgstr "Potencjalnie niebezpieczne połączenie!"
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
@@ -3321,81 +3224,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 "Jedna z Twoich aplikacji próbowała nawiązać połączenie przez Tor z \"%1\" używając protokołu, który może spowodować wyciek informacji o celu połączenia. Upewnij się, że Twoja aplikacja jest skonfigurowana do używania tylko SOCKS4a lub SOCKS5."
+msgstr ""
msgctxt "StatusEventWidget"
msgid "Unknown SOCKS Protocol"
-msgstr "Nieznany protokół"
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
"One of your applications tried to establish a connection through Tor using a"
" protocol that Tor does not understand. Please ensure you configure your "
"applications to use only SOCKS4a or SOCKS5 with remote hostname resolution."
-msgstr "Jedna z Twoich aplikacji próbowała nawiązać połączenie przez Tor używając protokołu nieznanego dla Tora. Upewnij się, że Twoja aplikacja jest skonfigurowana do używania tylko SOCKS4a lub SOCKS5."
+msgstr ""
msgctxt "StatusEventWidget"
msgid "Invalid Destination Hostname"
-msgstr "Nieprawidłowa nazwa hosta"
+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 "Jedna z aplikacji próbowała nawiązać połączenie przez Tor z \"%1\", które nie jest rozpoznawane jako prawidłowa nazwa hosta. Sprawdź ustawienia swojej aplikacji."
+msgstr ""
msgctxt "StatusEventWidget"
msgid "External IP Address Changed"
-msgstr "Zewnętrzny adres IP zmieniony"
+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 ustalił, że publiczny adres IP Twojego węzła to %1%2. Jeśli podany adres nie jest poprawny, wprowadź adres IP w polu 'Adres' w ustawieniach węzła."
+msgstr ""
msgctxt "StatusEventWidget"
msgid "DNS Hijacking Detected"
-msgstr "Wykryto przekierowanie DNS "
+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 "Tor wykrył, że Twój dostawca DNS przekazuje fałszywe odpowiedzi dla domen, które nie istnieją. Niektórzy dostawcy internetu i DNS, np. OpenDNS, są znani z takich działań, aby pokazać ich własne wyszukiwarki, czy strony reklamowe."
+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 "Tor wykrył, że Twój dostawca DNS przekazuje fałszywe odpowiedzi dla dobrze znanych domen. Odkąd klienci polegają na przekaźnikach sieci Tor, aby otrzymać dokładne odpowiedzi DNS, Twój przekaźnik nie będzie skonfigurowany jako przekaźnik wyjściowy."
+msgstr ""
msgctxt "StatusEventWidget"
msgid "Checking Server Port Reachability"
-msgstr "Sprawdzanie, czy port serwera jest osiągalny"
+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 próbuje sprawdzić, czy port serwera Twojego przekaźnika jest osiągalny z sieci Tor, łącząc się w %1:%2. To może potrwać kilka minut."
+msgstr ""
msgctxt "StatusEventWidget"
msgid "Server Port Reachability Test Successful!"
-msgstr "Test dostępu do portu serwera przebiegł pomyślnie!"
+msgstr ""
msgctxt "StatusEventWidget"
msgid "Your relay's server port is reachable from the Tor network!"
-msgstr "Port serwera Twojego przekaźnika jest osiągalny przez sieć Tor!"
+msgstr ""
msgctxt "StatusEventWidget"
msgid "Server Port Reachability Test Failed"
-msgstr "Test dostęu do portu serwera zakończony niepowodzeniem"
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
@@ -3403,30 +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 "Port serwera Twojego przekaźnika jest niedostępny dla innych klientów Tora. Przyczyną może być Twój router lub firewall, który wymaga od Ciebie ustawienia przekierowania portu. Jeśli %1:%2 to nie Twój adres IP i port katalogu, sprawdź konfigurację swojego przekaźnika."
+msgstr ""
msgctxt "StatusEventWidget"
msgid "Checking Directory Port Reachability"
-msgstr "Sprawdzanie, czy dostępny jest katalog portów."
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
"Tor is trying to determine if your relay's directory port is reachable from "
"the Tor network by connecting to itself at %1:%2. This test could take "
"several minutes."
-msgstr "Tor próbuje sprawdzić, czy port katalogu Twojego przekaźnika jest osiągalny z sieci Tor, łącząc się w %1:%2. To może potrwać kilka minut."
+msgstr ""
msgctxt "StatusEventWidget"
msgid "Directory Port Reachability Test Successful!"
-msgstr "Test dostępu do portu katalogu zakończony pomyślnie!"
+msgstr ""
msgctxt "StatusEventWidget"
msgid "Your relay's directory port is reachable from the Tor network!"
-msgstr "Katalog portu Twojego przekaźnika jest dostępny z sieci Tor!"
+msgstr ""
msgctxt "StatusEventWidget"
msgid "Directory Port Reachability Test Failed"
-msgstr "Test dostępu do portu katalogu zakończony niepowodzeniem"
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
@@ -3434,21 +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 "Port katalogu Twojego przekaźnika jest niedostępny dla innych klientów Tora. Przyczyną może być Twój router lub firewall, który wymaga od Ciebie ustawienia przekierowania portu. Jeśli %1:%2 to nie Twój adres IP i port katalogu, sprawdź konfigurację swojego przekaźnika."
+msgstr ""
msgctxt "StatusEventWidget"
msgid "Relay Descriptor Rejected"
-msgstr "Deskryptor Węzła Odrzucony"
+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 "Deskryptor Twojego Węzła, który umożliwia klientom łączenie się z węzłem, został odrzucony przez serwer %1:%2. Podany powód: %3"
+msgstr ""
msgctxt "StatusEventWidget"
msgid "Your Relay is Online"
-msgstr "Twój Węzeł jest aktywny"
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
@@ -3456,7 +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 "Twoj węzeł jest aktywny i dostępny dla innych użytkowników sieci Tor. W ciągu kilku godzin powinienieś móc zaobserwować wzrost ruchu w sieci na wykresie przepustowości. Dziękujemy za wkład wniesiony w sieć Tor!"
+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"
@@ -3494,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]"
@@ -3512,57 +3437,57 @@ msgstr "Haszowanie hasła sterującego nie powiodło się."
msgctxt "TorrcDialog"
msgid "Editing torrc"
-msgstr "Edytowanie torrc"
+msgstr ""
msgctxt "TorrcDialog"
msgid ""
"Save settings. If unchecked it will only apply settings to the current Tor "
"instance."
-msgstr "Zapisz ustawienia. Jeśli nie zaznaczono, ustawienia zostaną zastosowane tylko do aktualnej instancji Tor"
+msgstr ""
msgctxt "TorrcDialog"
msgid "Cut"
-msgstr "Wytnij"
+msgstr ""
msgctxt "TorrcDialog"
msgid "Copy"
-msgstr "Kopiuj"
+msgstr ""
msgctxt "TorrcDialog"
msgid "Paste"
-msgstr "Wklej"
+msgstr ""
msgctxt "TorrcDialog"
msgid "Undo"
-msgstr "Cofnij"
+msgstr ""
msgctxt "TorrcDialog"
msgid "Redo"
-msgstr "Ponów"
+msgstr ""
msgctxt "TorrcDialog"
msgid "Select All"
-msgstr "Zaznacz wszystko"
+msgstr "Wybierz wszystko"
msgctxt "TorrcDialog"
msgid "Apply all"
-msgstr "Zatwierdź wszystko"
+msgstr "Zaznacz wszystko"
msgctxt "TorrcDialog"
msgid "Apply selection only"
-msgstr "Zatwierdź tylko wybrane"
+msgstr "Zaznacz wybrane"
msgctxt "TorrcDialog"
msgid "Error connecting to Tor"
-msgstr "Błąd podczas łączenia z Tor"
+msgstr "Błąd połączenia z siecią Tor"
msgctxt "TorrcDialog"
msgid "Selection is empty. Please select some text, or check \"Apply all\""
-msgstr "Zaznaczenie jest puste. Zaznacz tekst, lub użyj opcji \"Zatwierdź wszystkie\""
+msgstr ""
msgctxt "TorrcDialog"
msgid "Error at line %1: \"%2\""
-msgstr "Błąd w linii %1 \"%2\""
+msgstr ""
msgctxt "TorrcDialog"
msgid "Error"
@@ -3570,7 +3495,31 @@ msgstr "Błąd"
msgctxt "TorrcDialog"
msgid "An error ocurred while opening torrc file"
-msgstr "Błąd podczas otwierania pliku torrc"
+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"
@@ -3700,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"
@@ -3793,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 "Wartość wymagana dla parametru :"
-
-msgctxt "Vidalia"
msgid "Invalid language code specified:"
msgstr "Niepoprawny kod języka:"
diff --git a/src/vidalia/i18n/po/pms/qt_pms.po b/src/vidalia/i18n/po/pms/qt_pms.po
index 4bed094..5b69b65 100644
--- a/src/vidalia/i18n/po/pms/qt_pms.po
+++ b/src/vidalia/i18n/po/pms/qt_pms.po
@@ -1,11 +1,10 @@
#
-# Translators:
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-08-20 03:25+0000\n"
-"PO-Revision-Date: 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"
@@ -431,5 +430,3 @@ msgstr ""
msgctxt "QFileSystemModel"
msgid "%1 bytes"
msgstr ""
-
-
diff --git a/src/vidalia/i18n/po/pms/vidalia_pms.po b/src/vidalia/i18n/po/pms/vidalia_pms.po
index 8b32761..a0f7ffb 100644
--- a/src/vidalia/i18n/po/pms/vidalia_pms.po
+++ b/src/vidalia/i18n/po/pms/vidalia_pms.po
@@ -1,11 +1,10 @@
#
-# Translators:
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-09-07 14:40+0000\n"
-"PO-Revision-Date: 2010-12-05 20:03+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"
@@ -193,10 +192,6 @@ 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"
@@ -236,10 +231,6 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr ""
-
-msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -279,6 +270,10 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr ""
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -432,17 +427,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"
@@ -1266,44 +1270,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"
@@ -1331,10 +1342,6 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr ""
-
-msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1362,6 +1369,10 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr ""
+
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1644,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 ""
@@ -1680,10 +1663,6 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1796,10 +1775,6 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1882,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 ""
@@ -1934,82 +1897,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 ""
@@ -2057,19 +1949,39 @@ 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)"
+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"
@@ -2091,17 +2003,35 @@ msgid ""
msgstr ""
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"
@@ -2357,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"
@@ -2412,10 +2334,6 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2515,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 ""
@@ -2840,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 ""
@@ -3088,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 ""
@@ -3132,10 +3070,6 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
-msgid "Form"
-msgstr ""
-
-msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3424,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 ""
@@ -3460,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 ""
@@ -3538,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 ""
@@ -3666,6 +3646,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 ""
@@ -3759,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 ""
@@ -3812,5 +3796,3 @@ msgstr ""
msgctxt "stringutil.h"
msgid "%1 mins"
msgstr ""
-
-
diff --git a/src/vidalia/i18n/po/ps/qt_ps.po b/src/vidalia/i18n/po/ps/qt_ps.po
index 38466ba..cc3bb21 100644
--- a/src/vidalia/i18n/po/ps/qt_ps.po
+++ b/src/vidalia/i18n/po/ps/qt_ps.po
@@ -1,11 +1,10 @@
#
-# Translators:
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-08-20 03:25+0000\n"
-"PO-Revision-Date: 2010-12-05 19:59+0000\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"
@@ -431,5 +430,3 @@ msgstr ""
msgctxt "QFileSystemModel"
msgid "%1 bytes"
msgstr ""
-
-
diff --git a/src/vidalia/i18n/po/ps/vidalia_ps.po b/src/vidalia/i18n/po/ps/vidalia_ps.po
index 25319c8..52baa3f 100644
--- a/src/vidalia/i18n/po/ps/vidalia_ps.po
+++ b/src/vidalia/i18n/po/ps/vidalia_ps.po
@@ -1,11 +1,10 @@
#
-# Translators:
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-09-07 14:40+0000\n"
-"PO-Revision-Date: 2010-12-05 20:03+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"
@@ -193,10 +192,6 @@ 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"
@@ -236,10 +231,6 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr ""
-
-msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -279,6 +270,10 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr ""
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -432,17 +427,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"
@@ -1266,44 +1270,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"
@@ -1331,10 +1342,6 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr ""
-
-msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1362,6 +1369,10 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr ""
+
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1644,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 ""
@@ -1680,10 +1663,6 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1796,10 +1775,6 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1882,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 ""
@@ -1934,82 +1897,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 ""
@@ -2057,19 +1949,39 @@ 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)"
+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"
@@ -2091,17 +2003,35 @@ msgid ""
msgstr ""
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"
@@ -2357,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"
@@ -2412,10 +2334,6 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2515,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 ""
@@ -2840,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 ""
@@ -3088,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 ""
@@ -3132,10 +3070,6 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
-msgid "Form"
-msgstr ""
-
-msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3424,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 ""
@@ -3460,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 ""
@@ -3538,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 ""
@@ -3666,6 +3646,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 ""
@@ -3759,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 ""
@@ -3812,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 b423bf7..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:
-# 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: 2012-02-14 09:47+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"
@@ -202,7 +199,9 @@ msgctxt "QFileDialog"
msgid ""
"%1 already exists.\n"
"Do you want to replace it?"
-msgstr "%1 já existe.\nDeseja substituí-lo?"
+msgstr ""
+"%1 já existe.\n"
+"Deseja substituir?"
#: qfiledialog.cpp:1690
msgctxt "QFileDialog"
@@ -210,7 +209,10 @@ msgid ""
"%1\n"
"File not found.\n"
"Please verify the correct file name was given."
-msgstr "%1\nFicheiro não encontrado.\nPor favor verifique que foi dado o nome correcto do ficheiro."
+msgstr ""
+"%1\n"
+"Ficheiro não encontrado.\n"
+"Por favor verifique o nome do ficheiro."
#: qdirmodel.cpp:833
msgctxt "QFileDialog"
@@ -240,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"
@@ -268,14 +270,19 @@ msgid ""
"%1\n"
"Directory not found.\n"
"Please verify the correct directory name was given."
-msgstr "%1\nDirectoria não encontrada.\nPor favor verifique que foi dado o nome correcto da pasta."
+msgstr ""
+"%1\n"
+"Pasta não encontrada.\n"
+"Por favor verifique o nome da pasta."
#: qfiledialog.cpp:2281
msgctxt "QFileDialog"
msgid ""
"'%1' is write protected.\n"
"Do you want to delete it anyway?"
-msgstr "'%1' está protegido contra escrita.\nDeseja apagar mesmo assim?"
+msgstr ""
+"'%1' está protegido contra escrita.\n"
+"Deseja apagar mesmo assim?"
#: qfiledialog.cpp:2286
msgctxt "QFileDialog"
@@ -372,7 +379,9 @@ msgctxt "QFileSystemModel"
msgid ""
"<b>The name \"%1\" can not be used.</b><p>Try using another name, with fewer"
" characters or no punctuations marks."
-msgstr "<b>O nome \"%1\" não pode ser usado.</b><p>Tente utilizar outro nome, com menos caractéres ou sem pontuação."
+msgstr ""
+"<b>O nome \"%1\" não pode ser usado.</b><p>Tente utilizar outro nome, como "
+"menos caracteres ou sem pontuação."
#: qfilesystemmodel.cpp:832
msgctxt "QFileSystemModel"
@@ -387,7 +396,7 @@ msgstr "Tamanho"
#: qfilesystemmodel.cpp:838
msgctxt "QFileSystemModel"
msgid "Kind"
-msgstr "Espécie"
+msgstr "Tipo"
#: qfilesystemmodel.cpp:840
msgctxt "QFileSystemModel"
diff --git a/src/vidalia/i18n/po/pt/vidalia_pt.po b/src/vidalia/i18n/po/pt/vidalia_pt.po
index 2eca31d..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: 2012-03-21 17:52+0000\n"
-"PO-Revision-Date: 2012-03-22 08:51+0000\n"
-"Last-Translator: Zeca Gatilho <paulo.mosh at gmail.com>\n"
+"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,7 +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"
@@ -101,7 +100,7 @@ msgstr "Cookie"
msgctxt "AdvancedPage"
msgid "Password"
-msgstr "Password"
+msgstr "Senha"
msgctxt "AdvancedPage"
msgid "Randomly Generate"
@@ -141,43 +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"
@@ -185,26 +184,15 @@ 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"
-
-msgctxt "AdvancedPage"
-msgid ""
-"You've checked the autoconfiguration option for the ControlPort, but "
-"provided no Data Directory. Please add one, or uncheck the \"Configure "
-"ControlPort automatically\" option."
-msgstr ""
+msgstr "Selecione um arquivo para usar no caminho do socket Tor "
msgctxt "AdvancedPage"
msgid ""
@@ -233,23 +221,6 @@ msgctxt "AppearancePage"
msgid "Vidalia was unable to load the selected language translation."
msgstr "O Vidalia não pôde carregar a tradução no idioma seleccionado."
-msgctxt "AppearancePage"
-msgid ""
-"System Icon Preferences (changes will take effect when you restart Vidalia)"
-msgstr ""
-
-msgctxt "AppearancePage"
-msgid "Show the Tray Icon and Dock Icon (default)"
-msgstr ""
-
-msgctxt "AppearancePage"
-msgid "Hide the Tray Icon"
-msgstr ""
-
-msgctxt "AppearancePage"
-msgid "Hide the Dock Icon"
-msgstr ""
-
msgctxt "BandwidthGraph"
msgid "Since:"
msgstr "Desde:"
@@ -263,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"
@@ -306,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..."
@@ -316,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"
@@ -348,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"
@@ -459,18 +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:"
-msgstr "O Vidalia estabeleceu uma ligação a um processo do Tor que necessita de palavra-passe. Por favor introduza a sua palavra-passe:"
+"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 ""
msgctxt "ControlSocket"
msgid "Control socket is not connected."
@@ -518,7 +498,7 @@ msgstr "Austrália"
msgctxt "CountryInfo"
msgid "Azerbaijan"
-msgstr "Azerbaidjão "
+msgstr "Azerbaijão "
msgctxt "CountryInfo"
msgid "Bahamas"
@@ -526,7 +506,7 @@ msgstr "Bahamas"
msgctxt "CountryInfo"
msgid "Bangladesh"
-msgstr "Bangladesh"
+msgstr "Bangladeche "
msgctxt "CountryInfo"
msgid "Barbados"
@@ -534,7 +514,7 @@ msgstr "Barbados"
msgctxt "CountryInfo"
msgid "Belarus"
-msgstr "Bielo-rússia"
+msgstr "Bielorrússia"
msgctxt "CountryInfo"
msgid "Belgium"
@@ -566,7 +546,7 @@ msgstr "Brasil"
msgctxt "CountryInfo"
msgid "Brunei Darussalam"
-msgstr "Principado do Brunei"
+msgstr "Brunei Darussalam"
msgctxt "CountryInfo"
msgid "Bulgaria"
@@ -598,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"
@@ -622,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"
@@ -634,7 +614,7 @@ msgstr "Costa Rica"
msgctxt "CountryInfo"
msgid "Cote d’Ivoire"
-msgstr "Costa do Marfim"
+msgstr "Cote dâ Ivoire"
msgctxt "CountryInfo"
msgid "Croatia"
@@ -658,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"
@@ -782,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"
@@ -810,7 +790,7 @@ msgstr "Libéria"
msgctxt "CountryInfo"
msgid "Liechtenstein"
-msgstr "Liechtenstein"
+msgstr "Licença"
msgctxt "CountryInfo"
msgid "Lithuania"
@@ -830,7 +810,7 @@ msgstr "Madagáscar"
msgctxt "CountryInfo"
msgid "Malawi"
-msgstr "Malawi"
+msgstr "Malavi"
msgctxt "CountryInfo"
msgid "Malaysia"
@@ -838,7 +818,7 @@ msgstr "Malásia"
msgctxt "CountryInfo"
msgid "Mali"
-msgstr "Malí"
+msgstr "Mali"
msgctxt "CountryInfo"
msgid "Malta"
@@ -854,7 +834,7 @@ msgstr "Mauritânia"
msgctxt "CountryInfo"
msgid "Mauritius"
-msgstr "Maurícias"
+msgstr "Maurício"
msgctxt "CountryInfo"
msgid "Micronesia"
@@ -866,7 +846,7 @@ msgstr "Moldávia"
msgctxt "CountryInfo"
msgid "Monaco"
-msgstr "Mónaco"
+msgstr "Monaco"
msgctxt "CountryInfo"
msgid "Mongolia"
@@ -918,7 +898,7 @@ msgstr "Nigéria"
msgctxt "CountryInfo"
msgid "Norway"
-msgstr "Noruega"
+msgstr "Prosseguir"
msgctxt "CountryInfo"
msgid "Oman"
@@ -942,7 +922,7 @@ msgstr "Panamá"
msgctxt "CountryInfo"
msgid "Papua New Guinea"
-msgstr "Papua-Nova Guiné"
+msgstr "Papua Nova Guiné"
msgctxt "CountryInfo"
msgid "Paraguay"
@@ -966,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"
@@ -990,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"
@@ -998,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"
@@ -1018,7 +998,7 @@ msgstr "Sérvia"
msgctxt "CountryInfo"
msgid "Seychelles"
-msgstr "Seychelles"
+msgstr "Seicheles"
msgctxt "CountryInfo"
msgid "Sierra Leone"
@@ -1026,7 +1006,7 @@ msgstr "Serra Leoa"
msgctxt "CountryInfo"
msgid "Singapore"
-msgstr "Singapura"
+msgstr "Cingapura"
msgctxt "CountryInfo"
msgid "Slovakia"
@@ -1082,7 +1062,7 @@ msgstr "Síria"
msgctxt "CountryInfo"
msgid "Tajikistan"
-msgstr "Tadjiquistão"
+msgstr "Tajiquistão"
msgctxt "CountryInfo"
msgid "Tanzania"
@@ -1106,7 +1086,7 @@ msgstr "Tonga"
msgctxt "CountryInfo"
msgid "Trinidad & Tobago"
-msgstr "Trinidad e Tobago"
+msgstr "Trinidad & Tobago"
msgctxt "CountryInfo"
msgid "Tunisia"
@@ -1118,7 +1098,7 @@ msgstr "Turquia"
msgctxt "CountryInfo"
msgid "Turkmenistan"
-msgstr "Turkmenistão"
+msgstr "Turquemenistão"
msgctxt "CountryInfo"
msgid "Tuvalu"
@@ -1134,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"
@@ -1202,7 +1182,7 @@ msgstr "Áustria"
msgctxt "CountryInfo"
msgid "Bahrain"
-msgstr "Bahrain"
+msgstr "Barém"
msgctxt "CountryInfo"
msgid "Benin"
@@ -1214,7 +1194,7 @@ msgstr "Etiópia"
msgctxt "CountryInfo"
msgid "Fiji"
-msgstr "Fidji"
+msgstr "Fiji"
msgctxt "CountryInfo"
msgid "Finland"
@@ -1282,56 +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 "CrashReportUploader"
+msgid "Sending crash report..."
+msgstr "A enviar relatório de erros..."
-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 "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)"
@@ -1339,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"
@@ -1358,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"
@@ -1389,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"
@@ -1407,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"
@@ -1451,7 +1438,7 @@ msgstr "Backspace"
msgctxt "HelpBrowser"
msgid "Forward"
-msgstr "Avançar"
+msgstr "Prosseguir"
msgctxt "HelpBrowser"
msgid "Move to next page (Shift+Backspace)"
@@ -1511,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"
@@ -1523,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:"
@@ -1543,14 +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?"
@@ -1558,13 +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:"
@@ -1608,7 +1595,7 @@ msgstr "Desconhecido"
msgctxt "LogTreeItem"
msgid "Debug"
-msgstr "Limpando erros"
+msgstr "Depurar"
msgctxt "LogTreeItem"
msgid "Info"
@@ -1616,7 +1603,7 @@ msgstr "Informação"
msgctxt "LogTreeItem"
msgid "Notice"
-msgstr "Nota"
+msgstr "Notificação"
msgctxt "LogTreeItem"
msgid "Warning"
@@ -1632,7 +1619,7 @@ msgstr "Desconhecido"
msgctxt "MainWindow"
msgid "Start Tor"
-msgstr "Iniciar Tor"
+msgstr "Iníciar Tor"
msgctxt "MainWindow"
msgid "Exit"
@@ -1644,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"
@@ -1671,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"
@@ -1752,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"
@@ -1775,6 +1730,10 @@ msgid "Connected to the Tor network!"
msgstr "Conectado à rede Tor"
msgctxt "MainWindow"
+msgid "Unrecognized startup status"
+msgstr "Estado de inicialização desconhecido"
+
+msgctxt "MainWindow"
msgid "miscellaneous"
msgstr "diversos"
@@ -1800,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"
@@ -1819,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"
@@ -1842,7 +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"
@@ -1892,29 +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"
@@ -1924,7 +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"
@@ -1934,7 +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"
@@ -1957,82 +1900,11 @@ 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."
@@ -2044,27 +1916,27 @@ msgstr "Gostaria de verificar se um novo pacote está disponível para instalaç
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"
@@ -2072,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:"
@@ -2080,52 +1952,43 @@ 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 "Bootstrapping torrc from %1 to %2"
-msgstr "Iniciando torrc de %1 para %2"
+msgstr ""
msgctxt "MainWindow"
-msgid "(probably Telnet)"
-msgstr "(provavelmente Telnet)"
+msgid "toolBar"
+msgstr ""
msgctxt "MainWindow"
-msgid "(probably an email client)"
-msgstr "(provavelmente um cliente de email)"
+msgid "Start"
+msgstr "Iniciar"
msgctxt "MainWindow"
-msgid ""
-"One of your applications %1 appears to be making a potentially unencrypted "
-"and unsafe connection to port %2."
-msgstr "Uma das suas aplicações %1 parece estar a fazer uma potencial conexão desincriptada e insegura ao porto %2"
+msgid "Stop"
+msgstr "Parar"
msgctxt "MainWindow"
-msgid "failed (%1)"
-msgstr "Falhou (%1)"
+msgid "Restart"
+msgstr "Reiniciar"
msgctxt "MainWindow"
-msgid ""
-"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."
+msgid "Reload Tor's config"
+msgstr "Recarregar configuração Tor"
msgctxt "MainWindow"
-msgid ""
-"Vidalia can't find out how to talk to Tor because it can't access this file: %1\n"
-"\n"
-"Here's the last error message:\n"
-"%2"
-msgstr ""
+msgid "Actions"
+msgstr "Acções"
msgctxt "MainWindow"
-msgid ""
-"It seems Tor has stopped running since Vidalia started it.\n"
-"\n"
-"See the Advanced Message Log for more information."
+msgid "Bootstrapping torrc from %1 to %2"
msgstr ""
msgctxt "MainWindow"
@@ -2133,14 +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 "Está actualmente a executar um retransmissor. Encerrando o seu retransmissor irá interromper qualquer conexão aberta de clientes.\n\nGostaria de encerrar graciosamente e dar tempo aos clientes para encontrar um novo retransmissor?"
+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 registo de mensagens se há mensagens de aviso ou de erro."
+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 ""
+
+msgctxt "MainWindow"
+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 email,"
+
+msgctxt "MainWindow"
+msgid ""
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
+msgstr "O seu retransmissor está a encerrar.\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 ""
msgctxt "MessageLog"
msgid "Error Setting Filter"
@@ -2148,35 +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"
@@ -2184,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:"
@@ -2196,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..."
@@ -2216,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"
@@ -2224,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"
@@ -2236,7 +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"
@@ -2244,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"
@@ -2260,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"
@@ -2276,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"
@@ -2300,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"
@@ -2312,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"
@@ -2332,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"
@@ -2340,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"
@@ -2364,7 +2259,7 @@ msgstr "Nota"
msgctxt "MessageLog"
msgid "Info"
-msgstr "Informação"
+msgstr "Info"
msgctxt "MessageLog"
msgid "Debug"
@@ -2372,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"
@@ -2388,33 +2283,25 @@ 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\nde 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 ""
@@ -2428,7 +2315,7 @@ msgid ""
"during normal Tor operation and are \n"
"not considered errors, but you may \n"
"care about."
-msgstr "Mensagens que aparecem pouco frequentemente\ndurante o funcionamento normal do Tor e não \nsão considerados erros, mas você podem\ninteressar-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 ""
@@ -2450,16 +2337,12 @@ msgid ""
msgstr "Não é possível guardar o ficheiro %1\n\n%2."
msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr "Mapa da Rede Tor"
-
-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"
@@ -2519,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"
@@ -2531,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."
@@ -2553,6 +2436,30 @@ msgctxt "NetViewer"
msgid "Ctrl+F"
msgstr "Ctrl+F"
+msgctxt "NetViewer"
+msgid "Network Map"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Relay"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Connection"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Status"
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "Invalid Bridge"
+msgstr "Bridge inválida"
+
+msgctxt "NetworkPage"
+msgid "The specified bridge identifier is not valid."
+msgstr "A bridge especificada não é válida."
+
msgctxt "NetworkPage"
msgid "Copy (Ctrl+C)"
msgstr "Copiar (Ctrl+C)"
@@ -2561,13 +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."
@@ -2649,7 +2556,7 @@ msgstr "Procurar Bridges Agora"
msgctxt "NetworkPage"
msgid "<a href=\"bridges.finding\">How else can I find bridges?</a>"
-msgstr "<a href=\"bridges.finding\">De que outra forma posso encontrar pontes?</a>"
+msgstr ""
msgctxt "NetworkPage"
msgid "<a href=\"bridges.finding\">How can I find bridges?</a>"
@@ -2667,30 +2574,30 @@ msgstr "Clique na Ajuda para ver outros métodos de localização de novas bridg
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 / HTTPS"
-msgstr "HTTP / HTTPS"
+msgid "HTTP"
+msgstr ""
msgctxt "NetworkPage"
-msgid "You must specify one or more bridges."
+msgid "HTTP / HTTPS"
msgstr ""
msgctxt "Policy"
@@ -2703,7 +2610,7 @@ msgstr "Rejeitar"
msgctxt "RouterDescriptor"
msgid "Online"
-msgstr "Activo"
+msgstr "Ativo"
msgctxt "RouterDescriptor"
msgid "Hibernating"
@@ -2711,7 +2618,7 @@ msgstr "Hibernando"
msgctxt "RouterDescriptor"
msgid "Offline"
-msgstr "Inactivo"
+msgstr "Inativo"
msgctxt "RouterDescriptorView"
msgid "Location:"
@@ -2731,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"
@@ -2747,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"
@@ -2767,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:"
@@ -2791,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"
@@ -2807,7 +2714,7 @@ msgstr "Descritor"
msgctxt "RouterListItem"
msgid "Offline"
-msgstr "Inactivo"
+msgstr "Inativo"
msgctxt "RouterListItem"
msgid "Hibernating"
@@ -2823,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"
@@ -2843,35 +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"
+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"
@@ -2891,19 +2798,19 @@ 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"
@@ -2911,7 +2818,7 @@ msgstr "Porta em que utilizadores e outros retransmissores podem se comunicar co
msgctxt "ServerPage"
msgid "Nickname:"
-msgstr "Alcunha:"
+msgstr "Apelido:"
msgctxt "ServerPage"
msgid "Basic Settings"
@@ -2921,7 +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"
@@ -2949,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"
@@ -2973,7 +2880,7 @@ 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 ""
@@ -2991,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"
@@ -2999,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"
@@ -3007,7 +2914,7 @@ 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"
@@ -3046,7 +2953,7 @@ 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"
@@ -3054,16 +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"
@@ -3077,21 +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"
@@ -3103,22 +3010,22 @@ 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 for the Tor network (exit relay)"
+msgid "Relay traffic inside the Tor network (non-exit relay)"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic inside the Tor network (non-exit relay)"
+msgid "Relay traffic for the Tor network (exit relay)"
msgstr ""
msgctxt "ServerPage"
@@ -3133,7 +3040,7 @@ msgstr "Endereço de email através do qual você pode ser contactado\nse ocorre
msgctxt "ServicePage"
msgid "Error while trying to unpublish all services"
-msgstr "Erro quando tentava retirar todos os serviços"
+msgstr ""
msgctxt "ServicePage"
msgid ""
@@ -3147,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"
@@ -3163,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"
@@ -3175,7 +3078,7 @@ msgstr "Serviços Ocultos Prestados"
msgctxt "ServicePage"
msgid "Onion Address"
-msgstr "Morada na Cebola"
+msgstr ""
msgctxt "ServicePage"
msgid "Virtual Port"
@@ -3191,7 +3094,7 @@ msgstr "Caminho da Pasta"
msgctxt "ServicePage"
msgid "Enabled"
-msgstr "Permitido"
+msgstr "Permitir"
msgctxt "ServicePage"
msgid "Add new service to list"
@@ -3203,7 +3106,7 @@ msgstr "Remover o serviço seleccionado da lista"
msgctxt "ServicePage"
msgid "Copy onion address of selected service to clipboard"
-msgstr "Copiar para o clipboard o endereço 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"
@@ -3215,26 +3118,26 @@ 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 ""
"Click \"Start Tor\" in the Vidalia Control Panel to restart the Tor "
"software. If Tor exited unexpectedly, select the \"Advanced\" tab above for "
"details about any errors encountered."
-msgstr "Prima \"Iniciar Tor\" no painel de controlo do Vidalia para reiniciar o software Tor. Se o Tor desligar inesperadamente, seleccione a aba \"Avançado\" para detalhes acerca de quaisquer erros encontrados. "
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
@@ -3242,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 "Está actualmente a correr a versão \"%1\" do software Tor, que já não é recomendada. Por favor melhore para a versão mais recente do software, que pode conter melhoramentos importantes de segurança, fiabilidade e desempenho."
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
@@ -3250,31 +3153,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 "Está actualmente a correr a versão \"%1\" do software Tor, que pode já não funcionar na actual rede Tor. Por favor melhore para a versão mais recente do software, que pode conter melhoramentos importantes de segurança, fiabilidade e desempenho."
+msgstr ""
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."
+msgstr ""
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"
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
@@ -3282,7 +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 atrasado %1 segundos comparado com a fonte \"%2\". Se o seu relógio não está correcto, o Tor não poderá funcionar. Por favor verifique se o seu computador tem a hora correcta."
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
@@ -3290,11 +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 adiantado %1 segundos comparado com a fonte \"%2\". Se o seu relógio não está correcto, o Tor não poderá funcionar. Por favor verifique se o seu computador tem a hora correcta."
+msgstr ""
msgctxt "StatusEventWidget"
msgid "Your Computer's Clock is Potentially Incorrect"
-msgstr "O relógio do seu computador está potencialmente incorrecto."
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
@@ -3302,18 +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 "Uma das aplicações do seu computador pode ter tentado fazer uma ligação não encriptada através do Tor pela porta %1. Enviar informação não encriptada através da rede Tor é perigoso e não recomendado. Para sua protecção, o Tor fechou automaticamente esta ligação."
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
"One of the applications on your computer may have attempted to make an "
"unencrypted connection through Tor to port %1. Sending unencrypted "
"information over the Tor network is dangerous and not recommended."
-msgstr "Uma das aplicações do seu computador pode ter tentado fazer uma ligação não encriptada através do Tor pela porta %1. Enviar informação não encriptada através da rede Tor é perigoso e não recomendado."
+msgstr ""
msgctxt "StatusEventWidget"
msgid "Potentially Dangerous Connection!"
-msgstr "Ligação potencialmente perigosa!"
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
@@ -3321,81 +3224,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 "Uma das suas aplicações estabeleceu uma ligação através do Tor para \"%1\" usando um protocolo que pode verter informação acerca do seu destino. Por favor configure as suas aplicações para usar apenas SOCKS4a ou SOCKS5 com resolução remota de nome de hospedeiro. "
+msgstr ""
msgctxt "StatusEventWidget"
msgid "Unknown SOCKS Protocol"
-msgstr "Protocolo SOCKS desconhecido"
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
"One of your applications tried to establish a connection through Tor using a"
" protocol that Tor does not understand. Please ensure you configure your "
"applications to use only SOCKS4a or SOCKS5 with remote hostname resolution."
-msgstr "Uma das suas aplicações tentou estabelecer uma ligação através do Tor usando um protocolo que não é reconhecidor. Por favor configure as suas aplicações para usar apenas SOCKS4a ou SOCKS5 com resolução remota de nome de hospedeiro. "
+msgstr ""
msgctxt "StatusEventWidget"
msgid "Invalid Destination Hostname"
-msgstr "Nome de Hospedeiro de destino inválido"
+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 "Uma das suas aplicações estabeleceu uma ligação através do Tor para \"%1\", que o Tor não reconhece como nome de hospedeiro válido. Por favor verifique a configuração das suas aplicações."
+msgstr ""
msgctxt "StatusEventWidget"
msgid "External IP Address Changed"
-msgstr "O endereço de IP externo mudou"
+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 "O Tor determinou que o IP público do seu retransmissor é actualmente %1%2. Se isto não for correcto, por favor considere usar a opção ?Endereço? na configuração do seu retransmissor."
+msgstr ""
msgctxt "StatusEventWidget"
msgid "DNS Hijacking Detected"
-msgstr "Rapto de DNS detectado"
+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 "O Tor detectou que o seu fornecedor de DNS está a dar respostas falsas para domínios que não existem. Alguns ISPs e outros fornecedores de DNS, como o OpenDNS, são conhecidos por isto para poderem mostrar as suas próprias procuras ou páginas de anúncios."
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
"Tor detected that your DNS provider is providing false responses for well "
"known domains. Since clients rely on Tor network relays to provide accurate "
"DNS repsonses, your relay will not be configured as an exit relay."
-msgstr "Tor detectou que o seu fornecedor de DNS está a dar respostas falsas para domínios bem conhecidos. Uma vez que os clientes confiam nos retransmissores da rede Tor para fornecer respostas DNS precisas, o seu retransmissor não será configurado como um retransmissor de saída."
+msgstr ""
msgctxt "StatusEventWidget"
msgid "Checking Server Port Reachability"
-msgstr "Verificando a acessibilidade da Porta do Servidor"
+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 está tentando determinar se o porto do relay está acessível a partir da rede do Tor, ligando-se a ele próprio em %1:%2. Este teste pode demorar vários minutos."
+msgstr ""
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!"
+msgstr ""
msgctxt "StatusEventWidget"
msgid "Server Port Reachability Test Failed"
-msgstr "Teste de acessibilidade da porta do servidor falhou"
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
@@ -3403,30 +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 "A porta de servidor do seu retransmissor não é acessível por outros clientes Tor. Isto pode acontecer se tiver um router ou uma firewall que requeira uma porta de redireccionamento. Se %1:%2 não é o seu IP e porta de servidor correctopor favor verifique a configuraçaõ do seu retransmissor."
+msgstr ""
msgctxt "StatusEventWidget"
msgid "Checking Directory Port Reachability"
-msgstr "Verificando a acessibilidade do directório de portas"
+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 "O Tor está a tentar determinar se o directório de portas do seu retransmissor é acessível pela rede Tor, ligando-se a si em %1:%2. Este teste pode deorar vários minutos."
+msgstr ""
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!"
+msgstr ""
msgctxt "StatusEventWidget"
msgid "Directory Port Reachability Test Failed"
-msgstr "Teste de acessibilidade do directório de portas falhou"
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
@@ -3434,21 +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 "O directório de portas do seu retransmissor não é acessível por outros clientes Tor. Isto pode acontecer se tiver um router ou uma firewall que requeira uma porta de redireccionamento. Se %1:%2 não é o seu IP e porta de servidor correctopor favor verifique a configuraçaõ do seu retransmissor."
+msgstr ""
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"
+msgstr ""
msgctxt "StatusEventWidget"
msgid "Your Relay is Online"
-msgstr "O seu retransmissor esá online"
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
@@ -3456,7 +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 os clientes Tor usarem. Deverá notar um aumento no tráfego de rede mostrado no Gráfico de Largura de Banda dentro de algumas horas, à medida que mais clientes saibam do seu retransmissor. Obrigado por contribuir para a rede Tor."
+msgstr ""
+
+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"
@@ -3468,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"
@@ -3480,7 +3399,7 @@ msgstr "Falhou"
msgctxt "Stream"
msgid "Closed"
-msgstr "Fechado"
+msgstr "Desconectado"
msgctxt "Stream"
msgid "Retrying"
@@ -3494,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]"
@@ -3512,65 +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."
+msgstr ""
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"
+msgstr ""
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"
@@ -3578,11 +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 "
+msgstr ""
msgctxt "UPNPControl"
msgid "WSAStartup failed"
@@ -3606,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!"
@@ -3632,7 +3581,7 @@ 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 ""
@@ -3682,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"
@@ -3694,11 +3643,19 @@ msgstr "Os seguintes pacotes de softwares actualizados estão prontos para insta
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"
@@ -3726,7 +3683,7 @@ msgstr "Tentar Novamente"
msgctxt "VMessageBox"
msgid "Show Log"
-msgstr "Mostrar o Registo"
+msgstr "Mostrar o Log"
msgctxt "VMessageBox"
msgid "Show Settings"
@@ -3762,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."
@@ -3770,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"
@@ -3790,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:"
@@ -3802,18 +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\nGostaria 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"
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 061fc85..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:
-# 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-14 09:47+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"
@@ -203,7 +199,9 @@ msgctxt "QFileDialog"
msgid ""
"%1 already exists.\n"
"Do you want to replace it?"
-msgstr "%1 já existe.\nVocê deseja sobrescrevê-lo?"
+msgstr ""
+"%1 já existe.\n"
+"Você deseja sobrescrevê-lo?"
#: qfiledialog.cpp:1690
msgctxt "QFileDialog"
@@ -211,12 +209,15 @@ msgid ""
"%1\n"
"File not found.\n"
"Please verify the correct file name was given."
-msgstr "%1\nArquivo não encontrado.\nPor favor verifique se o nome do arquivo foi correctamente introduzido."
+msgstr ""
+"%1\n"
+"Arquivo não encontrado.\n"
+"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"
@@ -226,7 +227,7 @@ msgstr "&Renomear"
#: qfiledialog.cpp:463
msgctxt "QFileDialog"
msgid "&Delete"
-msgstr "&Apagar"
+msgstr "&Deletar"
#: qfiledialog.cpp:464
msgctxt "QFileDialog"
@@ -241,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"
@@ -261,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"
@@ -269,24 +270,29 @@ msgid ""
"%1\n"
"Directory not found.\n"
"Please verify the correct directory name was given."
-msgstr "%1\nDirectório não encontrado.\nPor favor verifique se o nome do directório foi corretamente introduzido."
+msgstr ""
+"%1\n"
+"Diretório não encontrado.\n"
+"Por favor verifique se o nome do diretório foi corretamente informado."
#: qfiledialog.cpp:2281
msgctxt "QFileDialog"
msgid ""
"'%1' is write protected.\n"
"Do you want to delete it anyway?"
-msgstr "'%1' é protegido contra cópia.\nVocê quer realmente apagá-lo ?"
+msgstr ""
+"'%1' é protegido contra cópia.\n"
+"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"
@@ -296,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"
@@ -316,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"
@@ -356,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"
@@ -373,7 +379,9 @@ msgctxt "QFileSystemModel"
msgid ""
"<b>The name \"%1\" can not be used.</b><p>Try using another name, with fewer"
" characters or no punctuations marks."
-msgstr "<b>O nome \"%1\" não pode ser usado.</b><p>Tente um nome com menos caracteres ou sem pontuação."
+msgstr ""
+"<b>O nome \"%1\" não pode ser usado.</b><p>Tente um nome com menos letras ou"
+" sem pontuação."
#: qfilesystemmodel.cpp:832
msgctxt "QFileSystemModel"
@@ -388,7 +396,7 @@ msgstr "Tamanho"
#: qfilesystemmodel.cpp:838
msgctxt "QFileSystemModel"
msgid "Kind"
-msgstr "Tipo"
+msgstr ""
#: qfilesystemmodel.cpp:840
msgctxt "QFileSystemModel"
@@ -403,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"
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 739ca81..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,18 +1,14 @@
#
# Translators:
-# <amimyself at live.co.uk>, 2011.
-# daniel <>, 2012.
-# Erick de Oliveira Leal <>, 2012.
+# n3t0 <>, 2012.
# runasand <runa.sandvik at gmail.com>, 2011.
-# Sérgio <theparish2 at yahoo.com>, 2012.
-# <viniciusandrade at estadao.com.br>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2012-03-21 17:52+0000\n"
-"PO-Revision-Date: 2012-04-30 15:27+0000\n"
-"Last-Translator: Erick de Oliveira Leal <>\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"
@@ -84,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:"
@@ -144,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)"
@@ -156,65 +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"
-
-msgctxt "AdvancedPage"
-msgid ""
-"You've checked the autoconfiguration option for the ControlPort, but "
-"provided no Data Directory. Please add one, or uncheck the \"Configure "
-"ControlPort automatically\" option."
-msgstr "Você marcou a opção de configuração automática para o ControlPort, mas não forneceu qualquer diretório de dados. Por favor, adicione um ou desmarque a opção \"Configurar ControlPort automaticamente\"."
+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\nPode 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,24 +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"
-
-msgctxt "AppearancePage"
-msgid ""
-"System Icon Preferences (changes will take effect when you restart Vidalia)"
-msgstr "System Icon Preferences (as alterações terão efeito quando você reiniciar Vidalia)"
-
-msgctxt "AppearancePage"
-msgid "Show the Tray Icon and Dock Icon (default)"
-msgstr "Mostre o Tray Icon e Dock Icon (padrão)"
-
-msgctxt "AppearancePage"
-msgid "Hide the Tray Icon"
-msgstr "Esconda o Tray Icon"
-
-msgctxt "AppearancePage"
-msgid "Hide the Dock Icon"
-msgstr "Esconda o Dock Icon"
+msgstr "Vidalia foi incapaz de carregar a tradução selecionada"
msgctxt "BandwidthGraph"
msgid "Since:"
@@ -266,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"
@@ -309,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"
@@ -347,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"
@@ -371,7 +339,7 @@ msgstr "Montando"
msgctxt "Circuit"
msgid "Failed"
-msgstr "Falha"
+msgstr "Falhou"
msgctxt "Circuit"
msgid "Closed"
@@ -415,7 +383,7 @@ msgstr "Rede"
msgctxt "ConfigDialog"
msgid "Sharing"
-msgstr "Compartilhamento"
+msgstr "Compartilhando"
msgctxt "ConfigDialog"
msgid "Services"
@@ -439,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"
@@ -447,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"
@@ -455,25 +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."
@@ -489,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"
@@ -505,7 +482,7 @@ msgstr "Angola"
msgctxt "CountryInfo"
msgid "Antigua & Barbuda"
-msgstr "Antígua e Barbuda"
+msgstr "Antígua & Barbuda"
msgctxt "CountryInfo"
msgid "Argentina"
@@ -553,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"
@@ -601,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"
@@ -621,7 +598,7 @@ msgstr "Colômbia"
msgctxt "CountryInfo"
msgid "Comoros"
-msgstr "Comores"
+msgstr "Ilhas Comores"
msgctxt "CountryInfo"
msgid "Congo, The Democratic Republic of the"
@@ -653,7 +630,7 @@ msgstr "Chipre"
msgctxt "CountryInfo"
msgid "Czech Republic"
-msgstr "República Tcheca"
+msgstr "República do Cazaquistão"
msgctxt "CountryInfo"
msgid "Denmark"
@@ -661,7 +638,7 @@ msgstr "Dinamarca"
msgctxt "CountryInfo"
msgid "Djibouti"
-msgstr "Djibuti"
+msgstr "Djibouti"
msgctxt "CountryInfo"
msgid "Dominica"
@@ -709,7 +686,7 @@ msgstr "Gâmbia"
msgctxt "CountryInfo"
msgid "Georgia"
-msgstr "Geórgia"
+msgstr "Georgia"
msgctxt "CountryInfo"
msgid "Germany"
@@ -773,7 +750,7 @@ msgstr "Jordânia"
msgctxt "CountryInfo"
msgid "Kazakhstan"
-msgstr "Cazaquistão"
+msgstr "Casaquistão"
msgctxt "CountryInfo"
msgid "Kenya"
@@ -833,7 +810,7 @@ msgstr "Madagascar"
msgctxt "CountryInfo"
msgid "Malawi"
-msgstr "Malavi"
+msgstr "Malauí"
msgctxt "CountryInfo"
msgid "Malaysia"
@@ -841,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"
@@ -853,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"
@@ -865,7 +842,7 @@ msgstr "Micronésia"
msgctxt "CountryInfo"
msgid "Moldova"
-msgstr "República da Moldávia"
+msgstr "Moldávia"
msgctxt "CountryInfo"
msgid "Monaco"
@@ -889,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"
@@ -913,7 +890,7 @@ msgstr "Nicarágua"
msgctxt "CountryInfo"
msgid "Niger"
-msgstr "Níger"
+msgstr "Niger"
msgctxt "CountryInfo"
msgid "Nigeria"
@@ -933,7 +910,7 @@ msgstr "Paquistão"
msgctxt "CountryInfo"
msgid "Palau"
-msgstr "República de Palau"
+msgstr "Palau"
msgctxt "CountryInfo"
msgid "Palestine"
@@ -945,7 +922,7 @@ msgstr "Panamá"
msgctxt "CountryInfo"
msgid "Papua New Guinea"
-msgstr "Papua-Nova Guiné"
+msgstr "Papua Nova Guiné"
msgctxt "CountryInfo"
msgid "Paraguay"
@@ -957,7 +934,7 @@ msgstr "Peru"
msgctxt "CountryInfo"
msgid "Philippines"
-msgstr "República das Filipinas"
+msgstr "Filipinas"
msgctxt "CountryInfo"
msgid "Poland"
@@ -969,7 +946,7 @@ msgstr "Portugal"
msgctxt "CountryInfo"
msgid "Qatar"
-msgstr "Catar"
+msgstr "Quatar"
msgctxt "CountryInfo"
msgid "Romania"
@@ -985,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"
@@ -993,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"
@@ -1001,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"
@@ -1021,7 +998,7 @@ msgstr "Sérvia"
msgctxt "CountryInfo"
msgid "Seychelles"
-msgstr "Seychelles"
+msgstr "Seichelles"
msgctxt "CountryInfo"
msgid "Sierra Leone"
@@ -1041,7 +1018,7 @@ msgstr "Eslovênia"
msgctxt "CountryInfo"
msgid "Solomon Islands"
-msgstr "Ilhas Salomão"
+msgstr "Ilhas Solomon"
msgctxt "CountryInfo"
msgid "Somalia"
@@ -1085,7 +1062,7 @@ msgstr "Síria"
msgctxt "CountryInfo"
msgid "Tajikistan"
-msgstr "Tajiquistão"
+msgstr "Tajaquistão"
msgctxt "CountryInfo"
msgid "Tanzania"
@@ -1097,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"
@@ -1109,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"
@@ -1121,7 +1098,7 @@ msgstr "Turquia"
msgctxt "CountryInfo"
msgid "Turkmenistan"
-msgstr "Turkmenistan"
+msgstr "Turcomenistão"
msgctxt "CountryInfo"
msgid "Tuvalu"
@@ -1173,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"
@@ -1201,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"
@@ -1261,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"
@@ -1281,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"
@@ -1289,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"
@@ -1305,36 +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."
-
-msgctxt "CrashReportDialog"
-msgid "Please fill a ticket in:"
-msgstr "Por favor, preencha um tiquete em:"
+msgstr "Nós estamos impossibilitados de reiniciar o Vidalia automaticamente. Por favor, reinicie o Vidalia manualmente"
-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 "Conectando..."
-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)"
@@ -1361,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"
@@ -1382,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"
@@ -1410,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."
@@ -1542,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"
@@ -1553,7 +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?"
@@ -1567,11 +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,7 +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"
@@ -1735,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"
@@ -1767,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"
@@ -1775,7 +1727,11 @@ 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"
+msgstr "Estado de inicio não reconhecido"
msgctxt "MainWindow"
msgid "miscellaneous"
@@ -1815,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"
@@ -1908,18 +1860,6 @@ msgid ""
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"
-
-msgctxt "MainWindow"
msgid "Tor Update Available"
msgstr "Atualização disponível para o Tor"
@@ -1960,104 +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"
@@ -2067,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. "
-
-msgctxt "MainWindow"
-msgid "Bootstrapping torrc from %1 to %2"
-msgstr "Inicialização do torrc %1 de %2"
+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 "(probably Telnet)"
-msgstr "(provavelmente Telnet)"
+msgid "toolBar"
+msgstr "Barra de Ferramentas"
msgctxt "MainWindow"
-msgid "(probably an email client)"
-msgstr "(provavelmente um cliente de e-mail)"
+msgid "Start"
+msgstr "Iniciar"
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"
+msgid "Stop"
+msgstr "Parar"
msgctxt "MainWindow"
-msgid "failed (%1)"
-msgstr "falha (%1)"
+msgid "Restart"
+msgstr "Reiniciar"
msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
-msgstr "Seu condutor está sendo fechado.\nClique em 'Parar' denovo para parar o seu condutor agora."
+msgid "Reload Tor's config"
+msgstr "Recarregar configuração do Tor"
msgctxt "MainWindow"
-msgid ""
-"Vidalia can't find out how to talk to Tor because it can't access this file: %1\n"
-"\n"
-"Here's the last error message:\n"
-"%2"
-msgstr "Vidalia não pode comunicar com Tor porque não pode acessar o arquivo: %1\n\nAqui está a última mensagem de erro:\n%2"
+msgid "Actions"
+msgstr "Ações"
msgctxt "MainWindow"
-msgid ""
-"It seems Tor has stopped running since Vidalia started it.\n"
-"\n"
-"See the Advanced Message Log for more information."
-msgstr "Parece que Tor parou de funcionar desde que Vidalia começou.\n\nVeja o log de mensagens avançada para mais informações."
+msgid "Bootstrapping torrc from %1 to %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\nVocê 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\nPor 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 ""
+"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 "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 ""
+"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"
@@ -2398,32 +2290,24 @@ 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 ""
@@ -2431,30 +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"
@@ -2534,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"
@@ -2546,16 +2426,40 @@ 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"
+
+msgctxt "NetworkPage"
+msgid "The specified bridge identifier is not valid."
+msgstr "A ponte especificada é invalida."
+
msgctxt "NetworkPage"
msgid "Copy (Ctrl+C)"
msgstr "Copiar (Ctrl+C)"
@@ -2648,25 +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:"
@@ -2678,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"
@@ -2689,12 +2593,12 @@ msgid "SOCKS 5"
msgstr "SOCKS 5"
msgctxt "NetworkPage"
-msgid "HTTP / HTTPS"
-msgstr "HTTP / HTTPS"
+msgid "HTTP"
+msgstr "HTTP"
msgctxt "NetworkPage"
-msgid "You must specify one or more bridges."
-msgstr "Você precisa especificar uma ou mais pontes."
+msgid "HTTP / HTTPS"
+msgstr "HTTP / HTTPS"
msgctxt "Policy"
msgid "accept"
@@ -2750,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"
@@ -2762,7 +2666,7 @@ msgstr "Desconhecido"
msgctxt "RouterInfoDialog"
msgid "Relay Details"
-msgstr "Detalhes do condutor"
+msgstr "Detalhes da Retransmissão"
msgctxt "RouterInfoDialog"
msgid "Summary"
@@ -2782,7 +2686,7 @@ msgstr "Localização:"
msgctxt "RouterInfoDialog"
msgid "IP Address:"
-msgstr "Endereço IP:"
+msgstr "IP:"
msgctxt "RouterInfoDialog"
msgid "Platform:"
@@ -2790,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:"
@@ -2806,7 +2710,7 @@ msgstr "Última atualização:"
msgctxt "RouterInfoDialog"
msgid "Descriptor"
-msgstr "Descritor de arquivo"
+msgstr "Descritor:"
msgctxt "RouterListItem"
msgid "Offline"
@@ -3070,69 +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 for the Tor network (exit relay)"
-msgstr "Relé para o tráfego da rede Tor (relé de saída)"
+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 inside the Tor network (non-exit relay)"
-msgstr "Tráfego de Retransmissão de dentro da rede Tor (não-saída de relé)"
+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"
@@ -3169,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"
@@ -3218,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"
@@ -3226,18 +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 ""
@@ -3245,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 "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 ""
@@ -3253,11 +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"
@@ -3267,17 +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 ""
@@ -3285,7 +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 ""
@@ -3293,11 +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 ""
@@ -3305,14 +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!"
@@ -3324,7 +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"
@@ -3335,70 +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 ""
@@ -3406,30 +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 ""
@@ -3437,21 +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 ""
@@ -3459,7 +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"
@@ -3497,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]"
@@ -3515,17 +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"
@@ -3549,19 +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\""
@@ -3573,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"
@@ -3635,13 +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..."
@@ -3653,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"
@@ -3669,7 +3615,7 @@ msgstr "OK"
msgctxt "UpdateProgressDialog"
msgid "Software Updates"
-msgstr "Atualizações do programa"
+msgstr "Atualizações"
msgctxt "UpdateProgressDialog"
msgid "Checking for updates..."
@@ -3681,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"
@@ -3693,7 +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"
@@ -3703,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"
@@ -3796,31 +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\nVocê 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"
@@ -3848,4 +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 2f0764b..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:
-# 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"
@@ -201,7 +199,9 @@ msgctxt "QFileDialog"
msgid ""
"%1 already exists.\n"
"Do you want to replace it?"
-msgstr "%1 există deja.\nDoriţi să-l înlocuiţi?"
+msgstr ""
+"%1 există deja.\n"
+"Doriţi să-l înlocuiţi?"
#: qfiledialog.cpp:1690
msgctxt "QFileDialog"
@@ -209,7 +209,10 @@ msgid ""
"%1\n"
"File not found.\n"
"Please verify the correct file name was given."
-msgstr "%1\nFişierul nu a fost găsit.\nVerificaţi numele fişierului şi încercaţi din nou."
+msgstr ""
+"%1\n"
+"Fişierul nu a fost găsit.\n"
+"Verificaţi numele fişierului şi încercaţi din nou."
#: qdirmodel.cpp:833
msgctxt "QFileDialog"
@@ -267,14 +270,19 @@ msgid ""
"%1\n"
"Directory not found.\n"
"Please verify the correct directory name was given."
-msgstr "%1\nDirectorul nu a fost găsit.\nVerificaţi numele directorului şi încercaţi din nou."
+msgstr ""
+"%1\n"
+"Directorul nu a fost găsit.\n"
+"Verificaţi numele directorului şi încercaţi din nou."
#: qfiledialog.cpp:2281
msgctxt "QFileDialog"
msgid ""
"'%1' is write protected.\n"
"Do you want to delete it anyway?"
-msgstr "'%1' e protejat la scriere.\nDoriţi să-l ştergeţi oricum?"
+msgstr ""
+"'%1' e protejat la scriere.\n"
+"Doriţi să-l ştergeţi oricum?"
#: qfiledialog.cpp:2286
msgctxt "QFileDialog"
@@ -371,7 +379,9 @@ msgctxt "QFileSystemModel"
msgid ""
"<b>The name \"%1\" can not be used.</b><p>Try using another name, with fewer"
" characters or no punctuations marks."
-msgstr "<b>Numele \"%1\" nu poate fi folosit.</b><p>Folosiţi alt nume, cu mai puţine litere or sau fără semne de punctuaţie."
+msgstr ""
+"<b>Numele \"%1\" nu poate fi folosit.</b><p>Folosiţi alt nume, cu mai puţine"
+" litere or sau fără semne de punctuaţie."
#: qfilesystemmodel.cpp:832
msgctxt "QFileSystemModel"
diff --git a/src/vidalia/i18n/po/ro/vidalia_ro.po b/src/vidalia/i18n/po/ro/vidalia_ro.po
index f7ba506..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: 2012-03-21 17:52+0000\n"
-"PO-Revision-Date: 2012-03-22 08:51+0000\n"
-"Last-Translator: Florin Putura <puturaflorin at yahoo.com>\n"
+"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:"
@@ -141,78 +154,13 @@ 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 ""
-"You've checked the autoconfiguration option for the ControlPort, but "
-"provided no Data Directory. Please add one, or uncheck the \"Configure "
-"ControlPort automatically\" option."
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid ""
-"Vidalia was unable to remove the Tor service.\n"
+msgid "Vidalia was unable to remove the Tor service.\n"
"\n"
"You may need to remove it manually."
-msgstr "Vidalia nu poate șterge serviciul Tor.\n\nVa trebui să-l ștergeți în mod manual. "
+msgstr ""
+"Vidalia nu poate șterge serviciul Tor.\n"
+"\n"
+"Va trebui să-l ștergeți în mod manual. "
msgctxt "AppearancePage"
msgid "Language"
@@ -234,23 +182,6 @@ msgctxt "AppearancePage"
msgid "Vidalia was unable to load the selected language translation."
msgstr "Vidalia nu a putut încărca traducerea în limba selectată."
-msgctxt "AppearancePage"
-msgid ""
-"System Icon Preferences (changes will take effect when you restart Vidalia)"
-msgstr ""
-
-msgctxt "AppearancePage"
-msgid "Show the Tray Icon and Dock Icon (default)"
-msgstr ""
-
-msgctxt "AppearancePage"
-msgid "Hide the Tray Icon"
-msgstr ""
-
-msgctxt "AppearancePage"
-msgid "Hide the Dock Icon"
-msgstr ""
-
msgctxt "BandwidthGraph"
msgid "Since:"
msgstr "Se contorizează din:"
@@ -269,7 +200,7 @@ msgstr "Statistici trafic Tor"
msgctxt "BandwidthGraph"
msgid "Reset"
-msgstr "Iniţializare"
+msgstr "Reiniţializare"
msgctxt "BandwidthGraph"
msgid "Receive Rate"
@@ -289,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"
@@ -309,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..."
@@ -317,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..."
@@ -468,10 +399,10 @@ 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:"
-msgstr "Vidalia s-a conectat la un proces Tor,care necesită o parolă. Vă rugăm să introduceţi parola de control:"
+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:"
msgctxt "ControlSocket"
msgid "Control socket is not connected."
@@ -1186,10 +1117,6 @@ msgid "Zimbabwe"
msgstr "Zimbabwe"
msgctxt "CountryInfo"
-msgid "Zaire"
-msgstr "Zair"
-
-msgctxt "CountryInfo"
msgid "Albania"
msgstr "Albania"
@@ -1285,55 +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)"
@@ -1351,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"
@@ -1547,10 +1429,7 @@ 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."
+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"
@@ -1562,9 +1441,7 @@ 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."
+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"
@@ -1607,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"
@@ -1776,6 +1629,10 @@ msgid "Connected to the Tor network!"
msgstr "Conectare efectuată cu succes!"
msgctxt "MainWindow"
+msgid "Unrecognized startup status"
+msgstr "Stare necunoscută la pornire"
+
+msgctxt "MainWindow"
msgid "miscellaneous"
msgstr "diverse"
@@ -1840,9 +1697,7 @@ 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."
+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"
@@ -1878,9 +1733,7 @@ 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."
+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"
@@ -1900,9 +1753,7 @@ 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."
+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"
@@ -1922,9 +1773,7 @@ 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."
+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"
@@ -1932,9 +1781,7 @@ 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"
@@ -1963,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"
@@ -2026,21 +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."
+msgid "Vidalia tried to reset Tor's control 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"
@@ -2048,9 +1889,11 @@ msgid "Potentially Unsafe Connection"
msgstr "Conexiune potenţial nesigură"
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 "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"
@@ -2062,9 +1905,7 @@ 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."
+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"
@@ -2080,68 +1921,62 @@ 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 ""
+msgid "failed (%1)"
+msgstr "Nu a reuşit (%1)"
msgctxt "MainWindow"
-msgid "Bootstrapping torrc from %1 to %2"
+msgid "Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
msgstr ""
+"Releu dvs. se închide \\ n.Faceţi clic pe \"Stop\" din nou pentru a opri releu "
+"acum."
msgctxt "MainWindow"
-msgid "(probably Telnet)"
+msgid "You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"\n"
+"Would you like to shutdown gracefully and give clients time to find a new relay?"
msgstr ""
+"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 "(probably an email client)"
+msgid "Vidalia detected that the Tor software exited unexpectedly.\n"
+"\n"
+"Please check the message log for recent warning or error messages."
msgstr ""
+"Vidalia a detecetat că programul Tor s-a oprit neasteptat.\n"
+"\n"
+"Te rog verifică mesajele pentru o avertizare sau o eroare."
msgctxt "MainWindow"
-msgid ""
-"One of your applications %1 appears to be making a potentially unencrypted "
-"and unsafe connection to port %2."
-msgstr ""
+msgid ", probably Telnet,"
+msgstr ", probabil Telnet,"
msgctxt "MainWindow"
-msgid "failed (%1)"
-msgstr "Nu a reuşit (%1)"
+msgid ", probably an email client,"
+msgstr ", probabil un client de email,"
msgctxt "MainWindow"
-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."
+msgid "Vidalia"
+msgstr "Vidalia"
msgctxt "MainWindow"
-msgid ""
-"Vidalia can't find out how to talk to Tor because it can't access this file: %1\n"
-"\n"
-"Here's the last error message:\n"
-"%2"
-msgstr ""
+msgid "File"
+msgstr "Fişier"
msgctxt "MainWindow"
-msgid ""
-"It seems Tor has stopped running since Vidalia started it.\n"
-"\n"
-"See the Advanced Message Log for more information."
-msgstr ""
+msgid "About Vidalia"
+msgstr "Despre Vidalia"
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 "Tu deja rulezi un releu.Oprirea releului va intrerupe orice conexiune intre clientii.\n\nDoriţi să opriti si sa dati clientilor timp sa gaseasca alt releu?"
+msgid "Home"
+msgstr "Pagina de start"
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 detecetat că programul Tor s-a oprit neasteptat.\n\nTe rog verifică mesajele pentru o avertizare sau o eroare."
+msgid "Check For Updates"
+msgstr "Verifică pentru actualizări"
msgctxt "MessageLog"
msgid "Error Setting Filter"
@@ -2384,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"
@@ -2396,59 +2235,52 @@ 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."
+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."
+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."
-msgstr "Mesajele care apar frecvent \nîn timpul funcţionării normale a lui Tor şi \nnu sunt considerate erori, dar s-ar putea \nsă vă pasă."
+msgstr ""
+"Mesajele care apar frecvent \n"
+"în timpul funcţionării normale a lui Tor şi \n"
+"nu sunt considerate erori, dar s-ar putea \n"
+"să vă pasă."
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."
+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 \nprezintă interes pentru dezvoltatorea Tor."
+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 ""
+"Nu se poate scrie fişierul %1\n"
"\n"
"%2."
-msgstr "Nu se poate scrie fişierul %1\n\n%2."
msgctxt "NetViewer"
msgid "Tor Network Map"
@@ -2555,19 +2387,23 @@ msgid "Ctrl+F"
msgstr "Ctrl+F"
msgctxt "NetworkPage"
+msgid "Invalid Bridge"
+msgstr "Bridge invalid"
+
+msgctxt "NetworkPage"
+msgid "The specified bridge identifier is not valid."
+msgstr "Identificatorul specificat al bridge-ului nu este valid."
+
+msgctxt "NetworkPage"
msgid "Copy (Ctrl+C)"
msgstr "Copiază (Ctrl+C)"
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 "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."
+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"
@@ -2587,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:"
@@ -2619,9 +2463,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 "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"
@@ -2633,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ă"
@@ -2657,43 +2507,15 @@ 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."
-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."
+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."
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 / HTTPS"
-msgstr "HTTP / HTTPS"
-
-msgctxt "NetworkPage"
-msgid "You must specify one or more bridges."
-msgstr ""
-
msgctxt "Policy"
msgid "accept"
msgstr "acceptă"
@@ -2847,15 +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."
+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"
@@ -2871,6 +2689,10 @@ msgid "Run as a client only"
msgstr "Rulează doar ca şi client."
msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network"
+msgstr "Contribuie la reţeaua Tor acţionând ca un relay pentru trafic"
+
+msgctxt "ServerPage"
msgid "Relay Port:"
msgstr "Portul relay-ului:"
@@ -2919,9 +2741,7 @@ 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."
+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"
@@ -2977,9 +2797,7 @@ 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."
+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"
@@ -3039,14 +2857,11 @@ 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."
+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"
@@ -3058,8 +2873,7 @@ 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:"
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 "Aceasta este identitatea relay-ului dumneavoastră pe care o puteţi folosi în comunicarea cu alţii"
msgctxt "ServerPage"
@@ -3075,9 +2889,7 @@ 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."
+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"
@@ -3089,9 +2901,7 @@ 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ă."
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 a returnat un răspuns formatat necorespunzător când Vidalia a cerut istoricul de folosire a bridge-ului dumneavoastră."
msgctxt "ServerPage"
@@ -3107,39 +2917,23 @@ 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 "Relay traffic for the Tor network (exit relay)"
-msgstr ""
-
-msgctxt "ServerPage"
-msgid "Relay traffic inside the Tor network (non-exit relay)"
-msgstr ""
-
-msgctxt "ServerPage"
msgid "Mirror the Relay Directory"
msgstr "Reflecta Directorul cu Relay-ul"
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 \nproblema cu releu dumneavoastră. S-ar putea include, de asemenea amprentă PGP sau GPG."
+msgstr ""
+"Adresa de email la care aţi putea fi contactat dacă există o \n"
+"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."
+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"
@@ -3214,251 +3008,6 @@ 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"
@@ -3511,68 +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"
@@ -3630,16 +3117,14 @@ 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'."
+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."
-msgstr "Vidalia nu a putut verifica dacă există actualizăzi pentru software-ul actual deoarece procesul de actualizare Tor s-a inchis neaşteptat."
+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."
msgctxt "UpdateProgressDialog"
msgid "Checking for available updates..."
@@ -3794,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:"
@@ -3810,11 +3291,15 @@ 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.\nDoriţi să continuaţi deschiderea Vidalia?"
+msgstr ""
+"Un alt proces Vidalia este, probabil, ca deja să ruleze.Dacă există într-"
+"adevăr nu este un alt proces Vidalia care rulează, puteţi alege să continue "
+"oricum \n"
+".\n"
+"Doriţi să continuaţi deschiderea Vidalia?"
msgctxt "stringutil.h"
msgid "%1 secs"
diff --git a/src/vidalia/i18n/po/ru/qt_ru.po b/src/vidalia/i18n/po/ru/qt_ru.po
index 489073d..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:
-# 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/language/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
@@ -202,7 +199,9 @@ msgctxt "QFileDialog"
msgid ""
"%1 already exists.\n"
"Do you want to replace it?"
-msgstr "%1 уже существует.\nЗаменить?"
+msgstr ""
+"%1 уже существует.\n"
+"Заменить?"
#: qfiledialog.cpp:1690
msgctxt "QFileDialog"
@@ -210,7 +209,10 @@ msgid ""
"%1\n"
"File not found.\n"
"Please verify the correct file name was given."
-msgstr "%1\nФайл не найден.\nПожалуйста, проверьте правильность имени и пути."
+msgstr ""
+"%1\n"
+"Файл не найден.\n"
+"Пожалуйста, проверьте правильность имени и пути."
#: qdirmodel.cpp:833
msgctxt "QFileDialog"
@@ -268,14 +270,19 @@ msgid ""
"%1\n"
"Directory not found.\n"
"Please verify the correct directory name was given."
-msgstr "%1\nДиректория не найдена.\n Пожалуйста, проверьте правильность имени и пути."
+msgstr ""
+"%1\n"
+"Директория не найдена.\n"
+" Пожалуйста, проверьте правильность имени и пути."
#: qfiledialog.cpp:2281
msgctxt "QFileDialog"
msgid ""
"'%1' is write protected.\n"
"Do you want to delete it anyway?"
-msgstr "'%1' защищён от записи.\nВсе равно удалить?"
+msgstr ""
+"'%1' защищён от записи.\n"
+"Все равно удалить?"
#: qfiledialog.cpp:2286
msgctxt "QFileDialog"
@@ -372,7 +379,9 @@ msgctxt "QFileSystemModel"
msgid ""
"<b>The name \"%1\" can not be used.</b><p>Try using another name, with fewer"
" characters or no punctuations marks."
-msgstr "<b>Нельзя использовать \"%1\" в качестве имени.</b><p>Выберите другое, без знаков препинания или с меньшим числом символов."
+msgstr ""
+"<b>Нельзя использовать \"%1\" в качестве имени.</b><p>Выберите другое, без "
+"знаков препинания или с меньшим числом символов."
#: qfilesystemmodel.cpp:832
msgctxt "QFileSystemModel"
diff --git a/src/vidalia/i18n/po/ru/vidalia_ru.po b/src/vidalia/i18n/po/ru/vidalia_ru.po
index 8d267df..f1cb879 100644
--- a/src/vidalia/i18n/po/ru/vidalia_ru.po
+++ b/src/vidalia/i18n/po/ru/vidalia_ru.po
@@ -2,13 +2,14 @@
# 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: 2012-03-21 17:52+0000\n"
-"PO-Revision-Date: 2012-03-28 17:35+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/language/ru/)\n"
"MIME-Version: 1.0\n"
@@ -196,17 +197,6 @@ msgid "Select a file to use for Tor socket path"
msgstr "Выберите файл для использования для пути сокета Tor"
msgctxt "AdvancedPage"
-msgid "Configure ControlPort automatically"
-msgstr "Настроить ControlPort автоматически"
-
-msgctxt "AdvancedPage"
-msgid ""
-"You've checked the autoconfiguration option for the ControlPort, but "
-"provided no Data Directory. Please add one, or uncheck the \"Configure "
-"ControlPort automatically\" option."
-msgstr "Вы выбрали опцию автоматической конфигурации ControlPort, но не задали Директорию Данных. Пожалуйста, добавьте одну или снимите опцию \"Настроить ControlPort автоматически\"."
-
-msgctxt "AdvancedPage"
msgid ""
"Vidalia was unable to remove the Tor service.\n"
"\n"
@@ -233,23 +223,6 @@ msgctxt "AppearancePage"
msgid "Vidalia was unable to load the selected language translation."
msgstr "Hе удалось загрузить выбранный язык перевода."
-msgctxt "AppearancePage"
-msgid ""
-"System Icon Preferences (changes will take effect when you restart Vidalia)"
-msgstr "Настройки Системных Иконок (для принятия изменений перезапустите Vidalia)"
-
-msgctxt "AppearancePage"
-msgid "Show the Tray Icon and Dock Icon (default)"
-msgstr "Отображать Иконку в Трее и Иконку Панели (по умолчанию)"
-
-msgctxt "AppearancePage"
-msgid "Hide the Tray Icon"
-msgstr "Скрыть Иконку в Трее"
-
-msgctxt "AppearancePage"
-msgid "Hide the Dock Icon"
-msgstr "Скрыть Иконку Панели"
-
msgctxt "BandwidthGraph"
msgid "Since:"
msgstr "Со времени:"
@@ -263,10 +236,6 @@ msgid "Show Settings"
msgstr "Показать настройки"
msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr "Tor трафик"
-
-msgctxt "BandwidthGraph"
msgid "Reset"
msgstr "Сброс"
@@ -306,6 +275,10 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr "Отменить"
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr "График трафика"
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr "Начинаем HTTPS-запрос мостa ..."
@@ -404,7 +377,7 @@ msgstr "Закрыть Поток (Del)"
msgctxt "ConfigDialog"
msgid "General"
-msgstr "Общие"
+msgstr "General"
msgctxt "ConfigDialog"
msgid "Network"
@@ -459,18 +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."
@@ -1293,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"
@@ -1310,28 +1310,17 @@ msgid ""
"manually."
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)"
@@ -1358,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"
@@ -1389,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 КБ/с"
@@ -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 "Ошибка при запуске веб-браузера"
@@ -1775,6 +1732,10 @@ msgid "Connected to the Tor network!"
msgstr "Подключен к сети Tor!"
msgctxt "MainWindow"
+msgid "Unrecognized startup status"
+msgstr "Нераспознанный статус запуска"
+
+msgctxt "MainWindow"
msgid "miscellaneous"
msgstr "pазное"
@@ -1819,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"
@@ -1905,18 +1862,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 доступно"
@@ -1957,82 +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 устарела или не рекомендуется."
@@ -2080,53 +1954,44 @@ 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, если это возможно."
msgctxt "MainWindow"
-msgid "Bootstrapping torrc from %1 to %2"
-msgstr "Начальная загрузка Tor от %1 до %2"
+msgid "toolBar"
+msgstr "toolBar"
msgctxt "MainWindow"
-msgid "(probably Telnet)"
-msgstr "(вероятно Telnet)"
+msgid "Start"
+msgstr "Старт"
msgctxt "MainWindow"
-msgid "(probably an email client)"
-msgstr "(вероятно email клиент)"
+msgid "Stop"
+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."
+msgid "Restart"
+msgstr "Перезапустить"
msgctxt "MainWindow"
-msgid "failed (%1)"
-msgstr "не удалось (%1)"
+msgid "Reload Tor's config"
+msgstr "Перезагрузить конфигурацию Tor"
msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
-msgstr "Ваш ретранслятор выключается.\nНажмите \"Стоп\" для немедленной остановки вашего ретранслятора."
+msgid "Actions"
+msgstr "Действия"
msgctxt "MainWindow"
-msgid ""
-"Vidalia can't find out how to talk to Tor because it can't access this file: %1\n"
-"\n"
-"Here's the last error message:\n"
-"%2"
-msgstr "Vidalia не может найти способ взаимодействовать с Tor, потому что не имеет доступ к следующему файлу: %1\n\nПоследнее сообщение об ошибке:\n%2"
-
-msgctxt "MainWindow"
-msgid ""
-"It seems Tor has stopped running since Vidalia started it.\n"
-"\n"
-"See the Advanced Message Log for more information."
-msgstr "Похоже Tor завершил свою работу после того, как его запустил Vidalia.\n\nДополнительную информацию смотрите в Расширенном Логе Сообщений."
+msgid "Bootstrapping torrc from %1 to %2"
+msgstr "Начальная загрузка Tor от %1 до %2"
msgctxt "MainWindow"
msgid ""
@@ -2142,6 +2007,38 @@ msgid ""
"Please check the message log for recent warning or error messages."
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,"
+
+msgctxt "MainWindow"
+msgid ", probably an email client,"
+msgstr ", вероятно, клиент электронной почты,"
+
+msgctxt "MainWindow"
+msgid ""
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
+msgstr "Ваш ретранслятор выключается.\nНажмите \"Стоп\" для немедленной остановки вашего ретранслятора."
+
+msgctxt "MainWindow"
+msgid "Error reloading configuration"
+msgstr "Ошибка перезагрузки конфигурации"
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to reload Tor's configuration."
+msgstr "Vidalia не смогла перезагрузить конфигурацию Tor"
+
msgctxt "MessageLog"
msgid "Error Setting Filter"
msgstr "Ошибка при установке фильтра"
@@ -2395,22 +2292,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 "toolbar"
+
+msgctxt "MessageLog"
msgid ""
"Messages that appear when something has \n"
"gone very wrong and Tor cannot proceed."
@@ -2450,10 +2339,6 @@ msgid ""
msgstr "Невозможно записать файл %1 %2."
msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr "Карта сети Tor"
-
-msgctxt "NetViewer"
msgid "Refresh"
msgstr "Обновить"
@@ -2553,6 +2438,30 @@ 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 "Неверный мост"
+
+msgctxt "NetworkPage"
+msgid "The specified bridge identifier is not valid."
+msgstr "Указанный идентификатор моста не действителен."
+
msgctxt "NetworkPage"
msgid "Copy (Ctrl+C)"
msgstr "Копировать (Ctrl+C)"
@@ -2686,12 +2595,12 @@ msgid "SOCKS 5"
msgstr "SOCKS 5"
msgctxt "NetworkPage"
-msgid "HTTP / HTTPS"
-msgstr "HTTP / HTTPS"
+msgid "HTTP"
+msgstr "HTTP"
msgctxt "NetworkPage"
-msgid "You must specify one or more bridges."
-msgstr "Необходимо задать один или несколько мостов."
+msgid "HTTP / HTTPS"
+msgstr "HTTP / HTTPS"
msgctxt "Policy"
msgid "accept"
@@ -3114,14 +3023,14 @@ msgid "Automatically distribute my bridge address"
msgstr "Автоматически распространять адрес моего моста"
msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network (exit relay)"
-msgstr "Ретранслировать трафик сети Tor (выходной ретранслятор)"
-
-msgctxt "ServerPage"
msgid "Relay traffic inside the Tor network (non-exit relay)"
msgstr "Ретранслировать трафик внутри сети Tor (невыходной ретранслятор)"
msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network (exit relay)"
+msgstr "Ретранслировать трафик для сети Tor (выходной ретранслятор)"
+
+msgctxt "ServerPage"
msgid "Mirror the Relay Directory"
msgstr "Зеркалировать каталог ретрансляторов"
@@ -3166,10 +3075,6 @@ msgid "Directory already in use by another service."
msgstr "Каталог уже используется другой службой."
msgctxt "ServicePage"
-msgid "Form"
-msgstr "Форма"
-
-msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr "Предоставленный скрытый сервис"
@@ -3458,6 +3363,22 @@ msgid ""
" the Tor network!"
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"
msgstr "Создать"
@@ -3494,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]"
@@ -3572,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 "Успех"
@@ -3700,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 "ОК"
@@ -3793,10 +3752,6 @@ msgid "Unable to open log file '%1': %2"
msgstr "Невозможно открыть файл журнала \n%1': %2"
msgctxt "Vidalia"
-msgid "Value required for parameter :"
-msgstr "Требуется задать значение параметра:"
-
-msgctxt "Vidalia"
msgid "Invalid language code specified:"
msgstr "Указан неверный код языка:"
diff --git a/src/vidalia/i18n/po/sco/qt_sco.po b/src/vidalia/i18n/po/sco/qt_sco.po
index 605f52d..43c449a 100644
--- a/src/vidalia/i18n/po/sco/qt_sco.po
+++ b/src/vidalia/i18n/po/sco/qt_sco.po
@@ -1,11 +1,10 @@
#
-# Translators:
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-08-20 03:25+0000\n"
-"PO-Revision-Date: 2010-12-05 19:59+0000\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"
@@ -431,5 +430,3 @@ msgstr ""
msgctxt "QFileSystemModel"
msgid "%1 bytes"
msgstr ""
-
-
diff --git a/src/vidalia/i18n/po/sco/vidalia_sco.po b/src/vidalia/i18n/po/sco/vidalia_sco.po
index 1918f2a..0a76d76 100644
--- a/src/vidalia/i18n/po/sco/vidalia_sco.po
+++ b/src/vidalia/i18n/po/sco/vidalia_sco.po
@@ -1,11 +1,10 @@
#
-# Translators:
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-09-07 14:40+0000\n"
-"PO-Revision-Date: 2010-12-05 20:03+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"
@@ -193,10 +192,6 @@ 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"
@@ -236,10 +231,6 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr ""
-
-msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -279,6 +270,10 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr ""
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -432,17 +427,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"
@@ -1266,44 +1270,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"
@@ -1331,10 +1342,6 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr ""
-
-msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1362,6 +1369,10 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr ""
+
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1644,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 ""
@@ -1680,10 +1663,6 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1796,10 +1775,6 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1882,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 ""
@@ -1934,82 +1897,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 ""
@@ -2057,19 +1949,39 @@ 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)"
+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"
@@ -2091,17 +2003,35 @@ msgid ""
msgstr ""
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"
@@ -2357,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"
@@ -2412,10 +2334,6 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2515,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 ""
@@ -2840,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 ""
@@ -3088,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 ""
@@ -3132,10 +3070,6 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
-msgid "Form"
-msgstr ""
-
-msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3424,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 ""
@@ -3460,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 ""
@@ -3538,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 ""
@@ -3666,6 +3646,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 ""
@@ -3759,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 ""
@@ -3812,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 16c01e9..b17eb0b 100644
--- a/src/vidalia/i18n/po/sk/qt_sk.po
+++ b/src/vidalia/i18n/po/sk/qt_sk.po
@@ -1,14 +1,11 @@
-# Translators:
-# Translators:
-# <koloman375 at gmail.com>, 2012.
-# <martin.strucel at gmail.com>, 2012.
+#
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-08-20 03:25+0000\n"
-"PO-Revision-Date: 2012-03-01 18:33+0000\n"
-"Last-Translator: K0L0M4N <koloman375 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"
@@ -20,189 +17,189 @@ 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"
msgid ""
"%1 already exists.\n"
"Do you want to replace it?"
-msgstr "%1 už existuje.\nChcete ho nahradiť?"
+msgstr ""
#: qfiledialog.cpp:1690
msgctxt "QFileDialog"
@@ -210,57 +207,57 @@ msgid ""
"%1\n"
"File not found.\n"
"Please verify the correct file name was given."
-msgstr "%1\nSúbor nebol nájdený.\nOverte či ste zadali správny názov súboru."
+msgstr ""
#: qdirmodel.cpp:833
msgctxt "QFileDialog"
msgid "My Computer"
-msgstr "Tento počítač"
+msgstr ""
#: qfiledialog.cpp:462
msgctxt "QFileDialog"
msgid "&Rename"
-msgstr "&Premenovať"
+msgstr ""
#: qfiledialog.cpp:463
msgctxt "QFileDialog"
msgid "&Delete"
-msgstr "&Zmazať"
+msgstr ""
#: qfiledialog.cpp:464
msgctxt "QFileDialog"
msgid "Show &hidden files"
-msgstr "Zobraziť &skryté 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"
@@ -268,168 +265,168 @@ msgid ""
"%1\n"
"Directory not found.\n"
"Please verify the correct directory name was given."
-msgstr "%1\nPriečinok nebol nájdený.\nOverte či ste zadali správny názov priečinku."
+msgstr ""
#: qfiledialog.cpp:2281
msgctxt "QFileDialog"
msgid ""
"'%1' is write protected.\n"
"Do you want to delete it anyway?"
-msgstr "'%1' je chránený proti zápisu.\nChcete ho aj napriek tomu odstrániť?"
+msgstr ""
#: qfiledialog.cpp:2286
msgctxt "QFileDialog"
msgid "Are sure you want to delete '%1'?"
-msgstr "Naozaj chcete odstrániť '%1'?"
+msgstr ""
#: qfiledialog.cpp:2299
msgctxt "QFileDialog"
msgid "Could not delete directory."
-msgstr "Priečinok sa nedá odstrániť."
+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ý priečinok"
+msgstr ""
#: qfiledialog.cpp:917
msgctxt "QFileDialog"
msgid "&Choose"
-msgstr "&Zvoliť"
+msgstr ""
#: qsidebar.cpp:388
msgctxt "QFileDialog"
msgid "Remove"
-msgstr "Odstrániť"
+msgstr ""
#: qfiledialog.cpp:886
msgctxt "QFileDialog"
msgid "File &name:"
-msgstr "Názov &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"
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ť meno s menej znakmi alebo bez interpunkcie."
+msgstr ""
#: 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 bajt"
+msgstr ""
diff --git a/src/vidalia/i18n/po/sk/vidalia_sk.po b/src/vidalia/i18n/po/sk/vidalia_sk.po
index e92f8c6..4466296 100644
--- a/src/vidalia/i18n/po/sk/vidalia_sk.po
+++ b/src/vidalia/i18n/po/sk/vidalia_sk.po
@@ -1,27 +1,21 @@
-#
-# Translators:
-# <eduard.zanony at gmail.com>, 2012.
-# <koloman375 at gmail.com>, 2012.
-# <martin.strucel at gmail.com>, 2012.
-# runasand <runa.sandvik at gmail.com>, 2011.
msgid ""
msgstr ""
-"Project-Id-Version: The Tor Project\n"
-"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2012-03-21 17:52+0000\n"
-"PO-Revision-Date: 2012-04-21 12:37+0000\n"
-"Last-Translator: eduardzanony <eduard.zanony at gmail.com>\n"
-"Language-Team: translations at vidalia-project.net\n"
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: translations at vidalia-project.net\n"
+"POT-Creation-Date: 2009-05-19 23:56+0000\n"
+"PO-Revision-Date: 2010-09-09 18:22+0200\n"
+"Last-Translator: Peter <peter_gasper at post.sk>\n"
+"Language-Team: LANGUAGE <LL at li.org>\n"
+"Language: sk\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: sk\n"
-"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n"
-"X-Generator: Vidalia ts2po 0.2\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+"X-Generator: Pootle 2.0.5\n"
msgctxt "AboutDialog"
msgid "About Vidalia"
-msgstr "O Vidalia"
+msgstr "O projekte Vidalia"
msgctxt "AboutDialog"
msgid "License"
@@ -39,14 +33,29 @@ msgctxt "AboutDialog"
msgid "Qt 4.4.2"
msgstr "Qt 4.4.2"
+msgctxt "AboutDialog"
+msgid "Vidalia"
+msgstr "Vidalia"
+
+msgctxt "AboutDialog"
+msgid "Tor"
+msgstr "Tor"
+
+msgctxt "AboutDialog"
+msgid "Qt"
+msgstr "Qt"
+
+msgctxt "AboutDialog"
+msgid "version"
+msgstr "verzia"
+
msgctxt "AdvancedPage"
msgid "'%1' is not a valid IP address."
msgstr "'%1' nie je správna IP adresa."
msgctxt "AdvancedPage"
-msgid ""
-"You selected 'Password' authentication, but did not specify a password."
-msgstr "Zvolili ste autentifikáciu 'Heslom', ale heslo ste nezadali."
+msgid "You selected 'Password' authentication, but did not specify a password."
+msgstr "Zvolili ste autentifikáciu heslom, heslo ste však nezadali."
msgctxt "AdvancedPage"
msgid "Select Tor Configuration File"
@@ -58,7 +67,7 @@ msgstr "Súbor sa nenašiel"
msgctxt "AdvancedPage"
msgid "%1 does not exist. Would you like to create it?"
-msgstr "%1 neexistuje. Prajete si ho vytvoriť?"
+msgstr "%1 neexistuje. Prajete si vytvoriť?"
msgctxt "AdvancedPage"
msgid "Failed to Create File"
@@ -70,7 +79,7 @@ msgstr "Nepodarilo sa vytvoriť %1 [%2]"
msgctxt "AdvancedPage"
msgid "Select a Directory to Use for Tor Data"
-msgstr "Zvolte zložku pre dáta Tor"
+msgstr "Zvolte zložku použitú pre Tor data"
msgctxt "AdvancedPage"
msgid "Unable to remove Tor Service"
@@ -85,6 +94,10 @@ msgid "Vidalia was unable to install the Tor service."
msgstr "Vidalia nemohla nainštalovať službu Tor"
msgctxt "AdvancedPage"
+msgid "Control Port"
+msgstr "Kontrolný port"
+
+msgctxt "AdvancedPage"
msgid "Authentication:"
msgstr "Autentifikácia:"
@@ -126,93 +139,28 @@ msgstr "Zvolte cestu pre váš konfiguračný súbor"
msgctxt "AdvancedPage"
msgid "Browse"
-msgstr "Hľadať"
+msgstr "Prechádzať"
msgctxt "AdvancedPage"
msgid "Data Directory"
-msgstr "Priečinok s dátami"
+msgstr "Zložka Data"
msgctxt "AdvancedPage"
msgid "Store data for the Tor software in the following directory"
-msgstr "V nasledujúcom priečinku sa budú ukladať dáta pre softvér Tor"
+msgstr "Ukladať data pre Tor software v nasledujúcej zložke"
msgctxt "AdvancedPage"
msgid "Select the directory used to store data for the Tor software"
-msgstr "Vyberte priečinok, do ktorého sa budú ukladať dáta pre softvér Tor"
-
-msgctxt "AdvancedPage"
-msgid "Tor Control"
-msgstr "Tor ovládanie"
-
-msgctxt "AdvancedPage"
-msgid "Use TCP connection (ControlPort)"
-msgstr "Použit pripojenie TCP (ControlPort)"
-
-msgctxt "AdvancedPage"
-msgid "Path:"
-msgstr "Cesta:"
-
-msgctxt "AdvancedPage"
-msgid "Use Unix domain socket (ControlSocket)"
-msgstr "Použiť soket Unixovej domény (ControlSocket)"
-
-msgctxt "AdvancedPage"
-msgid "Edit current torrc"
-msgstr "Upraviť aktuálny torrc"
-
-msgctxt "AdvancedPage"
-msgid "NOTE: this will edit the currently loaded torrc"
-msgstr "Poznámka: toto upraví aktuálne načítaný torrc"
-
-msgctxt "AdvancedPage"
-msgid "ControlSocket path doesn't exist."
-msgstr "Cesta pre ControlSocket neexistuje."
-
-msgctxt "AdvancedPage"
-msgid ""
-"The specified Tor configuration file location contains characters that "
-"cannot be represented in your system's current 8-bit character encoding."
-msgstr "Špecifikovaný konfiguračný Tor súbor obsahuje znaky, ktoré sa nedajú vyjadriť v súčasnom systéme 8-bitového kódovania."
-
-msgctxt "AdvancedPage"
-msgid ""
-"The specified Tor data directory location contains characters that cannot be"
-" represented in your system's current 8-bit character encoding."
-msgstr "Špecifikovaný Tor adresár pre dáta obsahuje znaky, ktoré sa nedajú vyjadriť v súčastnom systéme 8-bitového kódovania."
-
-msgctxt "AdvancedPage"
-msgid "Warning"
-msgstr "Varovanie"
-
-msgctxt "AdvancedPage"
-msgid "You changed torrc path, would you like to restart Tor?"
-msgstr "Zmenili ste cestu pre torrc, chcete reštartovať Tor?"
-
-msgctxt "AdvancedPage"
-msgid "Tor Configuration File (torrc);;All Files (*)"
-msgstr "Konfiguračný súbor (torrc);;Všetky súbory (*)"
-
-msgctxt "AdvancedPage"
-msgid "Select a file to use for Tor socket path"
-msgstr "Vyberte súbor, ktorý sa použije pre Tor socket cestu"
-
-msgctxt "AdvancedPage"
-msgid "Configure ControlPort automatically"
-msgstr "Nastaviť ControlPort automaticky"
+msgstr "Zvolte zložku používanú pre Tor software"
msgctxt "AdvancedPage"
-msgid ""
-"You've checked the autoconfiguration option for the ControlPort, but "
-"provided no Data Directory. Please add one, or uncheck the \"Configure "
-"ControlPort automatically\" option."
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid ""
-"Vidalia was unable to remove the Tor service.\n"
+msgid "Vidalia was unable to remove the Tor service.\n"
"\n"
"You may need to remove it manually."
-msgstr "Vidalia nemohla odstrániť službu Tor.\n\nBudete ju musieť odstrániť ručne."
+msgstr ""
+"Vidalia nemohla vymazať službu Tor.\n"
+"\n"
+"Budete ju musieť ručne."
msgctxt "AppearancePage"
msgid "Language"
@@ -220,7 +168,7 @@ msgstr "Jazyk"
msgctxt "AppearancePage"
msgid "Choose the language used in Vidalia"
-msgstr "Vyberte jazyk, ktorý sa použije vo Vidalia"
+msgstr "Zvolte jazyk používaný pre Vidalia"
msgctxt "AppearancePage"
msgid "Style"
@@ -228,28 +176,11 @@ msgstr "Štýl"
msgctxt "AppearancePage"
msgid "Choose Vidalia's interface style"
-msgstr "Vyberte vzhľad rozhrania Vidalia"
+msgstr "Zvolte štýl pre Vidalia interface"
msgctxt "AppearancePage"
msgid "Vidalia was unable to load the selected language translation."
-msgstr "Vidalia nenačítala zvolený jazyk."
-
-msgctxt "AppearancePage"
-msgid ""
-"System Icon Preferences (changes will take effect when you restart Vidalia)"
-msgstr ""
-
-msgctxt "AppearancePage"
-msgid "Show the Tray Icon and Dock Icon (default)"
-msgstr ""
-
-msgctxt "AppearancePage"
-msgid "Hide the Tray Icon"
-msgstr ""
-
-msgctxt "AppearancePage"
-msgid "Hide the Dock Icon"
-msgstr ""
+msgstr "Vidalia nemohla načítať zvolený jazyk."
msgctxt "BandwidthGraph"
msgid "Since:"
@@ -257,7 +188,7 @@ msgstr "Od:"
msgctxt "BandwidthGraph"
msgid "Hide Settings"
-msgstr "Skryť nastavenia"
+msgstr "Skryté nastavenia"
msgctxt "BandwidthGraph"
msgid "Show Settings"
@@ -285,11 +216,11 @@ msgstr "Vždy na vrchu"
msgctxt "BandwidthGraph"
msgid "Style"
-msgstr "Vzhľad"
+msgstr "Štýl"
msgctxt "BandwidthGraph"
msgid "Changes the transparency of the Bandwidth Graph"
-msgstr "Zmeniť priehľadnosť grafu šírky pásma"
+msgstr "Zmeniť priehľadnosť grafu"
msgctxt "BandwidthGraph"
msgid "100"
@@ -297,7 +228,7 @@ msgstr "100"
msgctxt "BandwidthGraph"
msgid "% Opaque"
-msgstr "% Nepriehľadnosť"
+msgstr "% Nepriehľadný"
msgctxt "BandwidthGraph"
msgid "Save"
@@ -309,7 +240,7 @@ msgstr "Ukončiť"
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
-msgstr "Posiela sa žiadosť o HTTPS premostenie..."
+msgstr "Posiela sa dotaz pre HTTPS premostenie..."
msgctxt "BridgeDownloader"
msgid "Connecting to %1:%2..."
@@ -317,11 +248,11 @@ msgstr "Pripájanie na %1:%2..."
msgctxt "BridgeDownloader"
msgid "Sending an HTTPS request for bridges..."
-msgstr "Posiela sa HTTPS žiadosť na premostenia..."
+msgstr "Posiela sa HTTPS dotaz na premostenia..."
msgctxt "BridgeDownloader"
msgid "Downloading a list of bridges..."
-msgstr "Sťahuje sa zoznam premostení..."
+msgstr "Sťahuje sa list premostení..."
msgctxt "BridgeDownloaderProgressDialog"
msgid "Downloading Bridges"
@@ -333,7 +264,7 @@ msgstr "Premostenia sa nepodarilo stiahnuť: %1"
msgctxt "BridgeDownloaderProgressDialog"
msgid "Retrying bridge request..."
-msgstr "Opakujem žiadosť o premostenie..."
+msgstr "Opakujem dotaz na premostenie..."
msgctxt "BridgeUsageDialog"
msgid "Country"
@@ -341,11 +272,11 @@ msgstr "Krajina"
msgctxt "BridgeUsageDialog"
msgid "# Clients"
-msgstr "# Klienti"
+msgstr "# Klientov"
msgctxt "BridgeUsageDialog"
msgid "Clients from the following countries have used your relay since %1"
-msgstr "Klienti z nasledujúcich krajín využívali vaše relé od %1"
+msgstr "Klienti z týchto krajín využívajúci vaše relé %1"
msgctxt "BridgeUsageDialog"
msgid "Bridge Usage Summary"
@@ -389,7 +320,7 @@ msgstr "Spojenie"
msgctxt "CircuitListWidget"
msgid "Status"
-msgstr "Stav"
+msgstr "Status"
msgctxt "CircuitListWidget"
msgid "Zoom to Circuit"
@@ -433,7 +364,7 @@ msgstr "Pomoc"
msgctxt "ConfigDialog"
msgid "Error Saving Settings"
-msgstr "Nastala chyba pri ukladaní nastavení"
+msgstr "Chyba pri ukladaní nastavení"
msgctxt "ConfigDialog"
msgid "Vidalia was unable to save your %1 settings."
@@ -441,7 +372,7 @@ msgstr "Vidalia nemôže uložiť vaše %1 nastavenia."
msgctxt "ConfigDialog"
msgid "Error Applying Settings"
-msgstr "Nastala chyba pri použití nastavenia"
+msgstr "Chyba pri použití nastavení"
msgctxt "ConfigDialog"
msgid "Vidalia was unable to apply your %1 settings to Tor."
@@ -468,1579 +399,1487 @@ msgid "Remember my password"
msgstr "Zapamätať si moje heslo"
msgctxt "ControlPasswordInputDialog"
-msgid ""
-"Vidalia has connected to a running Tor process that requires a password. "
-"Please enter your control password:"
-msgstr "Vidalia je pripojený k prevádzke Tora, ale proces si vyžaduje heslo. Prosím, zadajte svoje heslo:"
+msgid "Vidalia has connected to a running Tor process that requires a password. Please enter your control password:"
+msgstr ""
msgctxt "ControlSocket"
msgid "Control socket is not connected."
-msgstr "Riadiaci soket nie je pripojený."
+msgstr ""
msgctxt "ControlSocket"
msgid "Error sending control command. [%1]"
-msgstr "Nastala chyba pri odosielaní príkazu. [%1]"
+msgstr ""
msgctxt "ControlSocket"
msgid "Socket disconnected while attempting to read a line of data."
-msgstr "Soket bol odpojený pri pokuse o načítanie riadku dát."
+msgstr ""
msgctxt "ControlSocket"
msgid "Invalid control reply. [%1]"
-msgstr "Neplatná riadiaca odpoveď. [%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 a Barbuda"
+msgstr ""
msgctxt "CountryInfo"
msgid "Argentina"
-msgstr "Argentína"
+msgstr ""
msgctxt "CountryInfo"
msgid "Armenia"
-msgstr "Arménsko"
+msgstr ""
msgctxt "CountryInfo"
msgid "Australia"
-msgstr "Austrália"
+msgstr ""
msgctxt "CountryInfo"
msgid "Azerbaijan"
-msgstr "Azerbajdžan"
+msgstr ""
msgctxt "CountryInfo"
msgid "Bahamas"
-msgstr "Bahamy"
+msgstr ""
msgctxt "CountryInfo"
msgid "Bangladesh"
-msgstr "Bangladéš"
+msgstr ""
msgctxt "CountryInfo"
msgid "Barbados"
-msgstr "Barbados"
+msgstr ""
msgctxt "CountryInfo"
msgid "Belarus"
-msgstr "Bielorusko"
+msgstr ""
msgctxt "CountryInfo"
msgid "Belgium"
-msgstr "Belgicko"
+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 "Bosna a Hercegovina"
+msgstr ""
msgctxt "CountryInfo"
msgid "Botswana"
-msgstr "Botswana"
+msgstr ""
msgctxt "CountryInfo"
msgid "Brazil"
-msgstr "Brazília"
+msgstr ""
msgctxt "CountryInfo"
msgid "Brunei Darussalam"
-msgstr "Brunej"
+msgstr ""
msgctxt "CountryInfo"
msgid "Bulgaria"
-msgstr "Bulharsko"
+msgstr ""
msgctxt "CountryInfo"
msgid "Burkina Faso"
-msgstr "Burkina Faso"
+msgstr ""
msgctxt "CountryInfo"
msgid "Burundi"
-msgstr "Burundi"
+msgstr ""
msgctxt "CountryInfo"
msgid "Cambodia"
-msgstr "Kambodža"
+msgstr ""
msgctxt "CountryInfo"
msgid "Cameroon"
-msgstr "Kamerun"
+msgstr ""
msgctxt "CountryInfo"
msgid "Canada"
-msgstr "Kanada"
+msgstr ""
msgctxt "CountryInfo"
msgid "Cape Verde"
-msgstr "Kapverdy"
+msgstr ""
msgctxt "CountryInfo"
msgid "Central African Republic"
-msgstr "Stredoafrická republika"
+msgstr ""
msgctxt "CountryInfo"
msgid "Chad"
-msgstr "Čad"
+msgstr ""
msgctxt "CountryInfo"
msgid "Chile"
-msgstr "Čile"
+msgstr ""
msgctxt "CountryInfo"
msgid "China"
-msgstr "Čína"
+msgstr ""
msgctxt "CountryInfo"
msgid "Colombia"
-msgstr "Kolumbia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Comoros"
-msgstr "Komory"
+msgstr ""
msgctxt "CountryInfo"
msgid "Congo, The Democratic Republic of the"
-msgstr "Kongo, Demokratická Republika"
+msgstr ""
msgctxt "CountryInfo"
msgid "Congo"
-msgstr "Kongo"
+msgstr ""
msgctxt "CountryInfo"
msgid "Costa Rica"
-msgstr "Kostarika"
+msgstr ""
msgctxt "CountryInfo"
msgid "Cote d’Ivoire"
-msgstr "Pobrežie Slonoviny"
+msgstr ""
msgctxt "CountryInfo"
msgid "Croatia"
-msgstr "Chorvátsko"
+msgstr ""
msgctxt "CountryInfo"
msgid "Cuba"
-msgstr "Kuba"
+msgstr ""
msgctxt "CountryInfo"
msgid "Cyprus"
-msgstr "Cyprus"
+msgstr ""
msgctxt "CountryInfo"
msgid "Czech Republic"
-msgstr "Česká Republika"
+msgstr ""
msgctxt "CountryInfo"
msgid "Denmark"
-msgstr "Dánsko"
+msgstr ""
msgctxt "CountryInfo"
msgid "Djibouti"
-msgstr "Džibutsko"
+msgstr ""
msgctxt "CountryInfo"
msgid "Dominica"
-msgstr "Dominika"
+msgstr ""
msgctxt "CountryInfo"
msgid "Dominican Republic"
-msgstr "Dominikánska Republika"
+msgstr ""
msgctxt "CountryInfo"
msgid "Ecuador"
-msgstr "Ekvádor"
+msgstr ""
msgctxt "CountryInfo"
msgid "Egypt"
-msgstr "Egypt"
+msgstr ""
msgctxt "CountryInfo"
msgid "El Salvador"
-msgstr "Salvador"
+msgstr ""
msgctxt "CountryInfo"
msgid "Equatorial Guinea"
-msgstr "Rovníková Guinea"
+msgstr ""
msgctxt "CountryInfo"
msgid "Eritrea"
-msgstr "Eritrea"
+msgstr ""
msgctxt "CountryInfo"
msgid "Estonia"
-msgstr "Estónsko"
+msgstr ""
msgctxt "CountryInfo"
msgid "France"
-msgstr "Francúzsko"
+msgstr ""
msgctxt "CountryInfo"
msgid "Gabon"
-msgstr "Gabon"
+msgstr ""
msgctxt "CountryInfo"
msgid "Gambia"
-msgstr "Gambia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Georgia"
-msgstr "Gruzínsko"
+msgstr ""
msgctxt "CountryInfo"
msgid "Germany"
-msgstr "Nemecko"
+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 "Izrael"
+msgstr ""
msgctxt "CountryInfo"
msgid "Italy"
-msgstr "Taliansko"
+msgstr ""
msgctxt "CountryInfo"
msgid "Jamaica"
-msgstr "Jamajka"
+msgstr ""
msgctxt "CountryInfo"
msgid "Japan"
-msgstr "Japonsko"
+msgstr ""
msgctxt "CountryInfo"
msgid "Jordan"
-msgstr "Jordánsko"
+msgstr ""
msgctxt "CountryInfo"
msgid "Kazakhstan"
-msgstr "Kazachstan"
+msgstr ""
msgctxt "CountryInfo"
msgid "Kenya"
-msgstr "Keňa"
+msgstr ""
msgctxt "CountryInfo"
msgid "Kiribati"
-msgstr "Kiribati"
+msgstr ""
msgctxt "CountryInfo"
msgid "Kuwait"
-msgstr "Kuvajt"
+msgstr ""
msgctxt "CountryInfo"
msgid "Kyrgyzstan"
-msgstr "Kirgizsko"
+msgstr ""
msgctxt "CountryInfo"
msgid "Laos"
-msgstr "Laos"
+msgstr ""
msgctxt "CountryInfo"
msgid "Latvia"
-msgstr "Lotyšsko"
+msgstr ""
msgctxt "CountryInfo"
msgid "Lebanon"
-msgstr "Libanon"
+msgstr ""
msgctxt "CountryInfo"
msgid "Lesotho"
-msgstr "Lesotho"
+msgstr ""
msgctxt "CountryInfo"
msgid "Liberia"
-msgstr "Libéria"
+msgstr ""
msgctxt "CountryInfo"
msgid "Liechtenstein"
-msgstr "Lichtenštajnsko"
+msgstr ""
msgctxt "CountryInfo"
msgid "Lithuania"
-msgstr "Litva"
+msgstr ""
msgctxt "CountryInfo"
msgid "Luxembourg"
-msgstr "Luxembursko"
+msgstr ""
msgctxt "CountryInfo"
msgid "Macedonia"
-msgstr "Macedónsko"
+msgstr ""
msgctxt "CountryInfo"
msgid "Madagascar"
-msgstr "Madagaskar"
+msgstr ""
msgctxt "CountryInfo"
msgid "Malawi"
-msgstr "Malawi"
+msgstr ""
msgctxt "CountryInfo"
msgid "Malaysia"
-msgstr "Malajzia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Mali"
-msgstr "Mali"
+msgstr ""
msgctxt "CountryInfo"
msgid "Malta"
-msgstr "Malta"
+msgstr ""
msgctxt "CountryInfo"
msgid "Marshall Islands"
-msgstr "Marshallove Ostrovy"
+msgstr ""
msgctxt "CountryInfo"
msgid "Mauritania"
-msgstr "Mauretánia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Mauritius"
-msgstr "Maurícius"
+msgstr ""
msgctxt "CountryInfo"
msgid "Micronesia"
-msgstr "Mikronézia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Moldova"
-msgstr "Moldavsko"
+msgstr ""
msgctxt "CountryInfo"
msgid "Monaco"
-msgstr "Monako"
+msgstr ""
msgctxt "CountryInfo"
msgid "Mongolia"
-msgstr "Mongolsko"
+msgstr ""
msgctxt "CountryInfo"
msgid "Montenegro"
-msgstr "Čierna Hora"
+msgstr ""
msgctxt "CountryInfo"
msgid "Morocco"
-msgstr "Maroko"
+msgstr ""
msgctxt "CountryInfo"
msgid "Mozambique"
-msgstr "Mozambik"
+msgstr ""
msgctxt "CountryInfo"
msgid "Namibia"
-msgstr "Namíbia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Nauru"
-msgstr "Nauru"
+msgstr ""
msgctxt "CountryInfo"
msgid "Nepal"
-msgstr "Nepál"
+msgstr ""
msgctxt "CountryInfo"
msgid "Netherlands"
-msgstr "Holandsko"
+msgstr ""
msgctxt "CountryInfo"
msgid "New Zealand"
-msgstr "Nový Zéland"
+msgstr ""
msgctxt "CountryInfo"
msgid "Nicaragua"
-msgstr "Nikaragua"
+msgstr ""
msgctxt "CountryInfo"
msgid "Niger"
-msgstr "Niger"
+msgstr ""
msgctxt "CountryInfo"
msgid "Nigeria"
-msgstr "Nigéria"
+msgstr ""
msgctxt "CountryInfo"
msgid "Norway"
-msgstr "Nórsko"
+msgstr ""
msgctxt "CountryInfo"
msgid "Oman"
-msgstr "Omán"
+msgstr ""
msgctxt "CountryInfo"
msgid "Pakistan"
-msgstr "Pakistan"
+msgstr ""
msgctxt "CountryInfo"
msgid "Palau"
-msgstr "Palau"
+msgstr ""
msgctxt "CountryInfo"
msgid "Palestine"
-msgstr "Palestína"
+msgstr ""
msgctxt "CountryInfo"
msgid "Panama"
-msgstr "Panama"
+msgstr ""
msgctxt "CountryInfo"
msgid "Papua New Guinea"
-msgstr "Papua Nová Guinea"
+msgstr ""
msgctxt "CountryInfo"
msgid "Paraguay"
-msgstr "Paraguaj"
+msgstr ""
msgctxt "CountryInfo"
msgid "Peru"
-msgstr "Peru"
+msgstr ""
msgctxt "CountryInfo"
msgid "Philippines"
-msgstr "Filipíny"
+msgstr ""
msgctxt "CountryInfo"
msgid "Poland"
-msgstr "Polsko"
+msgstr ""
msgctxt "CountryInfo"
msgid "Portugal"
-msgstr "Portugalsko"
+msgstr ""
msgctxt "CountryInfo"
msgid "Qatar"
-msgstr "Katar"
+msgstr ""
msgctxt "CountryInfo"
msgid "Romania"
-msgstr "Rumunsko"
+msgstr ""
msgctxt "CountryInfo"
msgid "Russia"
-msgstr "Rusko"
+msgstr ""
msgctxt "CountryInfo"
msgid "Rwanda"
-msgstr "Rwanda"
+msgstr ""
msgctxt "CountryInfo"
msgid "Saint Kitts & Nevis"
-msgstr "Svätý Krištof a Nevis"
+msgstr ""
msgctxt "CountryInfo"
msgid "Saint Lucia"
-msgstr "Svätá Lucia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Saint Vincent & the Grenadines"
-msgstr "Svätý Vincent a Grenadíny "
+msgstr ""
msgctxt "CountryInfo"
msgid "Samoa"
-msgstr "Samoa"
+msgstr ""
msgctxt "CountryInfo"
msgid "San Marino"
-msgstr "San Maríno"
+msgstr ""
msgctxt "CountryInfo"
msgid "Sao Tome & Principe"
-msgstr "Svätý Tomáš a Princov ostrov"
+msgstr ""
msgctxt "CountryInfo"
msgid "Saudi Arabia"
-msgstr "Saudská Arábia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Senegal"
-msgstr "Senegal"
+msgstr ""
msgctxt "CountryInfo"
msgid "Serbia"
-msgstr "Srbsko"
+msgstr ""
msgctxt "CountryInfo"
msgid "Seychelles"
-msgstr "Seychely"
+msgstr ""
msgctxt "CountryInfo"
msgid "Sierra Leone"
-msgstr "Sierra Leone"
+msgstr ""
msgctxt "CountryInfo"
msgid "Singapore"
-msgstr "Singapur"
+msgstr ""
msgctxt "CountryInfo"
msgid "Slovakia"
-msgstr "Slovensko"
+msgstr ""
msgctxt "CountryInfo"
msgid "Slovenia"
-msgstr "Slovinsko"
+msgstr ""
msgctxt "CountryInfo"
msgid "Solomon Islands"
-msgstr "Šalamúnove ostrovy"
+msgstr ""
msgctxt "CountryInfo"
msgid "Somalia"
-msgstr "Somálsko"
+msgstr ""
msgctxt "CountryInfo"
msgid "South Africa"
-msgstr "Juhoafrická Republika"
+msgstr ""
msgctxt "CountryInfo"
msgid "Spain"
-msgstr "Španielsko"
+msgstr ""
msgctxt "CountryInfo"
msgid "Sri Lanka"
-msgstr "Srí Lanka"
+msgstr ""
msgctxt "CountryInfo"
msgid "Sudan"
-msgstr "Sudán"
+msgstr ""
msgctxt "CountryInfo"
msgid "Suriname"
-msgstr "Surinam"
+msgstr ""
msgctxt "CountryInfo"
msgid "Swaziland"
-msgstr "Svazijsko"
+msgstr ""
msgctxt "CountryInfo"
msgid "Sweden"
-msgstr "Švédsko"
+msgstr ""
msgctxt "CountryInfo"
msgid "Switzerland"
-msgstr "Švajčiarsko"
+msgstr ""
msgctxt "CountryInfo"
msgid "Syria"
-msgstr "Sýria"
+msgstr ""
msgctxt "CountryInfo"
msgid "Tajikistan"
-msgstr "Tadžikistan"
+msgstr ""
msgctxt "CountryInfo"
msgid "Tanzania"
-msgstr "Tanzánia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Thailand"
-msgstr "Thajsko"
+msgstr ""
msgctxt "CountryInfo"
msgid "Timor-Leste (East Timor)"
-msgstr "Východný 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 "Tunisko"
+msgstr ""
msgctxt "CountryInfo"
msgid "Turkey"
-msgstr "Turecko"
+msgstr ""
msgctxt "CountryInfo"
msgid "Turkmenistan"
-msgstr "Turkménsko"
+msgstr ""
msgctxt "CountryInfo"
msgid "Tuvalu"
-msgstr "Tuvalu"
+msgstr ""
msgctxt "CountryInfo"
msgid "Uganda"
-msgstr "Uganda"
+msgstr ""
msgctxt "CountryInfo"
msgid "Ukraine"
-msgstr "Ukrajina"
+msgstr ""
msgctxt "CountryInfo"
msgid "United Arab Emirates"
-msgstr "Spojené Arabské Emiráty"
+msgstr ""
msgctxt "CountryInfo"
msgid "United Kingdom"
-msgstr "Spojené Kráľovstvo"
+msgstr ""
msgctxt "CountryInfo"
msgid "United States"
-msgstr "Spojené Štáty"
+msgstr ""
msgctxt "CountryInfo"
msgid "Uruguay"
-msgstr "Uruguaj"
+msgstr ""
msgctxt "CountryInfo"
msgid "Uzbekistan"
-msgstr "Uzbekistan"
+msgstr ""
msgctxt "CountryInfo"
msgid "Vanuatu"
-msgstr "Vanuatu"
+msgstr ""
msgctxt "CountryInfo"
msgid "Vatican"
-msgstr "Vatikán"
+msgstr ""
msgctxt "CountryInfo"
msgid "Venezuela"
-msgstr "Venezuela"
+msgstr ""
msgctxt "CountryInfo"
msgid "Vietnam"
-msgstr "Vietnam"
+msgstr ""
msgctxt "CountryInfo"
msgid "Western Sahara"
-msgstr "Západná Sahara"
+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 "Zair"
+msgstr ""
msgctxt "CountryInfo"
msgid "Albania"
-msgstr "Albánsko"
+msgstr ""
msgctxt "CountryInfo"
msgid "Algeria"
-msgstr "Alžírsko"
+msgstr ""
msgctxt "CountryInfo"
msgid "Austria"
-msgstr "Rakúsko"
+msgstr ""
msgctxt "CountryInfo"
msgid "Bahrain"
-msgstr "Bahrajn"
+msgstr ""
msgctxt "CountryInfo"
msgid "Benin"
-msgstr "Benin"
+msgstr ""
msgctxt "CountryInfo"
msgid "Ethiopia"
-msgstr "Etiópia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Fiji"
-msgstr "Fidži"
+msgstr ""
msgctxt "CountryInfo"
msgid "Finland"
-msgstr "Fínsko"
+msgstr ""
msgctxt "CountryInfo"
msgid "Greece"
-msgstr "Grécko"
+msgstr ""
msgctxt "CountryInfo"
msgid "Guam"
-msgstr "Guam"
+msgstr ""
msgctxt "CountryInfo"
msgid "Hungary"
-msgstr "Maďarsko"
+msgstr ""
msgctxt "CountryInfo"
msgid "Iceland"
-msgstr "Island"
+msgstr ""
msgctxt "CountryInfo"
msgid "India"
-msgstr "India"
+msgstr ""
msgctxt "CountryInfo"
msgid "Indonesia"
-msgstr "Indonézia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Iran"
-msgstr "Irán"
+msgstr ""
msgctxt "CountryInfo"
msgid "Iraq"
-msgstr "Irak"
+msgstr ""
msgctxt "CountryInfo"
msgid "Ireland"
-msgstr "Írsko"
+msgstr ""
msgctxt "CountryInfo"
msgid "Korea, North"
-msgstr "Kórea, Severná"
+msgstr ""
msgctxt "CountryInfo"
msgid "Korea, South"
-msgstr "Kórea, Južná"
+msgstr ""
msgctxt "CountryInfo"
msgid "Libya"
-msgstr "Líbya"
+msgstr ""
msgctxt "CountryInfo"
msgid "Maldives"
-msgstr "Maldivy"
+msgstr ""
msgctxt "CountryInfo"
msgid "Mexico"
-msgstr "Mexiko"
+msgstr ""
msgctxt "CountryInfo"
msgid "Myanmar"
-msgstr "Mjanmarsko"
+msgstr ""
msgctxt "CountryInfo"
msgid "Taiwan"
-msgstr "Taiwan"
-
-msgctxt "CrashReportDialog"
-msgid "Submit a Crash Report"
-msgstr "Odoslať správu o zlyhaní"
-
-msgctxt "CrashReportDialog"
-msgid "Vidalia encountered an error and needed to close"
-msgstr "Vo Vidalia došlo k chybe a preto sa musí aplikácia zavrieť"
-
-msgctxt "CrashReportDialog"
-msgid "Restart Vidalia"
-msgstr "Reštartovať Vidalia"
-
-msgctxt "CrashReportDialog"
-msgid "Don't Restart"
-msgstr "Nereštartovať"
-
-msgctxt "CrashReportDialog"
-msgid "Unable to restart Vidalia"
-msgstr "Vidalia sa nedá reštartovať"
-
-msgctxt "CrashReportDialog"
-msgid ""
-"We were unable to automatically restart Vidalia. Please restart Vidalia "
-"manually."
-msgstr "Nemohli sme automaticky reštartovať Vidaliu. Prosím, reštartujte Vidaliu manuálne."
-
-msgctxt "CrashReportDialog"
-msgid "Please fill a ticket in:"
-msgstr "Vyplňte prosím zoznam:"
-
-msgctxt "CrashReportDialog"
-msgid ""
-"<a "
-"href=\"https://trac.torproject.org/projects/tor/newticket\">https://trac.torproject.org/projects/tor/newticket</a>"
-msgstr "<a href=\"https://trac.torproject.org/projects/tor/newticket\">https://trac.torproject.org/projects/tor/newticket</a>"
-
-msgctxt "CrashReportDialog"
-msgid ""
-"A crash report has been created that you can send to the Vidalia developers "
-"to help identify and fix the problem. The submitted report does not contain "
-"any personally identifying information."
-msgstr "Hlásenie o zlyhaní bolo vytvorené a môžete ho poslať vývojárom do Vidalia, kde zistia a opravia problém. Predložená správa neobsahuje žiadne osobné ani identifikačné informácie."
-
-msgctxt "CrashReportDialog"
-msgid ""
-"with a description of what you were doing before the application crashed, "
-"along with the following files corresponding to the crash report:"
-msgstr "s popisom toho, čo ste robili pred zlyhaním aplikácie, spolu s nasledujúcimi súbormi zodpovedajúcimi správe o zlyhaní:"
+msgstr ""
msgctxt "GeneralPage"
msgid "Executables (*.exe)"
-msgstr "Spustiteľné súbory (*.exe)"
+msgstr ""
msgctxt "GeneralPage"
msgid "Select Path to Tor"
-msgstr "Vyberte Cestu k Tor"
+msgstr ""
msgctxt "GeneralPage"
msgid "Select Proxy Executable"
-msgstr "Zvolte spustiteľné Proxy"
+msgstr ""
msgctxt "GeneralPage"
msgid "You must specify the name of your Tor executable."
-msgstr "Musíte zadať názov spustiteľného Tora."
+msgstr ""
+
+msgctxt "GeneralPage"
+msgid "The proxy arguments specified are not properly formatted."
+msgstr ""
msgctxt "GeneralPage"
msgid "Start Vidalia when my system starts"
-msgstr "Spustiť Vidalia pri spustení systému"
+msgstr ""
msgctxt "GeneralPage"
msgid "Browse"
-msgstr "Hľadať"
+msgstr ""
msgctxt "GeneralPage"
msgid "Start the Tor software when Vidalia starts"
-msgstr "Spustiť Tora, keď sa spustí Vidalia"
+msgstr ""
msgctxt "GeneralPage"
msgid "Tor"
-msgstr "Tor"
+msgstr ""
msgctxt "GeneralPage"
msgid "Proxy Application (optional)"
-msgstr "Aplikácia Proxy (voliteľne)"
+msgstr ""
msgctxt "GeneralPage"
msgid "Start a proxy application when Tor starts"
-msgstr "Spustiť aplikáciu proxy, keď sa spustí Tor"
+msgstr ""
msgctxt "GeneralPage"
msgid "Proxy Application Arguments:"
-msgstr "Parametre aplikácie proxy:"
+msgstr ""
msgctxt "GeneralPage"
msgid "Software Updates"
-msgstr "Aktualizácia softvéru"
+msgstr ""
msgctxt "GeneralPage"
msgid "Check for new software updates automatically"
-msgstr "Automaticky skontrolovať aktualizáciu softvéru"
+msgstr ""
msgctxt "GeneralPage"
msgid "Check Now"
-msgstr "Skontrolovať"
+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 "Prijal:"
+msgstr ""
msgctxt "GraphFrame"
msgid "Sent:"
-msgstr "Odos:"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Supplied XML file is not a valid Contents document."
-msgstr "Dodaný XML súbor nemá platný obsah."
+msgstr ""
msgctxt "HelpBrowser"
msgid "Search reached end of document"
-msgstr "Prehľadávanie prišlo na koniec dokumentu"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Search reached start of document"
-msgstr "Prehľadávanie prišlo na začiatok dokumentu"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Text not found in document"
-msgstr "Zadaný text sa v dokumente nenašiel"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Found %1 results"
-msgstr "Nájdených %1 výsledkov"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Vidalia Help"
-msgstr "Pomocník Vidalia"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Back"
-msgstr "Späť"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Move to previous page (Backspace)"
-msgstr "Prejsť na predchádzajúcu stránku (Backspace)"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Backspace"
-msgstr "Backspace"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Forward"
-msgstr "Vpred"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Move to next page (Shift+Backspace)"
-msgstr "Prejsť na ďalšiu stránku (Shift+Backspace)"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Shift+Backspace"
-msgstr "Shift+Backspace"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Home"
-msgstr "Domov"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Move to the Home page (Ctrl+H)"
-msgstr "Prejsť na Domovskú stránku (Ctrl+H)"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Ctrl+H"
-msgstr "Ctrl+H"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Find"
-msgstr "Hľadať"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Search for a word or phrase on current page (Ctrl+F)"
-msgstr "Vyhľadať slová alebo frázy na aktuálnej stránke (Ctrl+F)"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Ctrl+F"
-msgstr "Ctrl+F"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Close"
-msgstr "Zavrieť"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Close Vidalia Help"
-msgstr "Zatvoriť Pomocník Vidalia"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Esc"
-msgstr "Esc"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Find:"
-msgstr "Hľadať:"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Find Previous"
-msgstr "Nájsť predchádzajúce"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Find Next"
-msgstr "Nájsť ďalšie"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Case sensitive"
-msgstr "Rozlišovať malé a veľké písmená"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Whole words only"
-msgstr "Iba celé slová"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Help Topics"
-msgstr "Témy Pomocníka"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Contents"
-msgstr "Obsah"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Search"
-msgstr "Hľadať"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Searching for:"
-msgstr "Vyhľadávanie:"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Found Documents"
-msgstr "Nájdené dokumenty"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Error Loading Help Contents:"
-msgstr "Nastala chyba v zavedení obsahu nápovedy:"
+msgstr ""
msgctxt "HelpTextBrowser"
msgid "Opening External Link"
-msgstr "Otvoriť externý odkaz"
+msgstr ""
msgctxt "HelpTextBrowser"
-msgid ""
-"Vidalia can open the link you selected in your default Web browser. If your "
-"browser is not currently configured to use Tor then the request will not be "
-"anonymous."
-msgstr "Vidalia môže otvoriť zvolený odkaz vo Vašom predvolenom prehliadači. Ak Váš prehliadač nie je nakonfigurovaný pre použitie Tor, potom požiadavka nebude anonymná."
+msgid "Vidalia can open the link you selected in your default Web browser. If your browser is not currently configured to use Tor then the request will not be anonymous."
+msgstr ""
msgctxt "HelpTextBrowser"
msgid "Do you want Vidalia to open the link in your Web browser?"
-msgstr "Má Vidalia otvoriť odkaz vo vašom webovom prehliadači?"
+msgstr ""
msgctxt "HelpTextBrowser"
msgid "Unable to Open Link"
-msgstr "Odkaz sa nedá otvoriť"
+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 nemohla otvoriť vybraný odkaz vo Vašom webovom prehliadači. Ale môžete sa pokúsiť skopírovať URL a vložiť ho do svojho prehliadača."
+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 "Nastala chyba pri otváraní súboru pomocníka:"
+msgstr ""
msgctxt "LicenseDialog"
msgid "License Information"
-msgstr "Informácia o licencii"
+msgstr ""
msgctxt "LicenseDialog"
msgid "License"
-msgstr "Licencia"
+msgstr ""
msgctxt "LicenseDialog"
msgid "Credits"
-msgstr "Poďakovanie"
+msgstr ""
msgctxt "LogEvent"
msgid "Debug"
-msgstr "Debug"
+msgstr ""
msgctxt "LogEvent"
msgid "Info"
-msgstr "Informácie"
+msgstr ""
msgctxt "LogEvent"
msgid "Notice"
-msgstr "Poznámky"
+msgstr ""
msgctxt "LogEvent"
msgid "Warning"
-msgstr "Varovanie"
+msgstr ""
msgctxt "LogEvent"
msgid "Error"
-msgstr "Chyba"
+msgstr ""
msgctxt "LogEvent"
msgid "Unknown"
-msgstr "Neznámy"
-
-msgctxt "LogTreeItem"
-msgid "Debug"
-msgstr "Debug"
-
-msgctxt "LogTreeItem"
-msgid "Info"
-msgstr "Informácie"
-
-msgctxt "LogTreeItem"
-msgid "Notice"
-msgstr "Oznam"
-
-msgctxt "LogTreeItem"
-msgid "Warning"
-msgstr "Upozornenie"
-
-msgctxt "LogTreeItem"
-msgid "Error"
-msgstr "Chyba"
-
-msgctxt "LogTreeItem"
-msgid "Unknown"
-msgstr "Neznámy"
+msgstr ""
msgctxt "MainWindow"
msgid "Start Tor"
-msgstr "Spustiť Tor"
+msgstr ""
msgctxt "MainWindow"
msgid "Exit"
-msgstr "Ukončiť"
+msgstr ""
msgctxt "MainWindow"
msgid "Bandwidth Graph"
-msgstr "Prevádzkový graf"
+msgstr ""
msgctxt "MainWindow"
msgid "Message Log"
-msgstr "Protokol správ"
+msgstr ""
msgctxt "MainWindow"
msgid "Network Map"
-msgstr "Mapa siete"
+msgstr ""
msgctxt "MainWindow"
msgid "Control Panel"
-msgstr "Ovládací panel"
+msgstr ""
msgctxt "MainWindow"
msgid "Settings"
-msgstr "Nastavenia"
+msgstr ""
msgctxt "MainWindow"
msgid "About"
-msgstr "O aplikácií"
+msgstr ""
msgctxt "MainWindow"
msgid "Help"
-msgstr "Pomocník"
+msgstr ""
msgctxt "MainWindow"
msgid "New Identity"
-msgstr "Nová identita"
+msgstr ""
msgctxt "MainWindow"
msgid "Ctrl+T"
-msgstr "Ctrl+T"
+msgstr ""
msgctxt "MainWindow"
msgid "Ctrl+B"
-msgstr "Ctrl+B"
+msgstr ""
msgctxt "MainWindow"
msgid "Ctrl+L"
-msgstr "Ctrl+L"
+msgstr ""
msgctxt "MainWindow"
msgid "Ctrl+N"
-msgstr "Ctrl+N"
+msgstr ""
msgctxt "MainWindow"
msgid "Ctrl+?"
-msgstr "Ctrl+?"
+msgstr ""
msgctxt "MainWindow"
msgid "Ctrl+I"
-msgstr "Ctrl+I"
+msgstr ""
msgctxt "MainWindow"
msgid "Ctrl+P"
-msgstr "Ctrl+P"
+msgstr ""
msgctxt "MainWindow"
msgid "Tor"
-msgstr "Tor"
+msgstr ""
msgctxt "MainWindow"
msgid "View"
-msgstr "Zobraziť"
+msgstr ""
msgctxt "MainWindow"
msgid "Vidalia Help"
-msgstr "Pomocník Vidalia"
+msgstr ""
msgctxt "MainWindow"
msgid "Error starting web browser"
-msgstr "Nastala chyba pri spúšťaní webového prehliadača"
+msgstr ""
msgctxt "MainWindow"
msgid "Vidalia was unable to start the configured web browser"
-msgstr "Vidalia nemohla spustiť nakonfigurovaný webový prehliadač"
+msgstr ""
msgctxt "MainWindow"
msgid "Error starting IM client"
-msgstr "Chyba pri spúšťaní IM klienta"
+msgstr ""
msgctxt "MainWindow"
msgid "Vidalia was unable to start the configured IM client"
-msgstr "Vidalia nemohla spustiť nakonfigurovaný IM klient"
+msgstr ""
msgctxt "MainWindow"
msgid "Error starting proxy server"
-msgstr "Chyba pri spúšťaní proxy servera"
+msgstr ""
msgctxt "MainWindow"
msgid "Vidalia was unable to start the configured proxy server"
-msgstr "Vidalia nemohla spustiť nakonfigurovaný 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 "Načítanie stavu siete"
+msgstr ""
msgctxt "MainWindow"
msgid "Loading authority certificates"
-msgstr "Nahrávanie autorizačných certifikátov"
+msgstr ""
msgctxt "MainWindow"
msgid "Requesting relay information"
-msgstr "Požiadať o informácie o relay"
+msgstr ""
msgctxt "MainWindow"
msgid "Loading relay information"
-msgstr "Načítať informácie o relay"
+msgstr ""
msgctxt "MainWindow"
msgid "Connecting to the Tor network"
-msgstr "Pripájanie do siete Tor"
+msgstr ""
msgctxt "MainWindow"
msgid "Establishing a Tor circuit"
-msgstr "Nastavuje sa Tor okruh"
+msgstr ""
msgctxt "MainWindow"
msgid "Connected to the Tor network!"
-msgstr "Ste pripojený do siete Tor!"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Unrecognized startup status"
+msgstr ""
msgctxt "MainWindow"
msgid "miscellaneous"
-msgstr "rôzne"
+msgstr ""
msgctxt "MainWindow"
msgid "identity mismatch"
-msgstr "nesprávna identita"
+msgstr ""
msgctxt "MainWindow"
msgid "done"
-msgstr "hotovo"
+msgstr ""
msgctxt "MainWindow"
msgid "connection refused"
-msgstr "pripojenie bolo odmietnuté"
+msgstr ""
msgctxt "MainWindow"
msgid "connection timeout"
-msgstr "časový limit pripojenia "
+msgstr ""
msgctxt "MainWindow"
msgid "read/write error"
-msgstr "chyba pri načítaní/zápise"
+msgstr ""
msgctxt "MainWindow"
msgid "no route to host"
-msgstr "žiadna cesta k hostiteľovi"
+msgstr ""
msgctxt "MainWindow"
msgid "insufficient resources"
-msgstr "nedostatočné zdroje"
+msgstr ""
msgctxt "MainWindow"
msgid "unknown"
-msgstr "neznámy"
+msgstr ""
msgctxt "MainWindow"
msgid "Tor is not running"
-msgstr "Tor nie je spustený"
+msgstr ""
msgctxt "MainWindow"
msgid "Tor is shutting down"
-msgstr "Tor sa vypína"
+msgstr ""
msgctxt "MainWindow"
msgid "Stop Tor Now"
-msgstr "Okamžite zastav Tor"
+msgstr ""
msgctxt "MainWindow"
msgid "Stop Tor"
-msgstr "Zastav Tor"
+msgstr ""
msgctxt "MainWindow"
msgid "Starting the Tor software"
-msgstr "Spúšťam softvér Tor"
+msgstr ""
msgctxt "MainWindow"
msgid "Starting Tor"
-msgstr "Spúšťam Tor"
+msgstr ""
msgctxt "MainWindow"
msgid "Error Starting Tor"
-msgstr "Chyba pri spúšťaní 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 nedokázala spustiť Tor. Skontrolujte nastavenie pre zaistenie správnneho názvu a umiestnenia Tora v mieste kde je určený."
+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 "Pripájam Tor"
+msgstr ""
msgctxt "MainWindow"
msgid "Connection Error"
-msgstr "Pripojenie zlyhalo"
+msgstr ""
msgctxt "MainWindow"
msgid "Relaying is Enabled"
-msgstr "Relaying je Aktivované"
+msgstr ""
msgctxt "MainWindow"
msgid "Error Shutting Down"
-msgstr "Nastala chyba pri vypnutí"
+msgstr ""
msgctxt "MainWindow"
msgid "Vidalia was unable to stop the Tor software."
-msgstr "Vidalia nedokázala zastaviť softvér Tor."
+msgstr ""
msgctxt "MainWindow"
msgid "Unexpected Error"
-msgstr "Nastala neočakávaná chyba"
+msgstr ""
msgctxt "MainWindow"
msgid "Authenticating to Tor"
-msgstr "Overujem Tor"
+msgstr ""
msgctxt "MainWindow"
msgid "Cookie Authentication Required"
-msgstr "Cookie vyžaduje overenie"
+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 "Softvér Tora musí poslať obsah cookie pre overenie, ale Vidalia ich nevie nájsť."
+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 "Chcete vyhľadať súbor 'control_auth_cookie' sám?"
+msgstr ""
msgctxt "MainWindow"
msgid "Data Directory"
-msgstr "Adresár dát"
+msgstr ""
msgctxt "MainWindow"
msgid "Control Cookie (control_auth_cookie)"
-msgstr "Kontrola Cookie (control_auth_cookie)"
+msgstr ""
msgctxt "MainWindow"
msgid "Error Registering for Events"
-msgstr "Nastala chyba počas registrácie"
+msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Vidalia was unable to register for some events. Many of Vidalia's features "
-"may be unavailable."
-msgstr "Program nedokázal vykonať registráciu. Veľa funkcií Vidalia, nie je k dispozícii."
+msgid "Vidalia was unable to register for some events. Many of Vidalia's features may be unavailable."
+msgstr ""
msgctxt "MainWindow"
msgid "Authentication Error"
-msgstr "Nastala chyba pri overovaní"
+msgstr ""
msgctxt "MainWindow"
msgid "Vidalia was unable to authenticate to the Tor software. (%1)"
-msgstr "Vidalia nevie overiť softvér Tora. (%1)"
+msgstr ""
msgctxt "MainWindow"
msgid "Please check your control port authentication settings."
-msgstr "Prosím, skontrolujte si nastavenia ovládania portu overovania."
+msgstr ""
msgctxt "MainWindow"
msgid "Tor Update Available"
-msgstr "Dostupná je aktualizácia Tora"
+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 "Aktuálne nainštalované verzia Tora je zastaralá a už sa neodporúča používať. Prosím, navštívte naše web stránky a stiahnite si najnovšiu verziu Tora."
+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 "Webstránka TORA: %1"
+msgstr ""
msgctxt "MainWindow"
-msgid ""
-"All subsequent connections will appear to be different than your old "
-"connections."
-msgstr "Všetky následné pripojenia sa objavia iné, než staré pripojenie."
+msgid "All subsequent connections will appear to be different than your old connections."
+msgstr ""
msgctxt "MainWindow"
msgid "Failed to Create New Identity"
-msgstr "Nepodarila sa vytvoriť nová identita"
+msgstr ""
msgctxt "MainWindow"
msgid "Port Forwarding Failed"
-msgstr "Odosielací port zlyhal"
+msgstr ""
msgctxt "MainWindow"
msgid "Vidalia was unable to configure automatic port forwarding."
-msgstr "Vidalia nebol schopný nastaviť automatické presmerovanie portov."
+msgstr ""
msgctxt "MainWindow"
msgid "Vidalia Control Panel"
-msgstr "Ovládací panel Vidalia"
+msgstr ""
msgctxt "MainWindow"
msgid "Status"
-msgstr "Stav"
+msgstr ""
msgctxt "MainWindow"
msgid "Vidalia Shortcuts"
-msgstr "Skratky Vidalia"
+msgstr ""
msgctxt "MainWindow"
msgid "Setup Relaying"
-msgstr "Nastavenie výmeny"
+msgstr ""
msgctxt "MainWindow"
msgid "Set up a relay and help the network grow"
-msgstr "Nastavenie relé pomáha rastu siete"
+msgstr ""
msgctxt "MainWindow"
msgid "View the Network"
-msgstr "Zobrazím sieť"
+msgstr ""
msgctxt "MainWindow"
msgid "View a map of the Tor network"
-msgstr "Zobrazím mapu siete Tora"
+msgstr ""
msgctxt "MainWindow"
msgid "Use a New Identity"
-msgstr "Použijen novú identitu"
+msgstr ""
msgctxt "MainWindow"
msgid "Make subsequent connections appear new"
-msgstr "Hneď ako sa objaví nové pripojenie"
+msgstr ""
msgctxt "MainWindow"
msgid "View recent bandwidth usage"
-msgstr "Zobrazím poslednú šírku pásma"
+msgstr ""
msgctxt "MainWindow"
msgid "View log message history"
-msgstr "Zobrazím históriu v protokole správ"
+msgstr ""
msgctxt "MainWindow"
msgid "View help documentation"
-msgstr "Zobrazím nápovedu"
+msgstr ""
msgctxt "MainWindow"
msgid "Configure Vidalia"
-msgstr "Prejdem do nastavenia Vidalia"
+msgstr ""
msgctxt "MainWindow"
msgid "View version and license information"
-msgstr "Zobrazím informáciu o verzii a licencii"
+msgstr ""
msgctxt "MainWindow"
msgid "Exit Vidalia"
-msgstr "Skoním aplikáciu Vidalia"
+msgstr ""
msgctxt "MainWindow"
msgid "Show this window on startup"
-msgstr "Zobrazím toto okno pri spustení"
+msgstr ""
msgctxt "MainWindow"
msgid "Hide"
-msgstr "Skryť"
+msgstr ""
msgctxt "MainWindow"
msgid "Hide this window"
-msgstr "Skryjem toto okno"
+msgstr ""
msgctxt "MainWindow"
msgid "Password Reset Failed"
-msgstr "Reset hesla zlyhalo"
+msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Vidalia tried to reset Tor's control password, but was not able to restart "
-"the Tor software. Please check your Task Manager to ensure there are no "
-"other Tor processes running."
+msgid "Vidalia tried to reset Tor's control password, but was not able to restart the Tor software. Please check your Task Manager to ensure there are no other Tor processes running."
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended."
+msgid "The currently installed version of Tor is out of date or no longer recommended."
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Would you like to check if a newer package is available for installation?"
+msgid "Would you like to check if a newer package is available for installation?"
msgstr ""
msgctxt "MainWindow"
@@ -2048,9 +1887,11 @@ msgid "Potentially Unsafe Connection"
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 ""
msgctxt "MainWindow"
@@ -2062,85 +1903,68 @@ msgid "Your software is up to date"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"There are no new Tor software packages available for your computer at this "
-"time."
+msgid "There are no new Tor software packages available for your computer at this time."
msgstr ""
msgctxt "MainWindow"
msgid "Installation Failed"
-msgstr "Inštalácia zlyhala"
+msgstr ""
msgctxt "MainWindow"
msgid "Vidalia was unable to install your software updates."
-msgstr "Vidalia nemohla nainštalovať softvérové aktualizácie"
+msgstr ""
msgctxt "MainWindow"
msgid "The following error occurred:"
-msgstr "Vyskytla sa nasledujúca chyba:"
-
-msgctxt "MainWindow"
-msgid ""
-"Anything sent over this connection could be monitored. Please check your "
-"application's configuration and use only encrypted protocols, such as SSL, "
-"if possible."
-msgstr "Všetko čo pošlete týmto pripojením môže byť monitorované. Skontrolujte nastavenie aplikácie, a ak sa dá, používajte šifrované protokoly, ako je napr. SSL."
-
-msgctxt "MainWindow"
-msgid "Bootstrapping torrc from %1 to %2"
-msgstr "Bootstrapping torrc od %1 do %2"
-
-msgctxt "MainWindow"
-msgid "(probably Telnet)"
-msgstr "(pravdepodobne Telnet)"
-
-msgctxt "MainWindow"
-msgid "(probably an email client)"
-msgstr "(pravdepodobne emailový klient)"
-
-msgctxt "MainWindow"
-msgid ""
-"One of your applications %1 appears to be making a potentially unencrypted "
-"and unsafe connection to port %2."
-msgstr "Zdá sa, že jedna z Vašich aplikácií %1 komunikuje nešifrovane a nebezpečne na porte %2."
+msgstr ""
msgctxt "MainWindow"
msgid "failed (%1)"
-msgstr "zlyhalo (%1)"
+msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
+msgid "Your relay is shutting down.\n"
"Click 'Stop' again to stop your relay now."
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Vidalia can't find out how to talk to Tor because it can't access this file: %1\n"
+msgid "You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
"\n"
-"Here's the last error message:\n"
-"%2"
+"Would you like to shutdown gracefully and give clients time to find a new relay?"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"It seems Tor has stopped running since Vidalia started it.\n"
+msgid "Vidalia detected that the Tor software exited unexpectedly.\n"
"\n"
-"See the Advanced Message Log for more information."
+"Please check the message log for recent warning or error messages."
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
-"\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
+msgid ", probably Telnet,"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Vidalia detected that the Tor software exited unexpectedly.\n"
-"\n"
-"Please check the message log for recent warning or error messages."
+msgid ", probably an email client,"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Vidalia"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "File"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "About Vidalia"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Home"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Check For Updates"
msgstr ""
msgctxt "MessageLog"
@@ -2169,207 +1993,207 @@ msgstr ""
msgctxt "MessageLog"
msgid "Select Log File"
-msgstr "Vybrat súbor protokolu"
+msgstr ""
msgctxt "MessageLog"
msgid "Save Log Messages"
-msgstr "Uložiť protokol"
+msgstr ""
msgctxt "MessageLog"
msgid "Text Files (*.txt)"
-msgstr "Textové súbory (*.txt)"
+msgstr ""
msgctxt "MessageLog"
msgid "Vidalia"
-msgstr "Vidalia"
+msgstr ""
msgctxt "MessageLog"
msgid "Find in Message Log"
-msgstr "Vyhľadať v protokole správ"
+msgstr ""
msgctxt "MessageLog"
msgid "Find:"
-msgstr "Hľadať:"
+msgstr ""
msgctxt "MessageLog"
msgid "Not Found"
-msgstr "Nič som nenašiel"
+msgstr ""
msgctxt "MessageLog"
msgid "Search found 0 matches."
-msgstr "Nič som nenašiel"
+msgstr ""
msgctxt "MessageLog"
msgid "Message Log"
-msgstr "Protokol správ"
+msgstr ""
msgctxt "MessageLog"
msgid "Message Filters..."
-msgstr "Filter správ..."
+msgstr ""
msgctxt "MessageLog"
msgid "Set message filters"
-msgstr "Nastaviť filter správ"
+msgstr ""
msgctxt "MessageLog"
msgid "History Size..."
-msgstr "Veľkosť histórie..."
+msgstr ""
msgctxt "MessageLog"
msgid "Set maximum number of messages to display"
-msgstr "Nastavenie maximálneho počtu zobrazených správ"
+msgstr ""
msgctxt "MessageLog"
msgid "Clear"
-msgstr "Vymazať"
+msgstr ""
msgctxt "MessageLog"
msgid "Clear all messages from the Message Log (Ctrl+E)"
-msgstr "Vymazať všetky správy z protokolu správ (Ctrl+E)"
+msgstr ""
msgctxt "MessageLog"
msgid "Ctrl+E"
-msgstr "Ctrl+E"
+msgstr ""
msgctxt "MessageLog"
msgid "Copy"
-msgstr "Kopírovať"
+msgstr ""
msgctxt "MessageLog"
msgid "Copy the selected messages to the clipboard (Ctrl+C)"
-msgstr "Kopírovať vybrané správy do schránky (Ctrl+C)"
+msgstr ""
msgctxt "MessageLog"
msgid "Ctrl+C"
-msgstr "Ctrl+C"
+msgstr ""
msgctxt "MessageLog"
msgid "Select All"
-msgstr "Označiť všetko"
+msgstr ""
msgctxt "MessageLog"
msgid "Select all messages (Ctrl+A)"
-msgstr "Označiť všetky správy (Ctrl+A)"
+msgstr ""
msgctxt "MessageLog"
msgid "Ctrl+A"
-msgstr "Ctrl+A"
+msgstr ""
msgctxt "MessageLog"
msgid "Save All"
-msgstr "Uložiť všetko"
+msgstr ""
msgctxt "MessageLog"
msgid "Save all messages to a file"
-msgstr "Uložiť všetky správy do súboru"
+msgstr ""
msgctxt "MessageLog"
msgid "Save Selected"
-msgstr "Uložiť označené"
+msgstr ""
msgctxt "MessageLog"
msgid "Save selected messages to a file"
-msgstr "Uložiť vybrané správy do súboru"
+msgstr ""
msgctxt "MessageLog"
msgid "Settings"
-msgstr "Nastavenia"
+msgstr ""
msgctxt "MessageLog"
msgid "Adjust Message Log Settings"
-msgstr "Otvorím nastavenia protokolu správ"
+msgstr ""
msgctxt "MessageLog"
msgid "Ctrl+T"
-msgstr "Ctrl+T"
+msgstr ""
msgctxt "MessageLog"
msgid "Help"
-msgstr "Pomocník"
+msgstr ""
msgctxt "MessageLog"
msgid "Show the help browser"
-msgstr "Zobrazím pomoc"
+msgstr ""
msgctxt "MessageLog"
msgid "F1"
-msgstr "F1"
+msgstr ""
msgctxt "MessageLog"
msgid "Close"
-msgstr "Zavrieť"
+msgstr ""
msgctxt "MessageLog"
msgid "Close the Message Log"
-msgstr "Zavrieť protokol správ"
+msgstr ""
msgctxt "MessageLog"
msgid "Esc"
-msgstr "Esc"
+msgstr ""
msgctxt "MessageLog"
msgid "Find"
-msgstr "Hľadať"
+msgstr ""
msgctxt "MessageLog"
msgid "Find all messages containing the search text (Ctrl+F)"
-msgstr "Vyhľadať všetky správy obsahujúce hľadaný text (Ctrl+F)"
+msgstr ""
msgctxt "MessageLog"
msgid "Ctrl+F"
-msgstr "Ctrl+F"
+msgstr ""
msgctxt "MessageLog"
msgid "Time"
-msgstr "Čas"
+msgstr ""
msgctxt "MessageLog"
msgid "Type"
-msgstr "Typ"
+msgstr ""
msgctxt "MessageLog"
msgid "Message"
-msgstr "Správa"
+msgstr ""
msgctxt "MessageLog"
msgid "Saves the current Message Log settings"
-msgstr "Uložiť aktuálne nastavenie protokolu správ"
+msgstr ""
msgctxt "MessageLog"
msgid "Save Settings"
-msgstr "Uložiť nastavenie"
+msgstr ""
msgctxt "MessageLog"
msgid "Cancels changes made to settings"
-msgstr "Zrušiť zmeny vykonané v nastaveniach"
+msgstr ""
msgctxt "MessageLog"
msgid "Cancel"
-msgstr "Zrušiť"
+msgstr ""
msgctxt "MessageLog"
msgid "Message Filter"
-msgstr "Filter správ"
+msgstr ""
msgctxt "MessageLog"
msgid "Error"
-msgstr "Chyba"
+msgstr ""
msgctxt "MessageLog"
msgid "Warning"
-msgstr "Varovanie"
+msgstr ""
msgctxt "MessageLog"
msgid "Notice"
-msgstr "História protokolu správ"
+msgstr ""
msgctxt "MessageLog"
msgid "Info"
-msgstr "Informácie"
+msgstr ""
msgctxt "MessageLog"
msgid "Debug"
-msgstr "Debug"
+msgstr ""
msgctxt "MessageLog"
msgid "Message Log History"
@@ -2381,193 +2205,179 @@ msgstr ""
msgctxt "MessageLog"
msgid "messages"
-msgstr "správy"
-
-msgctxt "MessageLog"
-msgid "Browse"
-msgstr "Hľadať"
-
-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"
+msgid "Always Save New Log Messages"
msgstr ""
msgctxt "MessageLog"
-msgid "Basic"
-msgstr "Jednoduché"
-
-msgctxt "MessageLog"
-msgid "Tor Status"
-msgstr "Tor stav"
+msgid "Browse"
+msgstr ""
msgctxt "MessageLog"
-msgid "Advanced"
-msgstr "Pokročilé"
+msgid "Enable automatically saving all new log messages to a file"
+msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
+msgid "Automatically save new log messages to a file"
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 ""
msgctxt "MessageLog"
-msgid ""
-"Messages that only appear when \n"
+msgid "Messages that only appear when \n"
"something has gone wrong with Tor."
msgstr ""
msgctxt "MessageLog"
-msgid ""
-"Messages that appear infrequently \n"
+msgid "Messages that appear infrequently \n"
"during normal Tor operation and are \n"
"not considered errors, but you may \n"
"care about."
msgstr ""
msgctxt "MessageLog"
-msgid ""
-"Messages that appear frequently \n"
+msgid "Messages that appear frequently \n"
"during normal Tor operation."
msgstr ""
msgctxt "MessageLog"
-msgid ""
-"Hyper-verbose messages primarily of \n"
+msgid "Hyper-verbose messages primarily of \n"
"interest to Tor developers."
msgstr ""
msgctxt "MessageLog"
-msgid ""
-"Cannot write file %1\n"
+msgid "Cannot write file %1\n"
"\n"
"%2."
-msgstr "Nemôžem zapísať súbor %1\n\n%2"
+msgstr ""
msgctxt "NetViewer"
msgid "Tor Network Map"
-msgstr "Mapa siete Tor"
+msgstr ""
msgctxt "NetViewer"
msgid "Refresh"
-msgstr "Obnoviť"
+msgstr ""
msgctxt "NetViewer"
msgid "Refresh the list of Tor relays and connections"
-msgstr "Obnoviť zoznam Tor relay a pripojení"
+msgstr ""
msgctxt "NetViewer"
msgid "Ctrl+R"
-msgstr "Ctrl+R"
+msgstr ""
msgctxt "NetViewer"
msgid "Help"
-msgstr "Pomocník"
+msgstr ""
msgctxt "NetViewer"
msgid "Show the network map help"
-msgstr "Zobrazím pomoc tejto mapy siete"
+msgstr ""
msgctxt "NetViewer"
msgid "Show network map help"
-msgstr "Zobrazím pomoc mapy siete"
+msgstr ""
msgctxt "NetViewer"
msgid "F1"
-msgstr "F1"
+msgstr ""
msgctxt "NetViewer"
msgid "Close"
-msgstr "Zavrieť"
+msgstr ""
msgctxt "NetViewer"
msgid "Close the network map"
-msgstr "Zavrieť mapu siete"
+msgstr ""
msgctxt "NetViewer"
msgid "Esc"
-msgstr "Esc"
+msgstr ""
msgctxt "NetViewer"
msgid "Zoom In"
-msgstr "Priblížiť"
+msgstr ""
msgctxt "NetViewer"
msgid "Zoom in on the network map"
-msgstr "Priblížim mapu siete"
+msgstr ""
msgctxt "NetViewer"
msgid "+"
-msgstr "+"
+msgstr ""
msgctxt "NetViewer"
msgid "Zoom Out"
-msgstr "Oddialiť"
+msgstr ""
msgctxt "NetViewer"
msgid "Zoom out on the network map"
-msgstr "Oddialim mapu siete"
+msgstr ""
msgctxt "NetViewer"
msgid "-"
-msgstr "-"
+msgstr ""
msgctxt "NetViewer"
msgid "Zoom To Fit"
-msgstr "Priblížiť v Okruhu"
+msgstr ""
msgctxt "NetViewer"
msgid "Zooms to fit all currently displayed circuits"
-msgstr "Priblížim, aby sa zmestili všetky aktuálne zobrazené okruhy"
+msgstr ""
msgctxt "NetViewer"
msgid "Ctrl+Z"
-msgstr "Ctrl+Z"
+msgstr ""
msgctxt "NetViewer"
msgid "Relay Not Found"
-msgstr "Prenos nebol nájdený"
+msgstr ""
msgctxt "NetViewer"
msgid "No details on the selected relay are available."
-msgstr "Podrobnosti pre daný prenos neboli nájdené."
+msgstr ""
msgctxt "NetViewer"
msgid "Unknown"
-msgstr "Neznáme"
+msgstr ""
msgctxt "NetViewer"
msgid "Full Screen"
-msgstr "Celá obrazovka"
+msgstr ""
msgctxt "NetViewer"
msgid "View the network map as a full screen window"
-msgstr "Zobraziť mapu siete v okne na celú obrazovku"
+msgstr ""
msgctxt "NetViewer"
msgid "Ctrl+F"
-msgstr "Ctrl+F"
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "Invalid Bridge"
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "The specified bridge identifier is not valid."
+msgstr ""
msgctxt "NetworkPage"
msgid "Copy (Ctrl+C)"
-msgstr "Kopírovať (Ctrl+C)"
+msgstr ""
msgctxt "NetworkPage"
-msgid ""
-"You must specify both an IP address or hostname and a port number to "
-"configure Tor to use a proxy to access the Internet."
+msgid "You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet."
msgstr ""
msgctxt "NetworkPage"
-msgid ""
-"You must specify one or more ports to which your firewall allows you to "
-"connect."
+msgid "You must specify one or more ports to which your firewall allows you to connect."
msgstr ""
msgctxt "NetworkPage"
@@ -2584,44 +2394,50 @@ msgstr ""
msgctxt "NetworkPage"
msgid "Proxy Settings"
-msgstr "Nastavenie proxy"
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "HTTP Proxy:"
+msgstr ""
msgctxt "NetworkPage"
msgid "Username:"
-msgstr "Už.názov:"
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "Use this proxy for HTTPS also"
+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 "Skontrolujte si pripojenie prenosu použitých portov, ktoré ste povolili firewallu"
+msgstr ""
msgctxt "NetworkPage"
msgid "My firewall only lets me connect to certain ports"
-msgstr "Môj firewall mi umožňuje pripojenie len k niektorým portom"
+msgstr ""
msgctxt "NetworkPage"
msgid "Firewall Settings"
-msgstr "Nastavenie firewallu"
+msgstr ""
msgctxt "NetworkPage"
msgid "Allowed Ports:"
-msgstr "Povolené porty:"
+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 ""
msgctxt "NetworkPage"
@@ -2630,11 +2446,19 @@ msgstr ""
msgctxt "NetworkPage"
msgid "Bridge Settings"
-msgstr "Nastavenie premostenia"
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "The Tor software you are currently running does not support bridges. <br>Directory connections will still be encrypted."
+msgstr ""
msgctxt "NetworkPage"
msgid "Add a Bridge:"
-msgstr "Pridať prem.:"
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "<a href=\"bridges.finding\">How do I find a bridge?</a>"
+msgstr ""
msgctxt "NetworkPage"
msgid "Remove the selected bridges from the list"
@@ -2657,222 +2481,192 @@ msgid "<a href=\"bridges.finding\">How can I find bridges?</a>"
msgstr ""
msgctxt "NetworkPage"
-msgid ""
-"No new bridges are currently available. You can either wait a while and try "
-"again, or try another method of finding new bridges."
+msgid "No new bridges are currently available. You can either wait a while and try again, or try another method of finding new bridges."
msgstr ""
msgctxt "NetworkPage"
msgid "Click Help to see other methods of finding new bridges."
msgstr ""
-msgctxt "NetworkPage"
-msgid "Address:"
-msgstr "Adresa:"
-
-msgctxt "NetworkPage"
-msgid "Type:"
-msgstr "Typ:"
-
-msgctxt "NetworkPage"
-msgid "You must select the proxy type."
-msgstr "Musíte zvoliť typ proxy."
-
-msgctxt "NetworkPage"
-msgid "SOCKS 4"
-msgstr "SOCKS 4"
-
-msgctxt "NetworkPage"
-msgid "SOCKS 5"
-msgstr "SOCKS 5"
-
-msgctxt "NetworkPage"
-msgid "HTTP / HTTPS"
-msgstr "HTTP / HTTPS"
-
-msgctxt "NetworkPage"
-msgid "You must specify one or more bridges."
-msgstr ""
-
msgctxt "Policy"
msgid "accept"
-msgstr "akceptovať"
+msgstr ""
msgctxt "Policy"
msgid "reject"
-msgstr "zamietnúť"
+msgstr ""
msgctxt "RouterDescriptor"
msgid "Online"
-msgstr "Zapojený"
+msgstr ""
msgctxt "RouterDescriptor"
msgid "Hibernating"
-msgstr "Hybernácia"
+msgstr ""
msgctxt "RouterDescriptor"
msgid "Offline"
-msgstr "Odpojený"
+msgstr ""
msgctxt "RouterDescriptorView"
msgid "Location:"
-msgstr "Umiestnenie:"
+msgstr ""
msgctxt "RouterDescriptorView"
msgid "IP Address:"
-msgstr "IP Adresa:"
+msgstr ""
msgctxt "RouterDescriptorView"
msgid "Platform:"
-msgstr "Platforma:"
+msgstr ""
msgctxt "RouterDescriptorView"
msgid "Bandwidth:"
-msgstr "Šírka pásma:"
+msgstr ""
msgctxt "RouterDescriptorView"
msgid "Uptime:"
-msgstr "Čas prevádzky:"
+msgstr ""
msgctxt "RouterDescriptorView"
msgid "Last Updated:"
-msgstr "Naposledy aktualizované:"
+msgstr ""
msgctxt "RouterDescriptorView"
msgid "Copy"
-msgstr "Kopírovať"
+msgstr ""
msgctxt "RouterInfoDialog"
msgid "Hibernating"
-msgstr "Uspať"
+msgstr ""
msgctxt "RouterInfoDialog"
msgid "Online"
-msgstr "Pripojený"
+msgstr ""
msgctxt "RouterInfoDialog"
msgid "Offline"
-msgstr "Odpojený"
+msgstr ""
msgctxt "RouterInfoDialog"
msgid "Unknown"
-msgstr "Neznámy"
+msgstr ""
msgctxt "RouterInfoDialog"
msgid "Relay Details"
-msgstr "Podrobnosti o uzle"
+msgstr ""
msgctxt "RouterInfoDialog"
msgid "Summary"
-msgstr "Zhrnutie"
+msgstr ""
msgctxt "RouterInfoDialog"
msgid "Name:"
-msgstr "Meno:"
+msgstr ""
msgctxt "RouterInfoDialog"
msgid "Status:"
-msgstr "Stav:"
+msgstr ""
msgctxt "RouterInfoDialog"
msgid "Location:"
-msgstr "Umiestnenie:"
+msgstr ""
msgctxt "RouterInfoDialog"
msgid "IP Address:"
-msgstr "IP Adresa:"
+msgstr ""
msgctxt "RouterInfoDialog"
msgid "Platform:"
-msgstr "Platforma:"
+msgstr ""
msgctxt "RouterInfoDialog"
msgid "Bandwidth:"
-msgstr "Šírka pásma:"
+msgstr ""
msgctxt "RouterInfoDialog"
msgid "Uptime:"
-msgstr "Doba prevádzky:"
+msgstr ""
msgctxt "RouterInfoDialog"
msgid "Contact:"
-msgstr "Kontakt:"
+msgstr ""
msgctxt "RouterInfoDialog"
msgid "Last Updated:"
-msgstr "Naposledy aktualizované:"
+msgstr ""
msgctxt "RouterInfoDialog"
msgid "Descriptor"
-msgstr "Deskriptor"
+msgstr ""
msgctxt "RouterListItem"
msgid "Offline"
-msgstr "Odpojený"
+msgstr ""
msgctxt "RouterListItem"
msgid "Hibernating"
-msgstr "Uspať"
+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 "Priblížiť relay"
+msgstr ""
msgctxt "RouterListWidget"
msgid "%1 relays online"
-msgstr "%1 pripojených relay"
+msgstr ""
msgctxt "RouterListWidget"
msgid "Copy"
-msgstr "Kopírovať"
+msgstr ""
msgctxt "RouterListWidget"
msgid "Nickname"
-msgstr "Prezývka"
+msgstr ""
msgctxt "RouterListWidget"
msgid "Fingerprint"
-msgstr "Odtlačok prsta"
+msgstr ""
msgctxt "ServerPage"
msgid "Bridge Support Unavailable"
-msgstr "Podpora mostov nie je dostupná"
+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 "Nakonfigurovali ste Tor tak, aby používal mostové relé pre cenzurovaných používateľov, ale Vaša verzia nepodporuje použitie mostov."
+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 "Prosím aktualizujte Váš softvér Tor alebo ho nastavte tak, aby sa choval ako normálne Tor relé."
+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 "Vaše mostové relé nie je spustené."
+msgstr ""
msgctxt "ServerPage"
msgid "You must specify at least a relay nickname and port."
-msgstr "Musíte uviesť aspoň prezývku relé a port."
+msgstr ""
msgctxt "ServerPage"
msgid "Run as a client only"
-msgstr "Pracovať iba ako klient"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network"
+msgstr ""
msgctxt "ServerPage"
msgid "Relay Port:"
-msgstr "Port relé:"
+msgstr ""
msgctxt "ServerPage"
msgid "Enable to mirror the relay directory"
@@ -2884,7 +2678,7 @@ msgstr ""
msgctxt "ServerPage"
msgid "Test"
-msgstr "Test"
+msgstr ""
msgctxt "ServerPage"
msgid "Show help topic on port forwarding"
@@ -2912,41 +2706,39 @@ msgstr ""
msgctxt "ServerPage"
msgid "Nickname:"
-msgstr "Prezývka:"
+msgstr ""
msgctxt "ServerPage"
msgid "Basic Settings"
-msgstr "Základné nastavenia"
+msgstr ""
msgctxt "ServerPage"
-msgid ""
-"For Internet connections with fast download speed but slow upload, please "
-"list your upload speed here."
-msgstr "Ak máte pripojenie s rýchlym downloadom, ale pomalým uploadom, tak tu vyberte zo zoznamu rýchlosť Vášho uploadu."
+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 "Vlastné"
+msgstr ""
msgctxt "ServerPage"
msgid "Select the entry that most closely resembles your Internet connection"
@@ -2966,7 +2758,7 @@ msgstr ""
msgctxt "ServerPage"
msgid "KB/s"
-msgstr "KB/s"
+msgstr ""
msgctxt "ServerPage"
msgid "Maximum Rate"
@@ -2977,9 +2769,7 @@ msgid "Peak bandwidth rate limit"
msgstr ""
msgctxt "ServerPage"
-msgid ""
-"Your maximum bandwidth rate must be greater than or equal to your average "
-"bandwidth rate. Both values must be at least 20 KB/s."
+msgid "Your maximum bandwidth rate must be greater than or equal to your average bandwidth rate. Both values must be at least 20 KB/s."
msgstr ""
msgctxt "ServerPage"
@@ -2988,19 +2778,19 @@ msgstr ""
msgctxt "ServerPage"
msgid "Ports 6660 - 6669 and 6697"
-msgstr "Porty 6660 - 6669 a 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 "Porty 110, 143, 993 a 995"
+msgstr ""
msgctxt "ServerPage"
msgid "Retrieve Mail (POP, IMAP)"
-msgstr "Príjem emailov (POP, IMAP)"
+msgstr ""
msgctxt "ServerPage"
msgid "Ports unspecified by other checkboxes"
@@ -3012,41 +2802,38 @@ msgstr ""
msgctxt "ServerPage"
msgid "Ports 706, 1863, 5050, 5190, 5222, 5223, 8300 and 8888"
-msgstr "Porty 706, 1863, 5050, 5190, 5222, 5223, 8300 a 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 "Bezpečné webstránky (SSL)"
+msgstr ""
msgctxt "ServerPage"
msgid "Port 80"
-msgstr "Port 80"
+msgstr ""
msgctxt "ServerPage"
msgid "Websites"
-msgstr "Webstránky"
+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?"
+msgid "What Internet resources should users be able to access from your relay?"
msgstr ""
msgctxt "ServerPage"
-msgid ""
-"Tor will still block some outgoing mail and file sharing applications by "
-"default to reduce spam and other abuse."
+msgid "Tor will still block some outgoing mail and file sharing applications by default to reduce spam and other abuse."
msgstr ""
msgctxt "ServerPage"
@@ -3058,13 +2845,12 @@ 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 "Toto je identita Vášho mostu, ktorú môžete poslať ostatným užívateľom"
+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 "Skopírujte identitu Vášho mostu do schránky"
+msgstr ""
msgctxt "ServerPage"
msgid "No Recent Usage"
@@ -3072,54 +2858,34 @@ msgstr ""
msgctxt "ServerPage"
msgid "No clients have used your relay recently."
-msgstr "V poslednej dobe nik nepoužil Vaše relé."
+msgstr ""
msgctxt "ServerPage"
-msgid ""
-"Leave your relay running so clients have a better chance of finding and "
-"using it."
-msgstr "Ak necháte Vaše relé zapnuté, tak klienti budú mať väčšiu šancu, že ho nájdu a použijú."
+msgid "Leave your relay running so clients have a better chance of finding and using it."
+msgstr ""
msgctxt "ServerPage"
msgid "Bridge History"
-msgstr "História mostu"
+msgstr ""
msgctxt "ServerPage"
msgid "Vidalia was unable to retrieve your bridge's usage history."
msgstr ""
msgctxt "ServerPage"
-msgid ""
-"Tor returned an improperly formatted response when Vidalia requested your "
-"bridge's usage history."
+msgid "Tor returned an improperly formatted response when Vidalia requested your bridge's usage history."
msgstr ""
msgctxt "ServerPage"
msgid "The returned response was: %1"
-msgstr "Vrátená odpoveď bola: %1"
+msgstr ""
msgctxt "ServerPage"
msgid "Help censored users reach the Tor network"
-msgstr "Pomôžte cenzurovaným užívateľom pripojiť sa na sieť Tor"
-
-msgctxt "ServerPage"
-msgid "<a href=\"#bridgeUsage\">Who has used my bridge?</a>"
-msgstr "<a href=\"#bridgeUsage\">Kto použil môj most?</a>"
-
-msgctxt "ServerPage"
-msgid "<a href=\"#bridgeHelp\">What's this?</a>"
-msgstr "<a href=\"#bridgeHelp\">Čo je to?</a>"
-
-msgctxt "ServerPage"
-msgid "Automatically distribute my bridge address"
-msgstr "Automaticky rozoslať adresu môjho mostu"
-
-msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network (exit relay)"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic inside the Tor network (non-exit relay)"
+msgid "<a href=\"#bridgeUsage\">Who has used my bridge?</a>"
msgstr ""
msgctxt "ServerPage"
@@ -3127,28 +2893,25 @@ msgid "Mirror the Relay Directory"
msgstr ""
msgctxt "ServerPage"
-msgid ""
-"Email address at which you may be reached if there is a\n"
+msgid "Email address at which you may be reached if there is a\n"
"problem with your relay. You might also include your PGP or GPG fingerprint."
msgstr ""
msgctxt "ServicePage"
msgid "Error while trying to unpublish all services"
-msgstr "Chyba pri odhlásení všetkých služieb"
+msgstr ""
msgctxt "ServicePage"
-msgid ""
-"Please configure at least a service directory and a virtual port for each "
-"service you want to save. Remove the other ones."
+msgid "Please configure at least a service directory and a virtual port for each service you want to save. Remove the other ones."
msgstr ""
msgctxt "ServicePage"
msgid "Error"
-msgstr "Chyba"
+msgstr ""
msgctxt "ServicePage"
msgid "Please select a Service."
-msgstr "Prosím vyberte službu"
+msgstr ""
msgctxt "ServicePage"
msgid "Select Service Directory"
@@ -3156,430 +2919,123 @@ msgstr ""
msgctxt "ServicePage"
msgid "Virtual Port may only contain valid port numbers [1..65535]."
-msgstr "Virtuálny port môže obsahovať iba povole čísla portov [1..65535]."
+msgstr ""
msgctxt "ServicePage"
msgid "Target may only contain address:port, address, or port."
-msgstr "Cieľ môže obsahovať iba adresu:port, adresu alebo port."
+msgstr ""
msgctxt "ServicePage"
msgid "Directory already in use by another service."
-msgstr "Adresár už používa iná služba."
+msgstr ""
msgctxt "ServicePage"
msgid "Form"
-msgstr "Formulár"
+msgstr ""
msgctxt "ServicePage"
msgid "Provided Hidden Services"
-msgstr "Poskytované skryté služby"
+msgstr ""
msgctxt "ServicePage"
msgid "Onion Address"
-msgstr "Onion adresa"
+msgstr ""
msgctxt "ServicePage"
msgid "Virtual Port"
-msgstr "Virtuálny port"
+msgstr ""
msgctxt "ServicePage"
msgid "Target"
-msgstr "Cieľ"
+msgstr ""
msgctxt "ServicePage"
msgid "Directory Path"
-msgstr "Cesta k adresáru"
+msgstr ""
msgctxt "ServicePage"
msgid "Enabled"
-msgstr "Povolený"
+msgstr ""
msgctxt "ServicePage"
msgid "Add new service to list"
-msgstr "Pridať novú službu do zoznamu"
+msgstr ""
msgctxt "ServicePage"
msgid "Remove selected service from list"
-msgstr "Odstrániť vybranú službu zo zoznamu"
+msgstr ""
msgctxt "ServicePage"
msgid "Copy onion address of selected service to clipboard"
-msgstr "Kopírovať onion adresu vybranej služby do schránky"
+msgstr ""
msgctxt "ServicePage"
msgid "Browse in local file system and choose directory for selected service"
-msgstr "Prehľadajte lokálny súborový systém a vyberte adresár pre vybratú službu"
+msgstr ""
msgctxt "ServicePage"
msgid "Created by Tor"
-msgstr "Vyrobil Tor"
-
-msgctxt "StatusEventWidget"
-msgid "Copy to Clipboard"
-msgstr "Kopírovať do schránky"
-
-msgctxt "StatusEventWidget"
-msgid "The Tor Software is Running"
-msgstr "Softvér Tor je spustený"
-
-msgctxt "StatusEventWidget"
-msgid "You are currently running version \"%1\" of the Tor software."
-msgstr "Softvér Tor je vo verzií \"%1\""
-
-msgctxt "StatusEventWidget"
-msgid "The Tor Software is not Running"
-msgstr "Softvér Tor nie je spustený"
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Click \"Start Tor\" in the Vidalia Control Panel to restart the Tor "
-"software. If Tor exited unexpectedly, select the \"Advanced\" tab above for "
-"details about any errors encountered."
-msgstr "Softvér Tor reštartujete, ak na ovládacom paneli Vidialie stlačíte \"Spustiť Tor\". Ak Tor skončil neočakávane, tak záložke \"Pokročilé\" nájdete podrobnosti všetkých zistených chybách."
-
-msgctxt "StatusEventWidget"
-msgid ""
-"You are currently running version \"%1\" of the Tor software, which is no "
-"longer recommended. Please upgrade to the most recent version of the "
-"software, which may contain important security, reliability and performance "
-"fixes."
-msgstr "Práve používate verziu \"%1\" softvéru Tor, ktorá sa už neodporúča používať. Aktualizujte Tor na najnovšiu verziu, ktorá môže obsahovať dôležité opravy, ktoré zlepšujú bezpečnosť, stabilitu a výkon."
-
-msgctxt "StatusEventWidget"
-msgid ""
-"You are currently running version \"%1\" of the Tor software, which may no "
-"longer work with the current Tor network. Please upgrade to the most recent "
-"version of the software, which may contain important security, reliability "
-"and performance fixes."
-msgstr "Práve používate verziu \"%1\" softvéru Tor, ktorá nemusí pracovať so súčasnou sieťou Tor. Aktualizujte Tor na najnovšiu verziu, ktorá môže obsahovať dôležité opravy, ktoré zlepšujú bezpečnosť, stabilitu a výkon."
-
-msgctxt "StatusEventWidget"
-msgid "Your Tor Software is Out-of-date"
-msgstr "Softvér Tor je neaktuálny"
-
-msgctxt "StatusEventWidget"
-msgid "Connected to the Tor Network"
-msgstr "Ste pripojený k sieti Tor"
-
-msgctxt "StatusEventWidget"
-msgid ""
-"We were able to successfully establish a connection to the Tor network. You "
-"can now configure your applications to use the Internet anonymously."
-msgstr "Úspešne sa podarilo pripojiť k sieti Tor. "
-
-msgctxt "StatusEventWidget"
-msgid "Tor Software Error"
-msgstr "Chyba softvéru Tor"
-
-msgctxt "StatusEventWidget"
-msgid ""
-"The Tor software encountered an internal bug. Please report the following "
-"error message to the Tor developers at bugs.torproject.org: \"%1\""
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Tor has determined that your computer's clock may be set to %1 seconds in "
-"the past compared to the source \"%2\". If your clock is not correct, Tor "
-"will not be able to function. Please verify your computer displays the "
-"correct time."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Tor has determined that your computer's clock may be set to %1 seconds in "
-"the future compared to the source \"%2\". If your clock is not correct, Tor "
-"will not be able to function. Please verify your computer displays the "
-"correct time."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Your Computer's Clock is Potentially Incorrect"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"One of the applications on your computer may have attempted to make an "
-"unencrypted connection through Tor to port %1. Sending unencrypted "
-"information over the Tor network is dangerous and not recommended. For your "
-"protection, Tor has automatically closed this connection."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"One of the applications on your computer may have attempted to make an "
-"unencrypted connection through Tor to port %1. Sending unencrypted "
-"information over the Tor network is dangerous and not recommended."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Potentially Dangerous Connection!"
-msgstr "Potenciálne nebezpečné pripojenie!"
-
-msgctxt "StatusEventWidget"
-msgid ""
-"One of your applications established a connection through Tor to \"%1\" "
-"using a protocol that may leak information about your destination. Please "
-"ensure you configure your applications to use only SOCKS4a or SOCKS5 with "
-"remote hostname resolution."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Unknown SOCKS Protocol"
-msgstr "Neznámy SOCKS protokol"
-
-msgctxt "StatusEventWidget"
-msgid ""
-"One of your applications tried to establish a connection through Tor using a"
-" protocol that Tor does not understand. Please ensure you configure your "
-"applications to use only SOCKS4a or SOCKS5 with remote hostname resolution."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Invalid Destination Hostname"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"One of your applications tried to establish a connection through Tor to "
-"\"%1\", which Tor does not recognize as a valid hostname. Please check your "
-"application's configuration."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "External IP Address Changed"
-msgstr "Bola zmenená externá IP adresa"
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Tor has determined your relay's public IP address is currently %1%2. If that"
-" is not correct, please consider setting the 'Address' option in your "
-"relay's configuration."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "DNS Hijacking Detected"
-msgstr "Zistený DNS Hijacking"
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Tor detected that your DNS provider is providing false responses for domains"
-" that do not exist. Some ISPs and other DNS providers, such as OpenDNS, are "
-"known to do this in order to display their own search or advertising pages."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Tor detected that your DNS provider is providing false responses for well "
-"known domains. Since clients rely on Tor network relays to provide accurate "
-"DNS repsonses, your relay will not be configured as an exit relay."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Checking Server Port Reachability"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Tor is trying to determine if your relay's server port is reachable from the"
-" Tor network by connecting to itself at %1:%2. This test could take several "
-"minutes."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Server Port Reachability Test Successful!"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Your relay's server port is reachable from the Tor network!"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Server Port Reachability Test Failed"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Your relay's server port is not reachable by other Tor clients. This can "
-"happen if you are behind a router or firewall that requires you to set up "
-"port forwarding. If %1:%2 is not your correct IP address and server port, "
-"please check your relay's configuration."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Checking Directory Port Reachability"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Tor is trying to determine if your relay's directory port is reachable from "
-"the Tor network by connecting to itself at %1:%2. This test could take "
-"several minutes."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Directory Port Reachability Test Successful!"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Your relay's directory port is reachable from the Tor network!"
msgstr ""
-msgctxt "StatusEventWidget"
-msgid "Directory Port Reachability Test Failed"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Your relay's directory port is not reachable by other Tor clients. This can "
-"happen if you are behind a router or firewall that requires you to set up "
-"port forwarding. If %1:%2 is not your correct IP address and directory port,"
-" please check your relay's configuration."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Relay Descriptor Rejected"
-msgstr "Relay deskriptor bol odmietnutý"
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Your relay's descriptor, which enables clients to connect to your relay, was"
-" rejected by the directory server at %1:%2. The reason given was: %3"
-msgstr "Váš relay deskriptor, ktorý povoľuje klientom pripojenie k Vášmu relay, bol odmietnutý adresárovým serverom %1:%2. Dôvodom bolo: %3"
-
-msgctxt "StatusEventWidget"
-msgid "Your Relay is Online"
-msgstr "Vaše relay je online"
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Your relay is now online and available for Tor clients to use. You should "
-"see an increase in network traffic shown by the Bandwidth Graph within a few"
-" hours as more clients learn about your relay. Thank you for contributing to"
-" the Tor network!"
-msgstr "Vaše relay je teraz online a k dispozícií na používanie Tor klientom. Behom nasledujúcich hodín by ste mali zaznamenať zvýšenú sieťovú aktivitu v Prevádzkovom grafe. Ďakujeme, že prispievate do siete Tor!"
-
msgctxt "Stream"
msgid "New"
-msgstr "Nový"
+msgstr ""
msgctxt "Stream"
msgid "Resolving"
-msgstr "Resolving"
+msgstr ""
msgctxt "Stream"
msgid "Connecting"
-msgstr "Pripojiť"
+msgstr ""
msgctxt "Stream"
msgid "Open"
-msgstr "Otvoriť"
+msgstr ""
msgctxt "Stream"
msgid "Failed"
-msgstr "Zlyhalo"
+msgstr ""
msgctxt "Stream"
msgid "Closed"
-msgstr "Zatvoriť"
+msgstr ""
msgctxt "Stream"
msgid "Retrying"
-msgstr "Opakovať"
+msgstr ""
msgctxt "Stream"
msgid "Remapped"
-msgstr "Remapped"
+msgstr ""
msgctxt "Stream"
msgid "Unknown"
-msgstr "Neznáme"
+msgstr ""
msgctxt "TorProcess"
msgid "Process %1 failed to stop. [%2]"
-msgstr "Proces %1 sa neukončil. [%2]"
+msgstr ""
msgctxt "TorService"
msgid "The Tor service is not installed."
-msgstr "Služba Tor nie je nainštalovaná."
+msgstr ""
msgctxt "TorService"
msgid "Unable to start the Tor service."
-msgstr "Služba Tor sa nedá spustiť."
+msgstr ""
msgctxt "TorSettings"
msgid "Failed to hash the control password."
-msgstr "Nepodaril sa hash kontrolného hesla."
-
-msgctxt "TorrcDialog"
-msgid "Editing torrc"
-msgstr "Upraviť torrc"
-
-msgctxt "TorrcDialog"
-msgid ""
-"Save settings. If unchecked it will only apply settings to the current Tor "
-"instance."
-msgstr "Uložiť nastavenia. Ak to bude neoznačené, tak sa to bude vzťahovať iba na súčasnú Tor inštanciu."
-
-msgctxt "TorrcDialog"
-msgid "Cut"
-msgstr "Vystrihnúť"
-
-msgctxt "TorrcDialog"
-msgid "Copy"
-msgstr "Kopírovať"
-
-msgctxt "TorrcDialog"
-msgid "Paste"
-msgstr "Vložiť"
-
-msgctxt "TorrcDialog"
-msgid "Undo"
-msgstr "Späť"
-
-msgctxt "TorrcDialog"
-msgid "Redo"
-msgstr "Obnoviť"
-
-msgctxt "TorrcDialog"
-msgid "Select All"
-msgstr "Označiť všetko"
-
-msgctxt "TorrcDialog"
-msgid "Apply all"
-msgstr "Použiť všetko"
-
-msgctxt "TorrcDialog"
-msgid "Apply selection only"
-msgstr "Použiť iba vybrané"
-
-msgctxt "TorrcDialog"
-msgid "Error connecting to Tor"
-msgstr "Pri pripojení na Tor nastala chyba"
-
-msgctxt "TorrcDialog"
-msgid "Selection is empty. Please select some text, or check \"Apply all\""
-msgstr "Výber je prázdny. Prosím označte nejaký text alebo zaškrtnite \"Použiť všetko\""
-
-msgctxt "TorrcDialog"
-msgid "Error at line %1: \"%2\""
-msgstr "Chyba na riadku %1: \"%2\""
-
-msgctxt "TorrcDialog"
-msgid "Error"
-msgstr "Chyba"
-
-msgctxt "TorrcDialog"
-msgid "An error ocurred while opening torrc file"
-msgstr "Pri otváraní torrc súboru nastala chyba"
+msgstr ""
msgctxt "UPNPControl"
msgid "Success"
-msgstr "Úspech"
+msgstr ""
msgctxt "UPNPControl"
msgid "No UPnP-enabled devices found"
-msgstr "Nenašli sa žiadne UPnP zariadenia"
+msgstr ""
msgctxt "UPNPControl"
msgid "No valid UPnP-enabled Internet gateway devices found"
@@ -3587,7 +3043,7 @@ msgstr ""
msgctxt "UPNPControl"
msgid "WSAStartup failed"
-msgstr "Zlyhal WSAStartup"
+msgstr ""
msgctxt "UPNPControl"
msgid "Failed to add a port mapping"
@@ -3603,7 +3059,7 @@ msgstr ""
msgctxt "UPNPControl"
msgid "Unknown error"
-msgstr "Neznáma chyba"
+msgstr ""
msgctxt "UPNPTestDialog"
msgid "Discovering UPnP-enabled devices"
@@ -3630,15 +3086,11 @@ msgid "Testing Universal Plug & Play Support"
msgstr ""
msgctxt "UpdateProcess"
-msgid ""
-"Vidalia was unable to check for available software updates because it could "
-"not find '%1'."
+msgid "Vidalia was unable to check for available software updates because it could not find '%1'."
msgstr ""
msgctxt "UpdateProcess"
-msgid ""
-"Vidalia was unable to check for available software updates because Tor's "
-"update process exited unexpectedly."
+msgid "Vidalia was unable to check for available software updates because Tor's update process exited unexpectedly."
msgstr ""
msgctxt "UpdateProgressDialog"
@@ -3647,119 +3099,119 @@ msgstr ""
msgctxt "UpdateProgressDialog"
msgid "Hide"
-msgstr "Skryť"
+msgstr ""
msgctxt "UpdateProgressDialog"
msgid "Downloading updates..."
-msgstr "Sťahovanie aktualizácií..."
+msgstr ""
msgctxt "UpdateProgressDialog"
msgid "Installing updated software..."
-msgstr "Inštalácia aktualizácie softvéru..."
+msgstr ""
msgctxt "UpdateProgressDialog"
msgid "Done! Your software is now up to date."
-msgstr "Hotovo! Váš softvér je aktuálny."
+msgstr ""
msgctxt "UpdateProgressDialog"
msgid "OK"
-msgstr "OK"
+msgstr ""
msgctxt "UpdateProgressDialog"
msgid "Software Updates"
-msgstr "Softvérové aktualizácie"
+msgstr ""
msgctxt "UpdateProgressDialog"
msgid "Checking for updates..."
-msgstr "Vyhľadať aktualizácie..."
+msgstr ""
msgctxt "UpdateProgressDialog"
msgid "Cancel"
-msgstr "Zrušiť"
+msgstr ""
msgctxt "UpdatesAvailableDialog"
msgid "Software Updates Available"
-msgstr "Sú dostupné softvérové aktualizácie"
+msgstr ""
msgctxt "UpdatesAvailableDialog"
msgid "Remind Me Later"
-msgstr "Pripomenúť neskôr"
+msgstr ""
msgctxt "UpdatesAvailableDialog"
msgid "Install"
-msgstr "Inštalovať"
+msgstr ""
msgctxt "UpdatesAvailableDialog"
msgid "The following updated software packages are ready for installation:"
-msgstr "Nasledovné aktualizované softvérové balíky sú pripravené na inštaláciu:"
+msgstr ""
msgctxt "UpdatesAvailableDialog"
msgid "Package"
-msgstr "Balík"
+msgstr ""
msgctxt "UpdatesAvailableDialog"
msgid "Version"
-msgstr "Verzia"
+msgstr ""
msgctxt "VMessageBox"
msgid "OK"
-msgstr "OK"
+msgstr ""
msgctxt "VMessageBox"
msgid "Cancel"
-msgstr "Zrušiť"
+msgstr ""
msgctxt "VMessageBox"
msgid "Yes"
-msgstr "Áno"
+msgstr ""
msgctxt "VMessageBox"
msgid "No"
-msgstr "Nie"
+msgstr ""
msgctxt "VMessageBox"
msgid "Help"
-msgstr "Pomocník"
+msgstr ""
msgctxt "VMessageBox"
msgid "Retry"
-msgstr "Opakovať"
+msgstr ""
msgctxt "VMessageBox"
msgid "Show Log"
-msgstr "Zobraziť Log"
+msgstr ""
msgctxt "VMessageBox"
msgid "Show Settings"
-msgstr "Zobraziť Nastavenia"
+msgstr ""
msgctxt "VMessageBox"
msgid "Continue"
-msgstr "Pokračovať"
+msgstr ""
msgctxt "VMessageBox"
msgid "Quit"
-msgstr "Ukončiť"
+msgstr ""
msgctxt "VMessageBox"
msgid "Browse"
-msgstr "Prehliadať"
+msgstr ""
msgctxt "Vidalia"
msgid "Invalid Argument"
-msgstr "Neplatný Argument"
+msgstr ""
msgctxt "Vidalia"
msgid "Vidalia is already running"
-msgstr "Vidalia už beží"
+msgstr ""
msgctxt "Vidalia"
msgid "Displays this usage message and exits."
-msgstr "Zobraziť túto správu a skončiť."
+msgstr ""
msgctxt "Vidalia"
msgid "Resets ALL stored Vidalia settings."
-msgstr "Resetovať VŠETKY uložené nastavenia Vidalia"
+msgstr ""
msgctxt "Vidalia"
msgid "Sets the directory Vidalia uses for data files."
@@ -3767,7 +3219,7 @@ msgstr ""
msgctxt "Vidalia"
msgid "Sets the name and location of Vidalia's pidfile."
-msgstr "Nastaviť názov a umiestnenie pre Vidalia pidfile."
+msgstr ""
msgctxt "Vidalia"
msgid "Sets the name and location of Vidalia's logfile."
@@ -3775,75 +3227,70 @@ msgstr ""
msgctxt "Vidalia"
msgid "Sets the verbosity of Vidalia's logging."
-msgstr "Nastaví podrobnosť záznamov Vidalie"
+msgstr ""
msgctxt "Vidalia"
msgid "Sets Vidalia's interface style."
-msgstr "Nastaví vzhľad Vidalie"
+msgstr ""
msgctxt "Vidalia"
msgid "Sets Vidalia's language."
-msgstr "Nastaví jazyk Vidalie"
+msgstr ""
msgctxt "Vidalia"
msgid "Vidalia Usage Information"
-msgstr "Informácie o používaní Vidalie"
+msgstr ""
msgctxt "Vidalia"
msgid "Unable to open log file '%1': %2"
-msgstr "Nepodarilo sa otvoriť log súbor '%1': %2"
-
-msgctxt "Vidalia"
-msgid "Value required for parameter :"
-msgstr "Parameter vyžaduje hodnotu:"
+msgstr ""
msgctxt "Vidalia"
msgid "Invalid language code specified:"
-msgstr "Neplatný kód jazyka:"
+msgstr ""
msgctxt "Vidalia"
msgid "Invalid GUI style specified:"
-msgstr "Neplatná špecifikácia štýlu grafického rozhrania:"
+msgstr ""
msgctxt "Vidalia"
msgid "Invalid log level specified:"
-msgstr "Neplatná úroveň logov:"
+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 "Pravdepodobne beží ďalší proces Vidalia. Pokiaľ ďalší proces Vidalia nebeží, tak môžete pokračovať ďalej.\n\nPrajete si aj tak spustiť Vidalia?"
+msgstr ""
msgctxt "stringutil.h"
msgid "%1 secs"
-msgstr "%1 sekúnd"
+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 dní"
+msgstr ""
msgctxt "stringutil.h"
msgid "%1 hours"
-msgstr "%1 hodín"
+msgstr ""
msgctxt "stringutil.h"
msgid "%1 mins"
-msgstr "%1 minút"
+msgstr ""
diff --git a/src/vidalia/i18n/po/sl/qt_sl.po b/src/vidalia/i18n/po/sl/qt_sl.po
index 0a94162..2d42daa 100644
--- a/src/vidalia/i18n/po/sl/qt_sl.po
+++ b/src/vidalia/i18n/po/sl/qt_sl.po
@@ -1,12 +1,10 @@
-# Translators:
-# Translators:
-# runasand <runa.sandvik at gmail.com>, 2011.
+#
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-08-20 03:25+0000\n"
-"PO-Revision-Date: 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"
diff --git a/src/vidalia/i18n/po/sl/vidalia_sl.po b/src/vidalia/i18n/po/sl/vidalia_sl.po
index 8262c73..a464ed1 100644
--- a/src/vidalia/i18n/po/sl/vidalia_sl.po
+++ b/src/vidalia/i18n/po/sl/vidalia_sl.po
@@ -1,201 +1,174 @@
-#
-# Translators:
msgid ""
msgstr ""
-"Project-Id-Version: The Tor Project\n"
-"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-09-07 14:40+0000\n"
-"PO-Revision-Date: 2010-12-05 20:03+0000\n"
-"Last-Translator: \n"
-"Language-Team: translations at vidalia-project.net\n"
+"Project-Id-Version: Vidalia\n"
+"Report-Msgid-Bugs-To: translations at vidalia-project.net\n"
+"POT-Creation-Date: 2009-04-10 22:39+0000\n"
+"PO-Revision-Date: 2008-08-03 21:59+0000\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: sl\n"
-"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3)\n"
+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n"
+"%100==4 ? 2 : 3);\n"
"X-Generator: Vidalia ts2po 0.2\n"
+#: aboutdialog.ui:28
msgctxt "AboutDialog"
msgid "About Vidalia"
msgstr ""
+#: aboutdialog.cpp:34
msgctxt "AboutDialog"
msgid "License"
msgstr ""
+#: aboutdialog.ui:63
msgctxt "AboutDialog"
msgid "Vidalia 0.2.0"
msgstr ""
+#: aboutdialog.ui:73
msgctxt "AboutDialog"
msgid "Tor 0.2.0.32"
msgstr ""
+#: aboutdialog.ui:88
msgctxt "AboutDialog"
msgid "Qt 4.4.2"
msgstr ""
+#: advancedpage.cpp:109
msgctxt "AdvancedPage"
msgid "'%1' is not a valid IP address."
msgstr ""
+#: advancedpage.cpp:120
msgctxt "AdvancedPage"
-msgid ""
-"You selected 'Password' authentication, but did not specify a password."
+msgid "You selected 'Password' authentication, but did not specify a password."
msgstr ""
+#: advancedpage.cpp:223
msgctxt "AdvancedPage"
msgid "Select Tor Configuration File"
msgstr ""
+#: advancedpage.cpp:236
msgctxt "AdvancedPage"
msgid "File Not Found"
msgstr ""
+#: advancedpage.cpp:238
msgctxt "AdvancedPage"
msgid "%1 does not exist. Would you like to create it?"
msgstr ""
+#: advancedpage.cpp:249
msgctxt "AdvancedPage"
msgid "Failed to Create File"
msgstr ""
+#: advancedpage.cpp:250
msgctxt "AdvancedPage"
msgid "Unable to create %1 [%2]"
msgstr ""
+#: advancedpage.cpp:265
msgctxt "AdvancedPage"
msgid "Select a Directory to Use for Tor Data"
msgstr ""
+#: advancedpage.cpp:287
msgctxt "AdvancedPage"
msgid "Unable to remove Tor Service"
msgstr ""
+#: advancedpage.cpp:298
msgctxt "AdvancedPage"
msgid "Unable to install Tor Service"
msgstr ""
+#: advancedpage.cpp:299
msgctxt "AdvancedPage"
msgid "Vidalia was unable to install the Tor service."
msgstr ""
+#: advancedpage.ui:28
+msgctxt "AdvancedPage"
+msgid "Control Port"
+msgstr ""
+
+#: advancedpage.ui:48
msgctxt "AdvancedPage"
msgid "Authentication:"
msgstr ""
+#: advancedpage.ui:58
msgctxt "AdvancedPage"
msgid "Address:"
msgstr ""
+#: advancedpage.ui:86
msgctxt "AdvancedPage"
msgid "None"
msgstr ""
+#: advancedpage.ui:91
msgctxt "AdvancedPage"
msgid "Cookie"
msgstr ""
+#: advancedpage.ui:96
msgctxt "AdvancedPage"
msgid "Password"
msgstr ""
+#: advancedpage.ui:111
msgctxt "AdvancedPage"
msgid "Randomly Generate"
msgstr ""
+#: advancedpage.ui:157
msgctxt "AdvancedPage"
msgid ":"
msgstr ""
+#: advancedpage.ui:219
msgctxt "AdvancedPage"
msgid "Tor Configuration File"
msgstr ""
+#: advancedpage.ui:240
msgctxt "AdvancedPage"
msgid "Start the Tor software with the specified configuration file (torrc)"
msgstr ""
+#: advancedpage.ui:259
msgctxt "AdvancedPage"
msgid "Select path to your configuration file"
msgstr ""
+#: advancedpage.ui:318
msgctxt "AdvancedPage"
msgid "Browse"
msgstr ""
+#: advancedpage.ui:275
msgctxt "AdvancedPage"
msgid "Data Directory"
msgstr ""
+#: advancedpage.ui:296
msgctxt "AdvancedPage"
msgid "Store data for the Tor software in the following directory"
msgstr ""
+#: advancedpage.ui:315
msgctxt "AdvancedPage"
msgid "Select the directory used to store data for the Tor software"
msgstr ""
-msgctxt "AdvancedPage"
-msgid "Tor Control"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "Use TCP connection (ControlPort)"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "Path:"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "Use Unix domain socket (ControlSocket)"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "Edit current torrc"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "NOTE: this will edit the currently loaded torrc"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "ControlSocket path doesn't exist."
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid ""
-"The specified Tor configuration file location contains characters that "
-"cannot be represented in your system's current 8-bit character encoding."
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid ""
-"The specified Tor data directory location contains characters that cannot be"
-" represented in your system's current 8-bit character encoding."
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "Warning"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "You changed torrc path, would you like to restart Tor?"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "Tor Configuration File (torrc);;All Files (*)"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "Select a file to use for Tor socket path"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "Configure ControlPort automatically"
-msgstr ""
-
+#: advancedpage.cpp:289
msgctxt "AdvancedPage"
msgid ""
"Vidalia was unable to remove the Tor service.\n"
@@ -203,1321 +176,1559 @@ msgid ""
"You may need to remove it manually."
msgstr ""
+#: appearancepage.ui:22
msgctxt "AppearancePage"
msgid "Language"
msgstr ""
+#: appearancepage.ui:37
msgctxt "AppearancePage"
msgid "Choose the language used in Vidalia"
msgstr ""
+#: appearancepage.ui:75
msgctxt "AppearancePage"
msgid "Style"
msgstr ""
+#: appearancepage.ui:103
msgctxt "AppearancePage"
msgid "Choose Vidalia's interface style"
msgstr ""
+#: appearancepage.cpp:67
msgctxt "AppearancePage"
msgid "Vidalia was unable to load the selected language translation."
msgstr ""
+#: bwgraph.cpp:166
msgctxt "BandwidthGraph"
msgid "Since:"
msgstr ""
+#: bwgraph.cpp:232
msgctxt "BandwidthGraph"
msgid "Hide Settings"
msgstr ""
+#: bwgraph.ui:40
msgctxt "BandwidthGraph"
msgid "Show Settings"
msgstr ""
+#: bwgraph.ui:16
msgctxt "BandwidthGraph"
msgid "Tor Bandwidth Usage"
msgstr ""
+#: bwgraph.ui:63
msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
+#: bwgraph.ui:151
msgctxt "BandwidthGraph"
msgid "Receive Rate"
msgstr ""
+#: bwgraph.ui:170
msgctxt "BandwidthGraph"
msgid "Send Rate"
msgstr ""
+#: bwgraph.ui:183
msgctxt "BandwidthGraph"
msgid "Always on Top"
msgstr ""
+#: bwgraph.ui:234
msgctxt "BandwidthGraph"
msgid "Style"
msgstr ""
+#: bwgraph.ui:284
msgctxt "BandwidthGraph"
msgid "Changes the transparency of the Bandwidth Graph"
msgstr ""
+#: bwgraph.ui:368
msgctxt "BandwidthGraph"
msgid "100"
msgstr ""
+#: bwgraph.ui:383
msgctxt "BandwidthGraph"
msgid "% Opaque"
msgstr ""
+#: bwgraph.ui:443
msgctxt "BandwidthGraph"
msgid "Save"
msgstr ""
+#: bwgraph.ui:450
msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
-msgctxt "BridgeDownloader"
-msgid "Starting HTTPS bridge request..."
-msgstr ""
-
-msgctxt "BridgeDownloader"
-msgid "Connecting to %1:%2..."
-msgstr ""
-
-msgctxt "BridgeDownloader"
-msgid "Sending an HTTPS request for bridges..."
-msgstr ""
-
-msgctxt "BridgeDownloader"
-msgid "Downloading a list of bridges..."
-msgstr ""
-
-msgctxt "BridgeDownloaderProgressDialog"
-msgid "Downloading Bridges"
-msgstr ""
-
-msgctxt "BridgeDownloaderProgressDialog"
-msgid "Unable to download bridges: %1"
-msgstr ""
-
-msgctxt "BridgeDownloaderProgressDialog"
-msgid "Retrying bridge request..."
-msgstr ""
-
+#: bridgeusagedialog.ui:50
msgctxt "BridgeUsageDialog"
msgid "Country"
msgstr ""
+#: bridgeusagedialog.ui:55
msgctxt "BridgeUsageDialog"
msgid "# Clients"
msgstr ""
+#: bridgeusagedialog.cpp:58
msgctxt "BridgeUsageDialog"
msgid "Clients from the following countries have used your relay since %1"
msgstr ""
+#: bridgeusagedialog.ui:13
msgctxt "BridgeUsageDialog"
msgid "Bridge Usage Summary"
msgstr ""
+#: bridgeusagedialog.ui:19
msgctxt "BridgeUsageDialog"
msgid "Client Summary"
msgstr ""
+#: circuit.cpp:112
msgctxt "Circuit"
msgid "New"
msgstr ""
+#: circuit.cpp:113
msgctxt "Circuit"
msgid "Open"
msgstr ""
+#: circuit.cpp:114
msgctxt "Circuit"
msgid "Building"
msgstr ""
+#: circuit.cpp:115
msgctxt "Circuit"
msgid "Failed"
msgstr ""
+#: circuit.cpp:116
msgctxt "Circuit"
msgid "Closed"
msgstr ""
+#: circuit.cpp:117
msgctxt "Circuit"
msgid "Unknown"
msgstr ""
+#: circuititem.cpp:39
msgctxt "CircuitItem"
msgid "<Path Empty>"
msgstr ""
+#: circuitlistwidget.cpp:56
msgctxt "CircuitListWidget"
msgid "Connection"
msgstr ""
+#: circuitlistwidget.cpp:56
msgctxt "CircuitListWidget"
msgid "Status"
msgstr ""
+#: circuitlistwidget.cpp:88
msgctxt "CircuitListWidget"
msgid "Zoom to Circuit"
msgstr ""
+#: circuitlistwidget.cpp:90
msgctxt "CircuitListWidget"
msgid "Close Circuit (Del)"
msgstr ""
+#: circuitlistwidget.cpp:113
msgctxt "CircuitListWidget"
msgid "Close Stream (Del)"
msgstr ""
+#: configdialog.cpp:78
msgctxt "ConfigDialog"
msgid "General"
msgstr ""
+#: configdialog.cpp:84
msgctxt "ConfigDialog"
msgid "Network"
msgstr ""
+#: configdialog.cpp:88
msgctxt "ConfigDialog"
msgid "Sharing"
msgstr ""
+#: configdialog.cpp:92
msgctxt "ConfigDialog"
msgid "Services"
msgstr ""
+#: configdialog.cpp:96
msgctxt "ConfigDialog"
msgid "Appearance"
msgstr ""
+#: configdialog.cpp:100
msgctxt "ConfigDialog"
msgid "Advanced"
msgstr ""
+#: configdialog.cpp:114
msgctxt "ConfigDialog"
msgid "Help"
msgstr ""
+#: configdialog.cpp:199
msgctxt "ConfigDialog"
msgid "Error Saving Settings"
msgstr ""
+#: configdialog.cpp:201
msgctxt "ConfigDialog"
msgid "Vidalia was unable to save your %1 settings."
msgstr ""
+#: configdialog.cpp:228
msgctxt "ConfigDialog"
msgid "Error Applying Settings"
msgstr ""
+#: configdialog.cpp:230
msgctxt "ConfigDialog"
msgid "Vidalia was unable to apply your %1 settings to Tor."
msgstr ""
+#: configdialog.ui:16
msgctxt "ConfigDialog"
msgid "Settings"
msgstr ""
+#: controlconnection.cpp:134
msgctxt "ControlConnection"
msgid "Vidalia was unable to connect to Tor. (%1)"
msgstr ""
+#: controlconnection.cpp:331
msgctxt "ControlConnection"
msgid "Control socket is not connected."
msgstr ""
+#: controlpasswordinputdialog.ui:28
msgctxt "ControlPasswordInputDialog"
msgid "Password Required"
msgstr ""
-msgctxt "ControlPasswordInputDialog"
-msgid "Remember my password"
-msgstr ""
-
+#: controlpasswordinputdialog.ui:80
msgctxt "ControlPasswordInputDialog"
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 "Remember my password"
+msgstr ""
+
+#: controlsocket.cpp:70
msgctxt "ControlSocket"
msgid "Control socket is not connected."
msgstr ""
+#: controlsocket.cpp:80
msgctxt "ControlSocket"
msgid "Error sending control command. [%1]"
msgstr ""
+#: controlsocket.cpp:117
msgctxt "ControlSocket"
msgid "Socket disconnected while attempting to read a line of data."
msgstr ""
+#: controlsocket.cpp:156
msgctxt "ControlSocket"
msgid "Invalid control reply. [%1]"
msgstr ""
+#: countryinfo.cpp:33
msgctxt "CountryInfo"
msgid "Afghanistan"
msgstr ""
+#: countryinfo.cpp:34
+msgctxt "CountryInfo"
+msgid "Albania"
+msgstr ""
+
+#: countryinfo.cpp:35
+msgctxt "CountryInfo"
+msgid "Algeria"
+msgstr ""
+
+#: countryinfo.cpp:36
msgctxt "CountryInfo"
msgid "Andorra"
msgstr ""
+#: countryinfo.cpp:37
msgctxt "CountryInfo"
msgid "Angola"
msgstr ""
+#: countryinfo.cpp:38
msgctxt "CountryInfo"
msgid "Antigua & Barbuda"
msgstr ""
+#: countryinfo.cpp:39
msgctxt "CountryInfo"
msgid "Argentina"
msgstr ""
+#: countryinfo.cpp:40
msgctxt "CountryInfo"
msgid "Armenia"
msgstr ""
+#: countryinfo.cpp:41
msgctxt "CountryInfo"
msgid "Australia"
msgstr ""
+#: countryinfo.cpp:42
+msgctxt "CountryInfo"
+msgid "Austria"
+msgstr ""
+
+#: countryinfo.cpp:43
msgctxt "CountryInfo"
msgid "Azerbaijan"
msgstr ""
+#: countryinfo.cpp:44
msgctxt "CountryInfo"
msgid "Bahamas"
msgstr ""
+#: countryinfo.cpp:45
+msgctxt "CountryInfo"
+msgid "Bahrain"
+msgstr ""
+
+#: countryinfo.cpp:46
msgctxt "CountryInfo"
msgid "Bangladesh"
msgstr ""
+#: countryinfo.cpp:47
msgctxt "CountryInfo"
msgid "Barbados"
msgstr ""
+#: countryinfo.cpp:48
msgctxt "CountryInfo"
msgid "Belarus"
msgstr ""
+#: countryinfo.cpp:49
msgctxt "CountryInfo"
msgid "Belgium"
msgstr ""
+#: countryinfo.cpp:50
msgctxt "CountryInfo"
msgid "Belize"
msgstr ""
+#: countryinfo.cpp:51
+msgctxt "CountryInfo"
+msgid "Benin"
+msgstr ""
+
+#: countryinfo.cpp:52
msgctxt "CountryInfo"
msgid "Bhutan"
msgstr ""
+#: countryinfo.cpp:53
msgctxt "CountryInfo"
msgid "Bolivia"
msgstr ""
+#: countryinfo.cpp:54
msgctxt "CountryInfo"
msgid "Bosnia & Herzegovina"
msgstr ""
+#: countryinfo.cpp:55
msgctxt "CountryInfo"
msgid "Botswana"
msgstr ""
+#: countryinfo.cpp:56
msgctxt "CountryInfo"
msgid "Brazil"
msgstr ""
+#: countryinfo.cpp:57
msgctxt "CountryInfo"
msgid "Brunei Darussalam"
msgstr ""
+#: countryinfo.cpp:58
msgctxt "CountryInfo"
msgid "Bulgaria"
msgstr ""
+#: countryinfo.cpp:59
msgctxt "CountryInfo"
msgid "Burkina Faso"
msgstr ""
+#: countryinfo.cpp:60
msgctxt "CountryInfo"
msgid "Burundi"
msgstr ""
+#: countryinfo.cpp:61
msgctxt "CountryInfo"
msgid "Cambodia"
msgstr ""
+#: countryinfo.cpp:62
msgctxt "CountryInfo"
msgid "Cameroon"
msgstr ""
+#: countryinfo.cpp:63
msgctxt "CountryInfo"
msgid "Canada"
msgstr ""
+#: countryinfo.cpp:64
msgctxt "CountryInfo"
msgid "Cape Verde"
msgstr ""
+#: countryinfo.cpp:65
msgctxt "CountryInfo"
msgid "Central African Republic"
msgstr ""
+#: countryinfo.cpp:66
msgctxt "CountryInfo"
msgid "Chad"
msgstr ""
+#: countryinfo.cpp:67
msgctxt "CountryInfo"
msgid "Chile"
msgstr ""
+#: countryinfo.cpp:68
msgctxt "CountryInfo"
msgid "China"
msgstr ""
+#: countryinfo.cpp:69
msgctxt "CountryInfo"
msgid "Colombia"
msgstr ""
+#: countryinfo.cpp:70
msgctxt "CountryInfo"
msgid "Comoros"
msgstr ""
+#: countryinfo.cpp:71
msgctxt "CountryInfo"
msgid "Congo, The Democratic Republic of the"
msgstr ""
+#: countryinfo.cpp:72
msgctxt "CountryInfo"
msgid "Congo"
msgstr ""
+#: countryinfo.cpp:73
msgctxt "CountryInfo"
msgid "Costa Rica"
msgstr ""
+#: countryinfo.cpp:74
msgctxt "CountryInfo"
msgid "Cote d’Ivoire"
msgstr ""
+#: countryinfo.cpp:75
msgctxt "CountryInfo"
msgid "Croatia"
msgstr ""
+#: countryinfo.cpp:76
msgctxt "CountryInfo"
msgid "Cuba"
msgstr ""
+#: countryinfo.cpp:77
msgctxt "CountryInfo"
msgid "Cyprus"
msgstr ""
+#: countryinfo.cpp:78
msgctxt "CountryInfo"
msgid "Czech Republic"
msgstr ""
+#: countryinfo.cpp:79
msgctxt "CountryInfo"
msgid "Denmark"
msgstr ""
+#: countryinfo.cpp:80
msgctxt "CountryInfo"
msgid "Djibouti"
msgstr ""
+#: countryinfo.cpp:81
msgctxt "CountryInfo"
msgid "Dominica"
msgstr ""
+#: countryinfo.cpp:82
msgctxt "CountryInfo"
msgid "Dominican Republic"
msgstr ""
+#: countryinfo.cpp:83
msgctxt "CountryInfo"
msgid "Ecuador"
msgstr ""
+#: countryinfo.cpp:84
msgctxt "CountryInfo"
msgid "Egypt"
msgstr ""
+#: countryinfo.cpp:85
msgctxt "CountryInfo"
msgid "El Salvador"
msgstr ""
+#: countryinfo.cpp:86
msgctxt "CountryInfo"
msgid "Equatorial Guinea"
msgstr ""
+#: countryinfo.cpp:87
msgctxt "CountryInfo"
msgid "Eritrea"
msgstr ""
+#: countryinfo.cpp:88
msgctxt "CountryInfo"
msgid "Estonia"
msgstr ""
+#: countryinfo.cpp:89
+msgctxt "CountryInfo"
+msgid "Ethiopia"
+msgstr ""
+
+#: countryinfo.cpp:90
+msgctxt "CountryInfo"
+msgid "Fiji"
+msgstr ""
+
+#: countryinfo.cpp:91
+msgctxt "CountryInfo"
+msgid "Finland"
+msgstr ""
+
+#: countryinfo.cpp:92
msgctxt "CountryInfo"
msgid "France"
msgstr ""
+#: countryinfo.cpp:93
msgctxt "CountryInfo"
msgid "Gabon"
msgstr ""
+#: countryinfo.cpp:94
msgctxt "CountryInfo"
msgid "Gambia"
msgstr ""
+#: countryinfo.cpp:95
msgctxt "CountryInfo"
msgid "Georgia"
msgstr ""
+#: countryinfo.cpp:96
msgctxt "CountryInfo"
msgid "Germany"
msgstr ""
+#: countryinfo.cpp:97
msgctxt "CountryInfo"
msgid "Ghana"
msgstr ""
+#: countryinfo.cpp:98
+msgctxt "CountryInfo"
+msgid "Greece"
+msgstr ""
+
+#: countryinfo.cpp:99
msgctxt "CountryInfo"
msgid "Grenada"
msgstr ""
+#: countryinfo.cpp:100
msgctxt "CountryInfo"
msgid "Guatemala"
msgstr ""
+#: countryinfo.cpp:101
+msgctxt "CountryInfo"
+msgid "Guam"
+msgstr ""
+
+#: countryinfo.cpp:102
msgctxt "CountryInfo"
msgid "Guinea"
msgstr ""
+#: countryinfo.cpp:103
msgctxt "CountryInfo"
msgid "Guinea-Bissau"
msgstr ""
+#: countryinfo.cpp:104
msgctxt "CountryInfo"
msgid "Guyana"
msgstr ""
+#: countryinfo.cpp:105
msgctxt "CountryInfo"
msgid "Hong Kong"
msgstr ""
+#: countryinfo.cpp:106
msgctxt "CountryInfo"
msgid "Haiti"
msgstr ""
+#: countryinfo.cpp:107
msgctxt "CountryInfo"
msgid "Honduras"
msgstr ""
+#: countryinfo.cpp:108
+msgctxt "CountryInfo"
+msgid "Hungary"
+msgstr ""
+
+#: countryinfo.cpp:109
+msgctxt "CountryInfo"
+msgid "Iceland"
+msgstr ""
+
+#: countryinfo.cpp:110
+msgctxt "CountryInfo"
+msgid "India"
+msgstr ""
+
+#: countryinfo.cpp:111
+msgctxt "CountryInfo"
+msgid "Indonesia"
+msgstr ""
+
+#: countryinfo.cpp:112
+msgctxt "CountryInfo"
+msgid "Iran"
+msgstr ""
+
+#: countryinfo.cpp:113
+msgctxt "CountryInfo"
+msgid "Iraq"
+msgstr ""
+
+#: countryinfo.cpp:114
+msgctxt "CountryInfo"
+msgid "Ireland"
+msgstr ""
+
+#: countryinfo.cpp:115
msgctxt "CountryInfo"
msgid "Israel"
msgstr ""
+#: countryinfo.cpp:116
msgctxt "CountryInfo"
msgid "Italy"
msgstr ""
+#: countryinfo.cpp:117
msgctxt "CountryInfo"
msgid "Jamaica"
msgstr ""
+#: countryinfo.cpp:118
msgctxt "CountryInfo"
msgid "Japan"
msgstr ""
+#: countryinfo.cpp:119
msgctxt "CountryInfo"
msgid "Jordan"
msgstr ""
+#: countryinfo.cpp:120
msgctxt "CountryInfo"
msgid "Kazakhstan"
msgstr ""
+#: countryinfo.cpp:121
msgctxt "CountryInfo"
msgid "Kenya"
msgstr ""
+#: countryinfo.cpp:122
msgctxt "CountryInfo"
msgid "Kiribati"
msgstr ""
+#: countryinfo.cpp:123
+msgctxt "CountryInfo"
+msgid "Korea, North"
+msgstr ""
+
+#: countryinfo.cpp:124
+msgctxt "CountryInfo"
+msgid "Korea, South"
+msgstr ""
+
+#: countryinfo.cpp:125
msgctxt "CountryInfo"
msgid "Kuwait"
msgstr ""
+#: countryinfo.cpp:126
msgctxt "CountryInfo"
msgid "Kyrgyzstan"
msgstr ""
+#: countryinfo.cpp:127
msgctxt "CountryInfo"
msgid "Laos"
msgstr ""
+#: countryinfo.cpp:128
msgctxt "CountryInfo"
msgid "Latvia"
msgstr ""
+#: countryinfo.cpp:129
msgctxt "CountryInfo"
msgid "Lebanon"
msgstr ""
+#: countryinfo.cpp:130
msgctxt "CountryInfo"
msgid "Lesotho"
msgstr ""
+#: countryinfo.cpp:131
msgctxt "CountryInfo"
msgid "Liberia"
msgstr ""
+#: countryinfo.cpp:132
+msgctxt "CountryInfo"
+msgid "Libya"
+msgstr ""
+
+#: countryinfo.cpp:133
msgctxt "CountryInfo"
msgid "Liechtenstein"
msgstr ""
+#: countryinfo.cpp:134
msgctxt "CountryInfo"
msgid "Lithuania"
msgstr ""
+#: countryinfo.cpp:135
msgctxt "CountryInfo"
msgid "Luxembourg"
msgstr ""
+#: countryinfo.cpp:136
msgctxt "CountryInfo"
msgid "Macedonia"
msgstr ""
+#: countryinfo.cpp:137
msgctxt "CountryInfo"
msgid "Madagascar"
msgstr ""
+#: countryinfo.cpp:138
msgctxt "CountryInfo"
msgid "Malawi"
msgstr ""
+#: countryinfo.cpp:139
msgctxt "CountryInfo"
msgid "Malaysia"
msgstr ""
+#: countryinfo.cpp:140
+msgctxt "CountryInfo"
+msgid "Maldives"
+msgstr ""
+
+#: countryinfo.cpp:141
msgctxt "CountryInfo"
msgid "Mali"
msgstr ""
+#: countryinfo.cpp:142
msgctxt "CountryInfo"
msgid "Malta"
msgstr ""
+#: countryinfo.cpp:143
msgctxt "CountryInfo"
msgid "Marshall Islands"
msgstr ""
+#: countryinfo.cpp:144
msgctxt "CountryInfo"
msgid "Mauritania"
msgstr ""
+#: countryinfo.cpp:145
msgctxt "CountryInfo"
msgid "Mauritius"
msgstr ""
+#: countryinfo.cpp:146
+msgctxt "CountryInfo"
+msgid "Mexico"
+msgstr ""
+
+#: countryinfo.cpp:147
msgctxt "CountryInfo"
msgid "Micronesia"
msgstr ""
+#: countryinfo.cpp:148
msgctxt "CountryInfo"
msgid "Moldova"
msgstr ""
+#: countryinfo.cpp:149
msgctxt "CountryInfo"
msgid "Monaco"
msgstr ""
+#: countryinfo.cpp:150
msgctxt "CountryInfo"
msgid "Mongolia"
msgstr ""
+#: countryinfo.cpp:151
msgctxt "CountryInfo"
msgid "Montenegro"
msgstr ""
+#: countryinfo.cpp:152
msgctxt "CountryInfo"
msgid "Morocco"
msgstr ""
+#: countryinfo.cpp:153
msgctxt "CountryInfo"
msgid "Mozambique"
msgstr ""
+#: countryinfo.cpp:154
+msgctxt "CountryInfo"
+msgid "Myanmar"
+msgstr ""
+
+#: countryinfo.cpp:155
msgctxt "CountryInfo"
msgid "Namibia"
msgstr ""
+#: countryinfo.cpp:156
msgctxt "CountryInfo"
msgid "Nauru"
msgstr ""
+#: countryinfo.cpp:157
msgctxt "CountryInfo"
msgid "Nepal"
msgstr ""
+#: countryinfo.cpp:158
msgctxt "CountryInfo"
msgid "Netherlands"
msgstr ""
+#: countryinfo.cpp:159
msgctxt "CountryInfo"
msgid "New Zealand"
msgstr ""
+#: countryinfo.cpp:160
msgctxt "CountryInfo"
msgid "Nicaragua"
msgstr ""
+#: countryinfo.cpp:161
msgctxt "CountryInfo"
msgid "Niger"
msgstr ""
+#: countryinfo.cpp:162
msgctxt "CountryInfo"
msgid "Nigeria"
msgstr ""
+#: countryinfo.cpp:163
msgctxt "CountryInfo"
msgid "Norway"
msgstr ""
+#: countryinfo.cpp:164
msgctxt "CountryInfo"
msgid "Oman"
msgstr ""
+#: countryinfo.cpp:165
msgctxt "CountryInfo"
msgid "Pakistan"
msgstr ""
+#: countryinfo.cpp:166
msgctxt "CountryInfo"
msgid "Palau"
msgstr ""
+#: countryinfo.cpp:167
msgctxt "CountryInfo"
msgid "Palestine"
msgstr ""
+#: countryinfo.cpp:168
msgctxt "CountryInfo"
msgid "Panama"
msgstr ""
+#: countryinfo.cpp:169
msgctxt "CountryInfo"
msgid "Papua New Guinea"
msgstr ""
+#: countryinfo.cpp:170
msgctxt "CountryInfo"
msgid "Paraguay"
msgstr ""
+#: countryinfo.cpp:171
msgctxt "CountryInfo"
msgid "Peru"
msgstr ""
+#: countryinfo.cpp:172
msgctxt "CountryInfo"
msgid "Philippines"
msgstr ""
+#: countryinfo.cpp:173
msgctxt "CountryInfo"
msgid "Poland"
msgstr ""
+#: countryinfo.cpp:174
msgctxt "CountryInfo"
msgid "Portugal"
msgstr ""
+#: countryinfo.cpp:175
msgctxt "CountryInfo"
msgid "Qatar"
msgstr ""
+#: countryinfo.cpp:176
msgctxt "CountryInfo"
msgid "Romania"
msgstr ""
+#: countryinfo.cpp:177
msgctxt "CountryInfo"
msgid "Russia"
msgstr ""
+#: countryinfo.cpp:178
msgctxt "CountryInfo"
msgid "Rwanda"
msgstr ""
+#: countryinfo.cpp:179
msgctxt "CountryInfo"
msgid "Saint Kitts & Nevis"
msgstr ""
+#: countryinfo.cpp:180
msgctxt "CountryInfo"
msgid "Saint Lucia"
msgstr ""
+#: countryinfo.cpp:181
msgctxt "CountryInfo"
msgid "Saint Vincent & the Grenadines"
msgstr ""
+#: countryinfo.cpp:182
msgctxt "CountryInfo"
msgid "Samoa"
msgstr ""
+#: countryinfo.cpp:183
msgctxt "CountryInfo"
msgid "San Marino"
msgstr ""
+#: countryinfo.cpp:184
msgctxt "CountryInfo"
msgid "Sao Tome & Principe"
msgstr ""
+#: countryinfo.cpp:185
msgctxt "CountryInfo"
msgid "Saudi Arabia"
msgstr ""
+#: countryinfo.cpp:186
msgctxt "CountryInfo"
msgid "Senegal"
msgstr ""
+#: countryinfo.cpp:187
msgctxt "CountryInfo"
msgid "Serbia"
msgstr ""
+#: countryinfo.cpp:188
msgctxt "CountryInfo"
msgid "Seychelles"
msgstr ""
+#: countryinfo.cpp:189
msgctxt "CountryInfo"
msgid "Sierra Leone"
msgstr ""
+#: countryinfo.cpp:190
msgctxt "CountryInfo"
msgid "Singapore"
msgstr ""
+#: countryinfo.cpp:191
msgctxt "CountryInfo"
msgid "Slovakia"
msgstr ""
+#: countryinfo.cpp:192
msgctxt "CountryInfo"
msgid "Slovenia"
msgstr ""
+#: countryinfo.cpp:193
msgctxt "CountryInfo"
msgid "Solomon Islands"
msgstr ""
+#: countryinfo.cpp:194
msgctxt "CountryInfo"
msgid "Somalia"
msgstr ""
+#: countryinfo.cpp:195
msgctxt "CountryInfo"
msgid "South Africa"
msgstr ""
+#: countryinfo.cpp:196
msgctxt "CountryInfo"
msgid "Spain"
msgstr ""
+#: countryinfo.cpp:197
msgctxt "CountryInfo"
msgid "Sri Lanka"
msgstr ""
+#: countryinfo.cpp:198
msgctxt "CountryInfo"
msgid "Sudan"
msgstr ""
+#: countryinfo.cpp:199
msgctxt "CountryInfo"
msgid "Suriname"
msgstr ""
+#: countryinfo.cpp:200
msgctxt "CountryInfo"
msgid "Swaziland"
msgstr ""
+#: countryinfo.cpp:201
msgctxt "CountryInfo"
msgid "Sweden"
msgstr ""
+#: countryinfo.cpp:202
msgctxt "CountryInfo"
msgid "Switzerland"
msgstr ""
+#: countryinfo.cpp:203
msgctxt "CountryInfo"
msgid "Syria"
msgstr ""
+#: countryinfo.cpp:204
+msgctxt "CountryInfo"
+msgid "Taiwan"
+msgstr ""
+
+#: countryinfo.cpp:205
msgctxt "CountryInfo"
msgid "Tajikistan"
msgstr ""
+#: countryinfo.cpp:206
msgctxt "CountryInfo"
msgid "Tanzania"
msgstr ""
+#: countryinfo.cpp:207
msgctxt "CountryInfo"
msgid "Thailand"
msgstr ""
+#: countryinfo.cpp:208
msgctxt "CountryInfo"
msgid "Timor-Leste (East Timor)"
msgstr ""
+#: countryinfo.cpp:209
msgctxt "CountryInfo"
msgid "Togo"
msgstr ""
+#: countryinfo.cpp:210
msgctxt "CountryInfo"
msgid "Tonga"
msgstr ""
+#: countryinfo.cpp:211
msgctxt "CountryInfo"
msgid "Trinidad & Tobago"
msgstr ""
+#: countryinfo.cpp:212
msgctxt "CountryInfo"
msgid "Tunisia"
msgstr ""
+#: countryinfo.cpp:213
msgctxt "CountryInfo"
msgid "Turkey"
msgstr ""
+#: countryinfo.cpp:214
msgctxt "CountryInfo"
msgid "Turkmenistan"
msgstr ""
+#: countryinfo.cpp:215
msgctxt "CountryInfo"
msgid "Tuvalu"
msgstr ""
+#: countryinfo.cpp:216
msgctxt "CountryInfo"
msgid "Uganda"
msgstr ""
+#: countryinfo.cpp:217
msgctxt "CountryInfo"
msgid "Ukraine"
msgstr ""
+#: countryinfo.cpp:218
msgctxt "CountryInfo"
msgid "United Arab Emirates"
msgstr ""
+#: countryinfo.cpp:219
msgctxt "CountryInfo"
msgid "United Kingdom"
msgstr ""
+#: countryinfo.cpp:220
msgctxt "CountryInfo"
msgid "United States"
msgstr ""
+#: countryinfo.cpp:221
msgctxt "CountryInfo"
msgid "Uruguay"
msgstr ""
+#: countryinfo.cpp:222
msgctxt "CountryInfo"
msgid "Uzbekistan"
msgstr ""
+#: countryinfo.cpp:223
msgctxt "CountryInfo"
msgid "Vanuatu"
msgstr ""
+#: countryinfo.cpp:224
msgctxt "CountryInfo"
msgid "Vatican"
msgstr ""
+#: countryinfo.cpp:225
msgctxt "CountryInfo"
msgid "Venezuela"
msgstr ""
+#: countryinfo.cpp:226
msgctxt "CountryInfo"
msgid "Vietnam"
msgstr ""
+#: countryinfo.cpp:227
msgctxt "CountryInfo"
msgid "Western Sahara"
msgstr ""
+#: countryinfo.cpp:228
msgctxt "CountryInfo"
msgid "Yemen"
msgstr ""
+#: countryinfo.cpp:229
msgctxt "CountryInfo"
msgid "Zambia"
msgstr ""
+#: countryinfo.cpp:230
msgctxt "CountryInfo"
msgid "Zimbabwe"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Zaire"
+#: generalpage.cpp:73
+msgctxt "GeneralPage"
+msgid "Executables (*.exe)"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Albania"
+#: generalpage.cpp:86
+msgctxt "GeneralPage"
+msgid "Select Path to Tor"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Algeria"
+#: generalpage.cpp:96
+msgctxt "GeneralPage"
+msgid "Select Proxy Executable"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Austria"
+#: generalpage.cpp:109
+msgctxt "GeneralPage"
+msgid "You must specify the name of your Tor executable."
msgstr ""
-msgctxt "CountryInfo"
-msgid "Bahrain"
+#: generalpage.cpp:117
+msgctxt "GeneralPage"
+msgid "The proxy arguments specified are not properly formatted."
msgstr ""
-msgctxt "CountryInfo"
-msgid "Benin"
+#: generalpage.ui:28
+msgctxt "GeneralPage"
+msgid "Start Vidalia when my system starts"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Ethiopia"
+#: generalpage.ui:121
+msgctxt "GeneralPage"
+msgid "Browse"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Fiji"
+#: generalpage.ui:57
+msgctxt "GeneralPage"
+msgid "Start the Tor software when Vidalia starts"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Finland"
+#: generalpage.ui:51
+msgctxt "GeneralPage"
+msgid "Tor"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Greece"
+#: generalpage.ui:93
+msgctxt "GeneralPage"
+msgid "Proxy Application (optional)"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Guam"
+#: generalpage.ui:99
+msgctxt "GeneralPage"
+msgid "Start a proxy application when Tor starts"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Hungary"
+#: generalpage.ui:135
+msgctxt "GeneralPage"
+msgid "Proxy Application Arguments:"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Iceland"
+#: generalpage.ui:154
+msgctxt "GeneralPage"
+msgid "Software Updates"
msgstr ""
-msgctxt "CountryInfo"
-msgid "India"
+#: generalpage.ui:160
+msgctxt "GeneralPage"
+msgid "Check for new software updates automatically"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Indonesia"
+#: generalpage.ui:193
+msgctxt "GeneralPage"
+msgid "Check Now"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Iran"
+#: graphframe.cpp:238
+msgctxt "GraphFrame"
+msgid "Recv:"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Iraq"
+#: graphframe.cpp:298
+msgctxt "GraphFrame"
+msgid "%1 KB/s"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Ireland"
+#: graphframe.cpp:247
+msgctxt "GraphFrame"
+msgid "Sent:"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Korea, North"
+#: graphframe.cpp:259
+msgctxt "GraphFrame"
+msgid "%1 KB"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Korea, South"
+#: graphframe.cpp:262
+msgctxt "GraphFrame"
+msgid "%1 MB"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Libya"
+#: graphframe.cpp:265
+msgctxt "GraphFrame"
+msgid "%1 GB"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Maldives"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Mexico"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Myanmar"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Taiwan"
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid "Submit a Crash Report"
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid "Vidalia encountered an error and needed to close"
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid "Restart Vidalia"
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid "Don't Restart"
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid "Unable to restart Vidalia"
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid ""
-"We were unable to automatically restart Vidalia. Please restart Vidalia "
-"manually."
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid "Please fill a ticket in:"
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid ""
-"<a "
-"href=\"https://trac.torproject.org/projects/tor/newticket\">https://trac.torproject.org/projects/tor/newticket</a>"
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid ""
-"A crash report has been created that you can send to the Vidalia developers "
-"to help identify and fix the problem. The submitted report does not contain "
-"any personally identifying information."
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid ""
-"with a description of what you were doing before the application crashed, "
-"along with the following files corresponding to the crash report:"
-msgstr ""
-
-msgctxt "GeneralPage"
-msgid "Executables (*.exe)"
-msgstr ""
-
-msgctxt "GeneralPage"
-msgid "Select Path to Tor"
-msgstr ""
-
-msgctxt "GeneralPage"
-msgid "Select Proxy Executable"
-msgstr ""
-
-msgctxt "GeneralPage"
-msgid "You must specify the name of your Tor executable."
-msgstr ""
-
-msgctxt "GeneralPage"
-msgid "Start Vidalia when my system starts"
-msgstr ""
-
-msgctxt "GeneralPage"
-msgid "Browse"
-msgstr ""
-
-msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr ""
-
-msgctxt "GeneralPage"
-msgid "Tor"
-msgstr ""
-
-msgctxt "GeneralPage"
-msgid "Proxy Application (optional)"
-msgstr ""
-
-msgctxt "GeneralPage"
-msgid "Start a proxy application when Tor starts"
-msgstr ""
-
-msgctxt "GeneralPage"
-msgid "Proxy Application Arguments:"
-msgstr ""
-
-msgctxt "GeneralPage"
-msgid "Software Updates"
-msgstr ""
-
-msgctxt "GeneralPage"
-msgid "Check for new software updates automatically"
-msgstr ""
-
-msgctxt "GeneralPage"
-msgid "Check Now"
-msgstr ""
-
-msgctxt "GraphFrame"
-msgid "%1 KB/s"
-msgstr ""
-
-msgctxt "GraphFrame"
-msgid "%1 KB"
-msgstr ""
-
-msgctxt "GraphFrame"
-msgid "%1 MB"
-msgstr ""
-
-msgctxt "GraphFrame"
-msgid "%1 GB"
-msgstr ""
-
-msgctxt "GraphFrame"
-msgid "Recv:"
-msgstr ""
-
-msgctxt "GraphFrame"
-msgid "Sent:"
+#: helpbrowser.cpp:134
+msgctxt "HelpBrowser"
+msgid "Error Loading Help Contents:"
msgstr ""
+#: helpbrowser.cpp:146
msgctxt "HelpBrowser"
msgid "Supplied XML file is not a valid Contents document."
msgstr ""
+#: helpbrowser.cpp:395
msgctxt "HelpBrowser"
msgid "Search reached end of document"
msgstr ""
+#: helpbrowser.cpp:397
msgctxt "HelpBrowser"
msgid "Search reached start of document"
msgstr ""
+#: helpbrowser.cpp:399
msgctxt "HelpBrowser"
msgid "Text not found in document"
msgstr ""
+#: helpbrowser.cpp:444
msgctxt "HelpBrowser"
msgid "Found %1 results"
msgstr ""
+#: helpbrowser.ui:33
msgctxt "HelpBrowser"
msgid "Vidalia Help"
msgstr ""
+#: helpbrowser.ui:484
msgctxt "HelpBrowser"
msgid "Back"
msgstr ""
+#: helpbrowser.ui:487
msgctxt "HelpBrowser"
msgid "Move to previous page (Backspace)"
msgstr ""
+#: helpbrowser.ui:490
msgctxt "HelpBrowser"
msgid "Backspace"
msgstr ""
+#: helpbrowser.ui:498
msgctxt "HelpBrowser"
msgid "Forward"
msgstr ""
+#: helpbrowser.ui:501
msgctxt "HelpBrowser"
msgid "Move to next page (Shift+Backspace)"
msgstr ""
+#: helpbrowser.ui:504
msgctxt "HelpBrowser"
msgid "Shift+Backspace"
msgstr ""
+#: helpbrowser.ui:512
msgctxt "HelpBrowser"
msgid "Home"
msgstr ""
+#: helpbrowser.ui:515
msgctxt "HelpBrowser"
msgid "Move to the Home page (Ctrl+H)"
msgstr ""
+#: helpbrowser.ui:518
msgctxt "HelpBrowser"
msgid "Ctrl+H"
msgstr ""
+#: helpbrowser.ui:535
msgctxt "HelpBrowser"
msgid "Find"
msgstr ""
+#: helpbrowser.ui:538
msgctxt "HelpBrowser"
msgid "Search for a word or phrase on current page (Ctrl+F)"
msgstr ""
+#: helpbrowser.ui:541
msgctxt "HelpBrowser"
msgid "Ctrl+F"
msgstr ""
+#: helpbrowser.ui:549
msgctxt "HelpBrowser"
msgid "Close"
msgstr ""
+#: helpbrowser.ui:552
msgctxt "HelpBrowser"
msgid "Close Vidalia Help"
msgstr ""
+#: helpbrowser.ui:555
msgctxt "HelpBrowser"
msgid "Esc"
msgstr ""
+#: helpbrowser.ui:152
msgctxt "HelpBrowser"
msgid "Find:"
msgstr ""
+#: helpbrowser.ui:174
msgctxt "HelpBrowser"
msgid "Find Previous"
msgstr ""
+#: helpbrowser.ui:187
msgctxt "HelpBrowser"
msgid "Find Next"
msgstr ""
+#: helpbrowser.ui:221
msgctxt "HelpBrowser"
msgid "Case sensitive"
msgstr ""
+#: helpbrowser.ui:231
msgctxt "HelpBrowser"
msgid "Whole words only"
msgstr ""
+#: helpbrowser.ui:305
msgctxt "HelpBrowser"
msgid "Help Topics"
msgstr ""
+#: helpbrowser.ui:260
msgctxt "HelpBrowser"
msgid "Contents"
msgstr ""
+#: helpbrowser.ui:350
msgctxt "HelpBrowser"
msgid "Search"
msgstr ""
+#: helpbrowser.ui:362
msgctxt "HelpBrowser"
msgid "Searching for:"
msgstr ""
+#: helpbrowser.ui:405
msgctxt "HelpBrowser"
msgid "Found Documents"
msgstr ""
-msgctxt "HelpBrowser"
-msgid "Error Loading Help Contents:"
+#: helptextbrowser.cpp:54
+msgctxt "HelpTextBrowser"
+msgid "Error opening help file:"
msgstr ""
+#: helptextbrowser.cpp:72
msgctxt "HelpTextBrowser"
msgid "Opening External Link"
msgstr ""
+#: helptextbrowser.cpp:76
msgctxt "HelpTextBrowser"
msgid ""
"Vidalia can open the link you selected in your default Web browser. If your "
@@ -1525,482 +1736,569 @@ msgid ""
"anonymous."
msgstr ""
+#: helptextbrowser.cpp:78
msgctxt "HelpTextBrowser"
msgid "Do you want Vidalia to open the link in your Web browser?"
msgstr ""
+#: helptextbrowser.cpp:88
msgctxt "HelpTextBrowser"
msgid "Unable to Open Link"
msgstr ""
+#: helptextbrowser.cpp:90
msgctxt "HelpTextBrowser"
msgid ""
"Vidalia was unable to open the selected link in your Web browser. You can "
"still copy the URL and paste it into your browser."
msgstr ""
-msgctxt "HelpTextBrowser"
-msgid "Error opening help file:"
-msgstr ""
-
+#: licensedialog.ui:13
msgctxt "LicenseDialog"
msgid "License Information"
msgstr ""
+#: licensedialog.ui:43
msgctxt "LicenseDialog"
msgid "License"
msgstr ""
+#: licensedialog.ui:76
msgctxt "LicenseDialog"
msgid "Credits"
msgstr ""
+#: logevent.cpp:57
msgctxt "LogEvent"
msgid "Debug"
msgstr ""
+#: logevent.cpp:58
msgctxt "LogEvent"
msgid "Info"
msgstr ""
+#: logevent.cpp:59
msgctxt "LogEvent"
msgid "Notice"
msgstr ""
+#: logevent.cpp:60
msgctxt "LogEvent"
msgid "Warning"
msgstr ""
+#: logevent.cpp:61
msgctxt "LogEvent"
msgid "Error"
msgstr ""
+#: logevent.cpp:62
msgctxt "LogEvent"
msgid "Unknown"
msgstr ""
-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 ""
-
+#: mainwindow.ui:233
msgctxt "MainWindow"
msgid "Start Tor"
msgstr ""
+#: mainwindow.ui:443
msgctxt "MainWindow"
msgid "Exit"
msgstr ""
+#: mainwindow.ui:304
msgctxt "MainWindow"
msgid "Bandwidth Graph"
msgstr ""
+#: mainwindow.ui:317
msgctxt "MainWindow"
msgid "Message Log"
msgstr ""
+#: mainwindow.cpp:453
msgctxt "MainWindow"
msgid "Network Map"
msgstr ""
+#: mainwindow.cpp:459
msgctxt "MainWindow"
msgid "Control Panel"
msgstr ""
+#: mainwindow.ui:380
msgctxt "MainWindow"
msgid "Settings"
msgstr ""
+#: mainwindow.ui:430
msgctxt "MainWindow"
msgid "About"
msgstr ""
+#: mainwindow.ui:367
msgctxt "MainWindow"
msgid "Help"
msgstr ""
+#: mainwindow.cpp:1687
msgctxt "MainWindow"
msgid "New Identity"
msgstr ""
+#: mainwindow.cpp:542
msgctxt "MainWindow"
msgid "Ctrl+T"
msgstr ""
+#: mainwindow.cpp:543
msgctxt "MainWindow"
msgid "Ctrl+B"
msgstr ""
+#: mainwindow.cpp:544
msgctxt "MainWindow"
msgid "Ctrl+L"
msgstr ""
+#: mainwindow.cpp:545
msgctxt "MainWindow"
msgid "Ctrl+N"
msgstr ""
+#: mainwindow.cpp:546
msgctxt "MainWindow"
msgid "Ctrl+?"
msgstr ""
+#: mainwindow.cpp:547
msgctxt "MainWindow"
msgid "Ctrl+I"
msgstr ""
+#: mainwindow.cpp:548
msgctxt "MainWindow"
msgid "Ctrl+P"
msgstr ""
+#: mainwindow.cpp:568
msgctxt "MainWindow"
msgid "Tor"
msgstr ""
+#: mainwindow.cpp:573
msgctxt "MainWindow"
msgid "View"
msgstr ""
+#: mainwindow.cpp:581
msgctxt "MainWindow"
msgid "Vidalia Help"
msgstr ""
+#: mainwindow.cpp:736
msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
+#: mainwindow.cpp:737
msgctxt "MainWindow"
msgid "Vidalia was unable to start the configured web browser"
msgstr ""
+#: mainwindow.cpp:749
msgctxt "MainWindow"
msgid "Error starting IM client"
msgstr ""
+#: mainwindow.cpp:750
msgctxt "MainWindow"
msgid "Vidalia was unable to start the configured IM client"
msgstr ""
+#: mainwindow.cpp:771
msgctxt "MainWindow"
msgid "Error starting proxy server"
msgstr ""
+#: mainwindow.cpp:772
msgctxt "MainWindow"
msgid "Vidalia was unable to start the configured proxy server"
msgstr ""
+#: mainwindow.cpp:788
msgctxt "MainWindow"
msgid "Connecting to a relay directory"
msgstr ""
+#: mainwindow.cpp:792
msgctxt "MainWindow"
msgid "Establishing an encrypted directory connection"
msgstr ""
+#: mainwindow.cpp:795
msgctxt "MainWindow"
msgid "Retrieving network status"
msgstr ""
+#: mainwindow.cpp:798
msgctxt "MainWindow"
msgid "Loading network status"
msgstr ""
+#: mainwindow.cpp:801
msgctxt "MainWindow"
msgid "Loading authority certificates"
msgstr ""
+#: mainwindow.cpp:804
msgctxt "MainWindow"
msgid "Requesting relay information"
msgstr ""
+#: mainwindow.cpp:807
msgctxt "MainWindow"
msgid "Loading relay information"
msgstr ""
+#: mainwindow.cpp:1343
msgctxt "MainWindow"
msgid "Connecting to the Tor network"
msgstr ""
+#: mainwindow.cpp:814
msgctxt "MainWindow"
msgid "Establishing a Tor circuit"
msgstr ""
+#: mainwindow.cpp:1508
msgctxt "MainWindow"
msgid "Connected to the Tor network!"
msgstr ""
+#: mainwindow.cpp:821
msgctxt "MainWindow"
msgid "Unrecognized startup status"
msgstr ""
+#: mainwindow.cpp:828
msgctxt "MainWindow"
msgid "miscellaneous"
msgstr ""
+#: mainwindow.cpp:831
msgctxt "MainWindow"
msgid "identity mismatch"
msgstr ""
+#: mainwindow.cpp:834
msgctxt "MainWindow"
msgid "done"
msgstr ""
+#: mainwindow.cpp:837
msgctxt "MainWindow"
msgid "connection refused"
msgstr ""
+#: mainwindow.cpp:840
msgctxt "MainWindow"
msgid "connection timeout"
msgstr ""
+#: mainwindow.cpp:843
msgctxt "MainWindow"
msgid "read/write error"
msgstr ""
+#: mainwindow.cpp:846
msgctxt "MainWindow"
msgid "no route to host"
msgstr ""
+#: mainwindow.cpp:849
msgctxt "MainWindow"
msgid "insufficient resources"
msgstr ""
+#: mainwindow.cpp:852
msgctxt "MainWindow"
msgid "unknown"
msgstr ""
+#: mainwindow.cpp:854
+msgctxt "MainWindow"
+msgid "failed (%1)"
+msgstr ""
+
+#: mainwindow.ui:168
msgctxt "MainWindow"
msgid "Tor is not running"
msgstr ""
+#: mainwindow.cpp:897
msgctxt "MainWindow"
msgid "Tor is shutting down"
msgstr ""
+#: mainwindow.cpp:902
msgctxt "MainWindow"
msgid "Stop Tor Now"
msgstr ""
+#: mainwindow.cpp:904
msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
+#: mainwindow.cpp:920
msgctxt "MainWindow"
msgid "Starting the Tor software"
msgstr ""
+#: mainwindow.ui:75
msgctxt "MainWindow"
msgid "Starting Tor"
msgstr ""
+#: mainwindow.cpp:1070
msgctxt "MainWindow"
msgid "Error Starting Tor"
msgstr ""
+#: mainwindow.cpp:1073
msgctxt "MainWindow"
msgid ""
"Vidalia was unable to start Tor. Check your settings to ensure the correct "
"name and location of your Tor executable is specified."
msgstr ""
+#: mainwindow.cpp:1107
msgctxt "MainWindow"
msgid "Connecting to Tor"
msgstr ""
+#: mainwindow.cpp:1117
msgctxt "MainWindow"
msgid "Connection Error"
msgstr ""
+#: mainwindow.cpp:1149
msgctxt "MainWindow"
msgid "Relaying is Enabled"
msgstr ""
+#: mainwindow.cpp:1176
msgctxt "MainWindow"
msgid "Error Shutting Down"
msgstr ""
+#: mainwindow.cpp:1177
msgctxt "MainWindow"
msgid "Vidalia was unable to stop the Tor software."
msgstr ""
+#: mainwindow.cpp:1208
msgctxt "MainWindow"
msgid "Unexpected Error"
msgstr ""
+#: mainwindow.cpp:1266
msgctxt "MainWindow"
msgid "Authenticating to Tor"
msgstr ""
+#: mainwindow.cpp:1286
msgctxt "MainWindow"
msgid "Cookie Authentication Required"
msgstr ""
+#: mainwindow.cpp:1289
msgctxt "MainWindow"
msgid ""
"The Tor software requires Vidalia to send the contents of an authentication "
"cookie, but Vidalia was unable to find one."
msgstr ""
+#: mainwindow.cpp:1291
msgctxt "MainWindow"
msgid "Would you like to browse for the file 'control_auth_cookie' yourself?"
msgstr ""
+#: mainwindow.cpp:1298
msgctxt "MainWindow"
msgid "Data Directory"
msgstr ""
+#: mainwindow.cpp:1300
msgctxt "MainWindow"
msgid "Control Cookie (control_auth_cookie)"
msgstr ""
+#: mainwindow.cpp:1352
msgctxt "MainWindow"
msgid "Error Registering for Events"
msgstr ""
+#: mainwindow.cpp:1354
msgctxt "MainWindow"
msgid ""
"Vidalia was unable to register for some events. Many of Vidalia's features "
"may be unavailable."
msgstr ""
+#: mainwindow.cpp:1433
msgctxt "MainWindow"
msgid "Authentication Error"
msgstr ""
+#: mainwindow.cpp:1435
msgctxt "MainWindow"
msgid "Vidalia was unable to authenticate to the Tor software. (%1)"
msgstr ""
+#: mainwindow.cpp:1437
msgctxt "MainWindow"
msgid "Please check your control port authentication settings."
msgstr ""
+#: mainwindow.cpp:1560
msgctxt "MainWindow"
msgid "Tor Update Available"
msgstr ""
+#: mainwindow.cpp:1556
msgctxt "MainWindow"
msgid ""
"The currently installed version of Tor is out of date or no longer "
"recommended. Please visit the Tor website to download the latest version."
msgstr ""
+#: mainwindow.cpp:1556
msgctxt "MainWindow"
msgid "Tor website: %1"
msgstr ""
+#: mainwindow.cpp:1690
msgctxt "MainWindow"
msgid ""
"All subsequent connections will appear to be different than your old "
"connections."
msgstr ""
+#: mainwindow.cpp:1705
msgctxt "MainWindow"
msgid "Failed to Create New Identity"
msgstr ""
+#: mainwindow.cpp:1754
msgctxt "MainWindow"
msgid "Port Forwarding Failed"
msgstr ""
+#: mainwindow.cpp:1755
msgctxt "MainWindow"
msgid "Vidalia was unable to configure automatic port forwarding."
msgstr ""
+#: mainwindow.ui:19
msgctxt "MainWindow"
msgid "Vidalia Control Panel"
msgstr ""
+#: mainwindow.ui:49
msgctxt "MainWindow"
msgid "Status"
msgstr ""
+#: mainwindow.ui:218
msgctxt "MainWindow"
msgid "Vidalia Shortcuts"
msgstr ""
+#: mainwindow.ui:243
msgctxt "MainWindow"
msgid "Setup Relaying"
msgstr ""
+#: mainwindow.ui:246
msgctxt "MainWindow"
msgid "Set up a relay and help the network grow"
msgstr ""
+#: mainwindow.ui:256
msgctxt "MainWindow"
msgid "View the Network"
msgstr ""
+#: mainwindow.ui:259
msgctxt "MainWindow"
msgid "View a map of the Tor network"
msgstr ""
+#: mainwindow.ui:272
msgctxt "MainWindow"
msgid "Use a New Identity"
msgstr ""
+#: mainwindow.ui:275
msgctxt "MainWindow"
msgid "Make subsequent connections appear new"
msgstr ""
+#: mainwindow.ui:307
msgctxt "MainWindow"
msgid "View recent bandwidth usage"
msgstr ""
+#: mainwindow.ui:320
msgctxt "MainWindow"
msgid "View log message history"
msgstr ""
+#: mainwindow.ui:370
msgctxt "MainWindow"
msgid "View help documentation"
msgstr ""
+#: mainwindow.ui:383
msgctxt "MainWindow"
msgid "Configure Vidalia"
msgstr ""
+#: mainwindow.ui:433
msgctxt "MainWindow"
msgid "View version and license information"
msgstr ""
+#: mainwindow.ui:446
msgctxt "MainWindow"
msgid "Exit Vidalia"
msgstr ""
+#: mainwindow.ui:498
msgctxt "MainWindow"
msgid "Show this window on startup"
msgstr ""
+#: mainwindow.ui:517
msgctxt "MainWindow"
msgid "Hide"
msgstr ""
+#: mainwindow.ui:520
msgctxt "MainWindow"
msgid "Hide this window"
msgstr ""
+#: mainwindow.cpp:1421
msgctxt "MainWindow"
msgid "Password Reset Failed"
msgstr ""
+#: mainwindow.cpp:1424
msgctxt "MainWindow"
msgid ""
"Vidalia tried to reset Tor's control password, but was not able to restart "
@@ -2008,382 +2306,442 @@ msgid ""
"other Tor processes running."
msgstr ""
+#: mainwindow.cpp:895
msgctxt "MainWindow"
msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended."
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
msgstr ""
+#: mainwindow.cpp:1154
msgctxt "MainWindow"
msgid ""
-"Would you like to check if a newer package is available for installation?"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Potentially Unsafe Connection"
+"You are currently running a relay. Terminating your relay will interrupt any "
+"open connections from clients.\n"
+"\n"
+"Would you like to shutdown gracefully and give clients time to find a new "
+"relay?"
msgstr ""
+#: mainwindow.cpp:1212
msgctxt "MainWindow"
msgid ""
-"Tor has automatically closed your connection in order to protect your "
-"anonymity."
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Update Failed"
+"Vidalia detected that the Tor software exited unexpectedly.\n"
+"\n"
+"Please check the message log for recent warning or error messages."
msgstr ""
+#: mainwindow.cpp:1562
msgctxt "MainWindow"
-msgid "Your software is up to date"
+msgid ""
+"The currently installed version of Tor is out of date or no longer "
+"recommended."
msgstr ""
+#: mainwindow.cpp:1564
msgctxt "MainWindow"
msgid ""
-"There are no new Tor software packages available for your computer at this "
-"time."
+"Would you like to check if a newer package is available for installation?"
msgstr ""
+#: mainwindow.cpp:1583
msgctxt "MainWindow"
-msgid "Installation Failed"
+msgid "Potentially Unsafe Connection"
msgstr ""
+#: mainwindow.cpp:1588
msgctxt "MainWindow"
-msgid "Vidalia was unable to install your software updates."
+msgid ", probably Telnet,"
msgstr ""
+#: mainwindow.cpp:1594
msgctxt "MainWindow"
-msgid "The following error occurred:"
+msgid ", probably an email client,"
msgstr ""
+#: mainwindow.cpp:1606
msgctxt "MainWindow"
msgid ""
-"Anything 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)"
+"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 ""
+#: mainwindow.cpp:1609
msgctxt "MainWindow"
msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+"Tor has automatically closed your connection in order to protect your "
+"anonymity."
msgstr ""
+#: mainwindow.cpp:1817
msgctxt "MainWindow"
-msgid "Bootstrapping torrc from %1 to %2"
+msgid "Update Failed"
msgstr ""
+#: mainwindow.cpp:1843
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 "Your software is up to date"
msgstr ""
+#: mainwindow.cpp:1845
msgctxt "MainWindow"
msgid ""
-"Vidalia detected that the Tor software exited unexpectedly.\n"
-"\n"
-"Please check the message log for recent warning or error messages."
+"There are no new Tor software packages available for your computer at this "
+"time."
msgstr ""
+#: mainwindow.cpp:1888
msgctxt "MainWindow"
-msgid "(probably Telnet)"
+msgid "Installation Failed"
msgstr ""
+#: mainwindow.cpp:1889
msgctxt "MainWindow"
-msgid "(probably an email client)"
+msgid "Vidalia was unable to install your software updates."
msgstr ""
+#: mainwindow.cpp:1890
msgctxt "MainWindow"
-msgid ""
-"One of your applications %1 appears to be making a potentially unencrypted "
-"and unsafe connection to port %2."
+msgid "The following error occurred:"
msgstr ""
+#: messagelog.cpp:189
msgctxt "MessageLog"
msgid "Error Setting Filter"
msgstr ""
+#: messagelog.cpp:190
msgctxt "MessageLog"
msgid "Vidalia was unable to register for Tor's log events."
msgstr ""
+#: messagelog.cpp:205
msgctxt "MessageLog"
msgid "Error Opening Log File"
msgstr ""
+#: messagelog.cpp:206
msgctxt "MessageLog"
msgid "Vidalia was unable to open the specified log file."
msgstr ""
+#: messagelog.cpp:227
msgctxt "MessageLog"
msgid "Log Filename Required"
msgstr ""
+#: messagelog.cpp:229
msgctxt "MessageLog"
msgid "You must enter a filename to be able to save log messages to a file."
msgstr ""
+#: messagelog.cpp:280
msgctxt "MessageLog"
msgid "Select Log File"
msgstr ""
+#: messagelog.cpp:297
msgctxt "MessageLog"
msgid "Save Log Messages"
msgstr ""
+#: messagelog.cpp:300
msgctxt "MessageLog"
msgid "Text Files (*.txt)"
msgstr ""
+#: messagelog.cpp:309
msgctxt "MessageLog"
msgid "Vidalia"
msgstr ""
+#: messagelog.cpp:360
msgctxt "MessageLog"
msgid "Find in Message Log"
msgstr ""
+#: messagelog.cpp:361
msgctxt "MessageLog"
msgid "Find:"
msgstr ""
+#: messagelog.cpp:367
msgctxt "MessageLog"
msgid "Not Found"
msgstr ""
+#: messagelog.cpp:368
msgctxt "MessageLog"
msgid "Search found 0 matches."
msgstr ""
+#: messagelog.ui:19
msgctxt "MessageLog"
msgid "Message Log"
msgstr ""
+#: messagelog.ui:452
msgctxt "MessageLog"
msgid "Message Filters..."
msgstr ""
+#: messagelog.ui:455
msgctxt "MessageLog"
msgid "Set message filters"
msgstr ""
+#: messagelog.ui:463
msgctxt "MessageLog"
msgid "History Size..."
msgstr ""
+#: messagelog.ui:466
msgctxt "MessageLog"
msgid "Set maximum number of messages to display"
msgstr ""
+#: messagelog.ui:477
msgctxt "MessageLog"
msgid "Clear"
msgstr ""
+#: messagelog.ui:480
msgctxt "MessageLog"
msgid "Clear all messages from the Message Log (Ctrl+E)"
msgstr ""
+#: messagelog.ui:483
msgctxt "MessageLog"
msgid "Ctrl+E"
msgstr ""
+#: messagelog.ui:497
msgctxt "MessageLog"
msgid "Copy"
msgstr ""
+#: messagelog.ui:500
msgctxt "MessageLog"
msgid "Copy the selected messages to the clipboard (Ctrl+C)"
msgstr ""
+#: messagelog.ui:503
msgctxt "MessageLog"
msgid "Ctrl+C"
msgstr ""
+#: messagelog.ui:514
msgctxt "MessageLog"
msgid "Select All"
msgstr ""
+#: messagelog.ui:517
msgctxt "MessageLog"
msgid "Select all messages (Ctrl+A)"
msgstr ""
+#: messagelog.ui:520
msgctxt "MessageLog"
msgid "Ctrl+A"
msgstr ""
+#: messagelog.ui:528
msgctxt "MessageLog"
msgid "Save All"
msgstr ""
+#: messagelog.ui:531
msgctxt "MessageLog"
msgid "Save all messages to a file"
msgstr ""
+#: messagelog.ui:539
msgctxt "MessageLog"
msgid "Save Selected"
msgstr ""
+#: messagelog.ui:542
msgctxt "MessageLog"
msgid "Save selected messages to a file"
msgstr ""
+#: messagelog.ui:553
msgctxt "MessageLog"
msgid "Settings"
msgstr ""
+#: messagelog.ui:556
msgctxt "MessageLog"
msgid "Adjust Message Log Settings"
msgstr ""
+#: messagelog.ui:559
msgctxt "MessageLog"
msgid "Ctrl+T"
msgstr ""
+#: messagelog.ui:567
msgctxt "MessageLog"
msgid "Help"
msgstr ""
+#: messagelog.ui:570
msgctxt "MessageLog"
msgid "Show the help browser"
msgstr ""
+#: messagelog.ui:573
msgctxt "MessageLog"
msgid "F1"
msgstr ""
+#: messagelog.ui:581
msgctxt "MessageLog"
msgid "Close"
msgstr ""
+#: messagelog.ui:584
msgctxt "MessageLog"
msgid "Close the Message Log"
msgstr ""
+#: messagelog.ui:587
msgctxt "MessageLog"
msgid "Esc"
msgstr ""
+#: messagelog.ui:598
msgctxt "MessageLog"
msgid "Find"
msgstr ""
+#: messagelog.ui:601
msgctxt "MessageLog"
msgid "Find all messages containing the search text (Ctrl+F)"
msgstr ""
+#: messagelog.ui:604
msgctxt "MessageLog"
msgid "Ctrl+F"
msgstr ""
+#: messagelog.ui:66
msgctxt "MessageLog"
msgid "Time"
msgstr ""
+#: messagelog.ui:71
msgctxt "MessageLog"
msgid "Type"
msgstr ""
+#: messagelog.ui:76
msgctxt "MessageLog"
msgid "Message"
msgstr ""
+#: messagelog.ui:160
msgctxt "MessageLog"
msgid "Saves the current Message Log settings"
msgstr ""
+#: messagelog.ui:163
msgctxt "MessageLog"
msgid "Save Settings"
msgstr ""
+#: messagelog.ui:179
msgctxt "MessageLog"
msgid "Cancels changes made to settings"
msgstr ""
+#: messagelog.ui:182
msgctxt "MessageLog"
msgid "Cancel"
msgstr ""
+#: messagelog.ui:196
msgctxt "MessageLog"
msgid "Message Filter"
msgstr ""
+#: messagelog.ui:217
msgctxt "MessageLog"
msgid "Error"
msgstr ""
+#: messagelog.ui:233
msgctxt "MessageLog"
msgid "Warning"
msgstr ""
+#: messagelog.ui:249
msgctxt "MessageLog"
msgid "Notice"
msgstr ""
+#: messagelog.ui:265
msgctxt "MessageLog"
msgid "Info"
msgstr ""
+#: messagelog.ui:281
msgctxt "MessageLog"
msgid "Debug"
msgstr ""
+#: messagelog.ui:297
msgctxt "MessageLog"
msgid "Message Log History"
msgstr ""
+#: messagelog.ui:318
msgctxt "MessageLog"
msgid "Number of messages to display in the message log window"
msgstr ""
+#: messagelog.ui:337
msgctxt "MessageLog"
msgid "messages"
msgstr ""
+#: messagelog.ui:356
msgctxt "MessageLog"
-msgid "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"
+msgid "Always Save New Log Messages"
msgstr ""
+#: messagelog.ui:371
msgctxt "MessageLog"
-msgid "Tor Status"
+msgid "Browse"
msgstr ""
+#: messagelog.ui:394
msgctxt "MessageLog"
-msgid "Advanced"
+msgid "Enable automatically saving all new log messages to a file"
msgstr ""
+#: messagelog.ui:397
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
+msgid "Automatically save new log messages to a file"
msgstr ""
+#: messagelog.cpp:126
msgctxt "MessageLog"
msgid ""
"Messages that appear when something has \n"
"gone very wrong and Tor cannot proceed."
msgstr ""
+#: messagelog.cpp:128
msgctxt "MessageLog"
msgid ""
"Messages that only appear when \n"
"something has gone wrong with Tor."
msgstr ""
+#: messagelog.cpp:132
msgctxt "MessageLog"
msgid ""
"Messages that appear infrequently \n"
@@ -2392,18 +2750,21 @@ msgid ""
"care about."
msgstr ""
+#: messagelog.cpp:134
msgctxt "MessageLog"
msgid ""
"Messages that appear frequently \n"
"during normal Tor operation."
msgstr ""
+#: messagelog.cpp:136
msgctxt "MessageLog"
msgid ""
"Hyper-verbose messages primarily of \n"
"interest to Tor developers."
msgstr ""
+#: messagelog.cpp:310
msgctxt "MessageLog"
msgid ""
"Cannot write file %1\n"
@@ -2411,1406 +2772,1292 @@ msgid ""
"%2."
msgstr ""
+#: netviewer.ui:24
msgctxt "NetViewer"
msgid "Tor Network Map"
msgstr ""
+#: netviewer.ui:239
msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
+#: netviewer.ui:245
msgctxt "NetViewer"
msgid "Refresh the list of Tor relays and connections"
msgstr ""
+#: netviewer.ui:248
msgctxt "NetViewer"
msgid "Ctrl+R"
msgstr ""
+#: netviewer.ui:256
msgctxt "NetViewer"
msgid "Help"
msgstr ""
+#: netviewer.ui:259
msgctxt "NetViewer"
msgid "Show the network map help"
msgstr ""
+#: netviewer.ui:262
msgctxt "NetViewer"
msgid "Show network map help"
msgstr ""
+#: netviewer.ui:265
msgctxt "NetViewer"
msgid "F1"
msgstr ""
+#: netviewer.ui:273
msgctxt "NetViewer"
msgid "Close"
msgstr ""
+#: netviewer.ui:279
msgctxt "NetViewer"
msgid "Close the network map"
msgstr ""
+#: netviewer.ui:282
msgctxt "NetViewer"
msgid "Esc"
msgstr ""
+#: netviewer.ui:290
msgctxt "NetViewer"
msgid "Zoom In"
msgstr ""
+#: netviewer.ui:296
msgctxt "NetViewer"
msgid "Zoom in on the network map"
msgstr ""
+#: netviewer.ui:299
msgctxt "NetViewer"
msgid "+"
msgstr ""
+#: netviewer.ui:307
msgctxt "NetViewer"
msgid "Zoom Out"
msgstr ""
+#: netviewer.ui:313
msgctxt "NetViewer"
msgid "Zoom out on the network map"
msgstr ""
+#: netviewer.ui:316
msgctxt "NetViewer"
msgid "-"
msgstr ""
+#: netviewer.ui:324
msgctxt "NetViewer"
msgid "Zoom To Fit"
msgstr ""
+#: netviewer.ui:330
msgctxt "NetViewer"
msgid "Zooms to fit all currently displayed circuits"
msgstr ""
+#: netviewer.ui:333
msgctxt "NetViewer"
msgid "Ctrl+Z"
msgstr ""
+#: netviewer.cpp:507
msgctxt "NetViewer"
msgid "Relay Not Found"
msgstr ""
+#: netviewer.cpp:508
msgctxt "NetViewer"
msgid "No details on the selected relay are available."
msgstr ""
+#: netviewer.cpp:523
msgctxt "NetViewer"
msgid "Unknown"
msgstr ""
-msgctxt "NetViewer"
-msgid "Full Screen"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "View the network map as a full screen window"
-msgstr ""
-
-msgctxt "NetViewer"
-msgid "Ctrl+F"
-msgstr ""
-
+#: networkpage.cpp:193
msgctxt "NetworkPage"
msgid "Invalid Bridge"
msgstr ""
+#: networkpage.cpp:194
msgctxt "NetworkPage"
msgid "The specified bridge identifier is not valid."
msgstr ""
+#: networkpage.cpp:241
msgctxt "NetworkPage"
msgid "Copy (Ctrl+C)"
msgstr ""
+#: networkpage.cpp:272
msgctxt "NetworkPage"
msgid ""
"You must specify both an IP address or hostname and a port number to "
"configure Tor to use a proxy to access the Internet."
msgstr ""
+#: networkpage.cpp:278
msgctxt "NetworkPage"
msgid ""
"You must specify one or more ports to which your firewall allows you to "
"connect."
msgstr ""
+#: networkpage.cpp:314
msgctxt "NetworkPage"
msgid "'%1' is not a valid port number."
msgstr ""
+#: networkpage.ui:25
msgctxt "NetworkPage"
msgid "Check if your local network requires a proxy to access the Internet"
msgstr ""
+#: networkpage.ui:28
msgctxt "NetworkPage"
msgid "I use a proxy to access the Internet"
msgstr ""
+#: networkpage.ui:58
msgctxt "NetworkPage"
msgid "Proxy Settings"
msgstr ""
+#: networkpage.ui:70
+msgctxt "NetworkPage"
+msgid "HTTP Proxy:"
+msgstr ""
+
+#: networkpage.ui:80
msgctxt "NetworkPage"
msgid "Username:"
msgstr ""
+#: networkpage.ui:90
+msgctxt "NetworkPage"
+msgid "Use this proxy for HTTPS also"
+msgstr ""
+
+#: networkpage.ui:108
msgctxt "NetworkPage"
msgid "Password:"
msgstr ""
+#: networkpage.ui:135
msgctxt "NetworkPage"
msgid "Port:"
msgstr ""
+#: networkpage.ui:176
msgctxt "NetworkPage"
msgid "Check to only connect to relays using ports allowed by your firewall"
msgstr ""
+#: networkpage.ui:179
msgctxt "NetworkPage"
msgid "My firewall only lets me connect to certain ports"
msgstr ""
+#: networkpage.ui:203
msgctxt "NetworkPage"
msgid "Firewall Settings"
msgstr ""
+#: networkpage.ui:215
msgctxt "NetworkPage"
msgid "Allowed Ports:"
msgstr ""
+#: networkpage.ui:225
msgctxt "NetworkPage"
msgid "80, 443"
msgstr ""
+#: networkpage.ui:235
msgctxt "NetworkPage"
msgid ""
"Check to encrypt directory requests and, optionally, use bridge relays to "
"access the Tor network"
msgstr ""
+#: networkpage.ui:238
msgctxt "NetworkPage"
msgid "My ISP blocks connections to the Tor network"
msgstr ""
+#: networkpage.ui:262
msgctxt "NetworkPage"
msgid "Bridge Settings"
msgstr ""
-msgctxt "NetworkPage"
-msgid "Add a Bridge:"
-msgstr ""
-
-msgctxt "NetworkPage"
-msgid "Remove the selected bridges from the list"
-msgstr ""
-
-msgctxt "NetworkPage"
-msgid "Copy the selected bridges to the clipboard"
-msgstr ""
-
-msgctxt "NetworkPage"
-msgid "Find Bridges Now"
-msgstr ""
-
-msgctxt "NetworkPage"
-msgid "<a href=\"bridges.finding\">How else can I find bridges?</a>"
-msgstr ""
-
-msgctxt "NetworkPage"
-msgid "<a href=\"bridges.finding\">How can I find bridges?</a>"
-msgstr ""
-
+#: networkpage.ui:274
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:"
+"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 "Type:"
-msgstr ""
-
-msgctxt "NetworkPage"
-msgid "You must select the proxy type."
-msgstr ""
-
-msgctxt "NetworkPage"
-msgid "SOCKS 4"
+msgid "Add a Bridge:"
msgstr ""
+#: networkpage.ui:318
msgctxt "NetworkPage"
-msgid "SOCKS 5"
+msgid "<a href=\"bridges.finding\">How do I find a bridge?</a>"
msgstr ""
+#: networkpage.ui:383
msgctxt "NetworkPage"
-msgid "HTTP"
+msgid "Remove the selected bridges from the list"
msgstr ""
+#: networkpage.ui:399
msgctxt "NetworkPage"
-msgid "HTTP / HTTPS"
+msgid "Copy the selected bridges to the clipboard"
msgstr ""
+#: policy.cpp:167
msgctxt "Policy"
msgid "accept"
msgstr ""
+#: policy.cpp:167
msgctxt "Policy"
msgid "reject"
msgstr ""
+#: routerdescriptor.cpp:76
msgctxt "RouterDescriptor"
msgid "Online"
msgstr ""
+#: routerdescriptor.cpp:78
msgctxt "RouterDescriptor"
msgid "Hibernating"
msgstr ""
+#: routerdescriptor.cpp:80
msgctxt "RouterDescriptor"
msgid "Offline"
msgstr ""
+#: routerdescriptorview.cpp:101
msgctxt "RouterDescriptorView"
msgid "Location:"
msgstr ""
+#: routerdescriptorview.cpp:105
msgctxt "RouterDescriptorView"
msgid "IP Address:"
msgstr ""
+#: routerdescriptorview.cpp:106
msgctxt "RouterDescriptorView"
msgid "Platform:"
msgstr ""
+#: routerdescriptorview.cpp:110
msgctxt "RouterDescriptorView"
msgid "Bandwidth:"
msgstr ""
+#: routerdescriptorview.cpp:112
msgctxt "RouterDescriptorView"
msgid "Uptime:"
msgstr ""
+#: routerdescriptorview.cpp:118
msgctxt "RouterDescriptorView"
msgid "Last Updated:"
msgstr ""
+#: routerdescriptorview.cpp:49
msgctxt "RouterDescriptorView"
msgid "Copy"
msgstr ""
+#: routerinfodialog.cpp:54
msgctxt "RouterInfoDialog"
msgid "Hibernating"
msgstr ""
+#: routerinfodialog.cpp:57
msgctxt "RouterInfoDialog"
msgid "Online"
msgstr ""
+#: routerinfodialog.cpp:59
msgctxt "RouterInfoDialog"
msgid "Offline"
msgstr ""
+#: routerinfodialog.cpp:61
msgctxt "RouterInfoDialog"
msgid "Unknown"
msgstr ""
+#: routerinfodialog.ui:13
msgctxt "RouterInfoDialog"
msgid "Relay Details"
msgstr ""
+#: routerinfodialog.ui:29
msgctxt "RouterInfoDialog"
msgid "Summary"
msgstr ""
+#: routerinfodialog.ui:47
msgctxt "RouterInfoDialog"
msgid "Name:"
msgstr ""
+#: routerinfodialog.ui:82
msgctxt "RouterInfoDialog"
msgid "Status:"
msgstr ""
+#: routerinfodialog.ui:117
msgctxt "RouterInfoDialog"
msgid "Location:"
msgstr ""
+#: routerinfodialog.ui:152
msgctxt "RouterInfoDialog"
msgid "IP Address:"
msgstr ""
+#: routerinfodialog.ui:187
msgctxt "RouterInfoDialog"
msgid "Platform:"
msgstr ""
+#: routerinfodialog.ui:231
msgctxt "RouterInfoDialog"
msgid "Bandwidth:"
msgstr ""
+#: routerinfodialog.ui:266
msgctxt "RouterInfoDialog"
msgid "Uptime:"
msgstr ""
+#: routerinfodialog.ui:301
msgctxt "RouterInfoDialog"
msgid "Contact:"
msgstr ""
+#: routerinfodialog.ui:352
msgctxt "RouterInfoDialog"
msgid "Last Updated:"
msgstr ""
+#: routerinfodialog.ui:376
msgctxt "RouterInfoDialog"
msgid "Descriptor"
msgstr ""
+#: routerlistitem.cpp:67
msgctxt "RouterListItem"
msgid "Offline"
msgstr ""
+#: routerlistitem.cpp:71
msgctxt "RouterListItem"
msgid "Hibernating"
msgstr ""
+#: routerlistitem.cpp:83
msgctxt "RouterListItem"
msgid "%1 KB/s"
msgstr ""
+#: routerlistwidget.cpp:49
msgctxt "RouterListWidget"
msgid "Relay"
msgstr ""
+#: routerlistwidget.cpp:74
msgctxt "RouterListWidget"
msgid "Zoom to Relay"
msgstr ""
+#: routerlistwidget.cpp:220
msgctxt "RouterListWidget"
msgid "%1 relays online"
msgstr ""
+#: routerlistwidget.cpp:67
msgctxt "RouterListWidget"
msgid "Copy"
msgstr ""
+#: routerlistwidget.cpp:68
msgctxt "RouterListWidget"
msgid "Nickname"
msgstr ""
+#: routerlistwidget.cpp:71
msgctxt "RouterListWidget"
msgid "Fingerprint"
msgstr ""
+#: serverpage.cpp:145
msgctxt "ServerPage"
msgid "Bridge Support Unavailable"
msgstr ""
+#: serverpage.cpp:148
msgctxt "ServerPage"
msgid ""
"You have configured Tor to act as a bridge relay for censored users, but "
"your version of Tor does not support bridges."
msgstr ""
+#: serverpage.cpp:150
msgctxt "ServerPage"
msgid ""
"Please upgrade your Tor software or configure Tor to act as a normal Tor "
"relay."
msgstr ""
+#: serverpage.cpp:204
msgctxt "ServerPage"
msgid "Your bridge relay is not running."
msgstr ""
+#: serverpage.cpp:269
msgctxt "ServerPage"
msgid "You must specify at least a relay nickname and port."
msgstr ""
+#: serverpage.ui:19
msgctxt "ServerPage"
msgid "Run as a client only"
msgstr ""
+#: serverpage.ui:26
msgctxt "ServerPage"
msgid "Relay traffic for the Tor network"
msgstr ""
+#: serverpage.ui:74
msgctxt "ServerPage"
msgid "Relay Port:"
msgstr ""
+#: serverpage.ui:93
msgctxt "ServerPage"
msgid "Enable to mirror the relay directory"
msgstr ""
+#: serverpage.ui:96
+msgctxt "ServerPage"
+msgid "Mirror the Relay Directory"
+msgstr ""
+
+#: serverpage.ui:122
msgctxt "ServerPage"
msgid "Attempt to automatically configure port forwarding"
msgstr ""
+#: serverpage.ui:134
msgctxt "ServerPage"
msgid "Test"
msgstr ""
+#: serverpage.ui:144
msgctxt "ServerPage"
msgid "Show help topic on port forwarding"
msgstr ""
+#: serverpage.ui:207
msgctxt "ServerPage"
msgid "Directory Port:"
msgstr ""
+#: serverpage.ui:238
msgctxt "ServerPage"
msgid "Directory Port Number"
msgstr ""
+#: serverpage.ui:250
msgctxt "ServerPage"
msgid "Contact Info:"
msgstr ""
+#: serverpage.ui:308
msgctxt "ServerPage"
msgid "Name of your relay"
msgstr ""
+#: serverpage.ui:339
msgctxt "ServerPage"
msgid "Port on which users and other relays can communicate with your relay"
msgstr ""
+#: serverpage.ui:349
msgctxt "ServerPage"
msgid "Nickname:"
msgstr ""
+#: serverpage.ui:65
msgctxt "ServerPage"
msgid "Basic Settings"
msgstr ""
+#: serverpage.ui:396
msgctxt "ServerPage"
msgid ""
"For Internet connections with fast download speed but slow upload, please "
"list your upload speed here."
msgstr ""
+#: serverpage.ui:421
msgctxt "ServerPage"
msgid "Cable/DSL 256 Kbps"
msgstr ""
+#: serverpage.ui:426
msgctxt "ServerPage"
msgid "Cable/DSL 512 Kbps"
msgstr ""
+#: serverpage.ui:431
msgctxt "ServerPage"
msgid "Cable/DSL 768 Kbps"
msgstr ""
+#: serverpage.ui:436
msgctxt "ServerPage"
msgid "T1/Cable/DSL 1.5 Mbps"
msgstr ""
+#: serverpage.ui:441
msgctxt "ServerPage"
msgid "> 1.5 Mbps"
msgstr ""
+#: serverpage.ui:446
msgctxt "ServerPage"
msgid "Custom"
msgstr ""
+#: serverpage.ui:411
msgctxt "ServerPage"
msgid "Select the entry that most closely resembles your Internet connection"
msgstr ""
+#: serverpage.ui:457
msgctxt "ServerPage"
msgid "Show help topic on bandwidth rate limits"
msgstr ""
+#: serverpage.ui:527
msgctxt "ServerPage"
msgid "Average Rate"
msgstr ""
+#: serverpage.ui:548
msgctxt "ServerPage"
msgid "Long-term average bandwidth limit"
msgstr ""
+#: serverpage.ui:620
msgctxt "ServerPage"
msgid "KB/s"
msgstr ""
+#: serverpage.ui:586
msgctxt "ServerPage"
msgid "Maximum Rate"
msgstr ""
+#: serverpage.ui:607
msgctxt "ServerPage"
msgid "Peak bandwidth rate limit"
msgstr ""
+#: serverpage.ui:649
msgctxt "ServerPage"
msgid ""
"Your maximum bandwidth rate must be greater than or equal to your average "
"bandwidth rate. Both values must be at least 20 KB/s."
msgstr ""
+#: serverpage.ui:369
msgctxt "ServerPage"
msgid "Bandwidth Limits"
msgstr ""
+#: serverpage.ui:696
msgctxt "ServerPage"
msgid "Ports 6660 - 6669 and 6697"
msgstr ""
+#: serverpage.ui:699
msgctxt "ServerPage"
msgid "Internet Relay Chat (IRC)"
msgstr ""
+#: serverpage.ui:709
msgctxt "ServerPage"
msgid "Ports 110, 143, 993 and 995"
msgstr ""
+#: serverpage.ui:712
msgctxt "ServerPage"
msgid "Retrieve Mail (POP, IMAP)"
msgstr ""
+#: serverpage.ui:722
msgctxt "ServerPage"
msgid "Ports unspecified by other checkboxes"
msgstr ""
+#: serverpage.ui:725
msgctxt "ServerPage"
msgid "Misc Other Services"
msgstr ""
+#: serverpage.ui:735
msgctxt "ServerPage"
msgid "Ports 706, 1863, 5050, 5190, 5222, 5223, 8300 and 8888"
msgstr ""
+#: serverpage.ui:738
msgctxt "ServerPage"
msgid "Instant Messaging (IM)"
msgstr ""
+#: serverpage.ui:748
msgctxt "ServerPage"
msgid "Port 443"
msgstr ""
+#: serverpage.ui:751
msgctxt "ServerPage"
msgid "Secure Websites (SSL)"
msgstr ""
+#: serverpage.ui:761
msgctxt "ServerPage"
msgid "Port 80"
msgstr ""
+#: serverpage.ui:764
msgctxt "ServerPage"
msgid "Websites"
msgstr ""
+#: serverpage.ui:784
msgctxt "ServerPage"
msgid "Show help topic on exit policies"
msgstr ""
+#: serverpage.ui:856
msgctxt "ServerPage"
-msgid ""
-"What Internet resources should users be able to access from your relay?"
+msgid "What Internet resources should users be able to access from your relay?"
msgstr ""
+#: serverpage.ui:866
msgctxt "ServerPage"
msgid ""
"Tor will still block some outgoing mail and file sharing applications by "
"default to reduce spam and other abuse."
msgstr ""
+#: serverpage.ui:676
msgctxt "ServerPage"
msgid "Exit Policies"
msgstr ""
+#: serverpage.ui:902
msgctxt "ServerPage"
msgid "Let others access your bridge by giving them this line:"
msgstr ""
+#: serverpage.ui:920
msgctxt "ServerPage"
msgid ""
"This is the identity of your bridge relay that you can give to other people"
msgstr ""
+#: serverpage.ui:942
msgctxt "ServerPage"
msgid "Copy your bridge relay's identity to the clipboard"
msgstr ""
+#: serverpage.cpp:555
msgctxt "ServerPage"
msgid "No Recent Usage"
msgstr ""
+#: serverpage.cpp:556
msgctxt "ServerPage"
msgid "No clients have used your relay recently."
msgstr ""
+#: serverpage.cpp:559
msgctxt "ServerPage"
msgid ""
"Leave your relay running so clients have a better chance of finding and "
"using it."
msgstr ""
+#: serverpage.cpp:594
msgctxt "ServerPage"
msgid "Bridge History"
msgstr ""
+#: serverpage.cpp:596
msgctxt "ServerPage"
msgid "Vidalia was unable to retrieve your bridge's usage history."
msgstr ""
+#: serverpage.cpp:599
msgctxt "ServerPage"
msgid ""
"Tor returned an improperly formatted response when Vidalia requested your "
"bridge's usage history."
msgstr ""
+#: serverpage.cpp:600
msgctxt "ServerPage"
msgid "The returned response was: %1"
msgstr ""
+#: serverpage.ui:33
msgctxt "ServerPage"
msgid "Help censored users reach the Tor network"
msgstr ""
-msgctxt "ServerPage"
-msgid "<a href=\"#bridgeUsage\">Who has used my bridge?</a>"
-msgstr ""
-
-msgctxt "ServerPage"
-msgid "<a href=\"#bridgeHelp\">What's this?</a>"
-msgstr ""
-
-msgctxt "ServerPage"
-msgid "Automatically distribute my bridge address"
-msgstr ""
-
-msgctxt "ServerPage"
-msgid "Mirror the Relay Directory"
-msgstr ""
-
+#: serverpage.ui:185
msgctxt "ServerPage"
msgid ""
"Email address at which you may be reached if there is a\n"
"problem with your relay. You might also include your PGP or GPG fingerprint."
msgstr ""
+#: serverpage.ui:958
+msgctxt "ServerPage"
+msgid "<a href=\"#bridgeUsage\">Who has used my bridge?</a>"
+msgstr ""
+
+#: servicepage.cpp:112
msgctxt "ServicePage"
msgid "Error while trying to unpublish all services"
msgstr ""
+#: servicepage.cpp:119
msgctxt "ServicePage"
msgid ""
"Please configure at least a service directory and a virtual port for each "
"service you want to save. Remove the other ones."
msgstr ""
+#: servicepage.cpp:596
msgctxt "ServicePage"
msgid "Error"
msgstr ""
+#: servicepage.cpp:451
msgctxt "ServicePage"
msgid "Please select a Service."
msgstr ""
+#: servicepage.cpp:457
msgctxt "ServicePage"
msgid "Select Service Directory"
msgstr ""
+#: servicepage.cpp:546
msgctxt "ServicePage"
msgid "Virtual Port may only contain valid port numbers [1..65535]."
msgstr ""
+#: servicepage.cpp:577
msgctxt "ServicePage"
msgid "Target may only contain address:port, address, or port."
msgstr ""
+#: servicepage.cpp:597
msgctxt "ServicePage"
msgid "Directory already in use by another service."
msgstr ""
+#: servicepage.ui:19
msgctxt "ServicePage"
msgid "Form"
msgstr ""
+#: servicepage.ui:31
msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
+#: servicepage.ui:56
msgctxt "ServicePage"
msgid "Onion Address"
msgstr ""
+#: servicepage.ui:61
msgctxt "ServicePage"
msgid "Virtual Port"
msgstr ""
+#: servicepage.ui:66
msgctxt "ServicePage"
msgid "Target"
msgstr ""
+#: servicepage.ui:71
msgctxt "ServicePage"
msgid "Directory Path"
msgstr ""
+#: servicepage.ui:76
msgctxt "ServicePage"
msgid "Enabled"
msgstr ""
+#: servicepage.ui:84
msgctxt "ServicePage"
msgid "Add new service to list"
msgstr ""
+#: servicepage.ui:97
msgctxt "ServicePage"
msgid "Remove selected service from list"
msgstr ""
+#: servicepage.ui:110
msgctxt "ServicePage"
msgid "Copy onion address of selected service to clipboard"
msgstr ""
+#: servicepage.ui:123
msgctxt "ServicePage"
msgid "Browse in local file system and choose directory for selected service"
msgstr ""
+#: servicepage.cpp:383
msgctxt "ServicePage"
msgid "Created by Tor"
msgstr ""
-msgctxt "StatusEventWidget"
-msgid "Copy to Clipboard"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "The Tor Software is Running"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "You are currently running version \"%1\" of the Tor software."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "The Tor Software is not Running"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Click \"Start Tor\" in the Vidalia Control Panel to restart the Tor "
-"software. If Tor exited unexpectedly, select the \"Advanced\" tab above for "
-"details about any errors encountered."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"You are currently running version \"%1\" of the Tor software, which is no "
-"longer recommended. Please upgrade to the most recent version of the "
-"software, which may contain important security, reliability and performance "
-"fixes."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"You are currently running version \"%1\" of the Tor software, which may no "
-"longer work with the current Tor network. Please upgrade to the most recent "
-"version of the software, which may contain important security, reliability "
-"and performance fixes."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Your Tor Software is Out-of-date"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Connected to the Tor Network"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"We were able to successfully establish a connection to the Tor network. You "
-"can now configure your applications to use the Internet anonymously."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Tor Software Error"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"The Tor software encountered an internal bug. Please report the following "
-"error message to the Tor developers at bugs.torproject.org: \"%1\""
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Tor has determined that your computer's clock may be set to %1 seconds in "
-"the past compared to the source \"%2\". If your clock is not correct, Tor "
-"will not be able to function. Please verify your computer displays the "
-"correct time."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Tor has determined that your computer's clock may be set to %1 seconds in "
-"the future compared to the source \"%2\". If your clock is not correct, Tor "
-"will not be able to function. Please verify your computer displays the "
-"correct time."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Your Computer's Clock is Potentially Incorrect"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"One of the applications on your computer may have attempted to make an "
-"unencrypted connection through Tor to port %1. Sending unencrypted "
-"information over the Tor network is dangerous and not recommended. For your "
-"protection, Tor has automatically closed this connection."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"One of the applications on your computer may have attempted to make an "
-"unencrypted connection through Tor to port %1. Sending unencrypted "
-"information over the Tor network is dangerous and not recommended."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Potentially Dangerous Connection!"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"One of your applications established a connection through Tor to \"%1\" "
-"using a protocol that may leak information about your destination. Please "
-"ensure you configure your applications to use only SOCKS4a or SOCKS5 with "
-"remote hostname resolution."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Unknown SOCKS Protocol"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"One of your applications tried to establish a connection through Tor using a"
-" protocol that Tor does not understand. Please ensure you configure your "
-"applications to use only SOCKS4a or SOCKS5 with remote hostname resolution."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Invalid Destination Hostname"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"One of your applications tried to establish a connection through Tor to "
-"\"%1\", which Tor does not recognize as a valid hostname. Please check your "
-"application's configuration."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "External IP Address Changed"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Tor has determined your relay's public IP address is currently %1%2. If that"
-" is not correct, please consider setting the 'Address' option in your "
-"relay's configuration."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "DNS Hijacking Detected"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Tor detected that your DNS provider is providing false responses for domains"
-" that do not exist. Some ISPs and other DNS providers, such as OpenDNS, are "
-"known to do this in order to display their own search or advertising pages."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Tor detected that your DNS provider is providing false responses for well "
-"known domains. Since clients rely on Tor network relays to provide accurate "
-"DNS repsonses, your relay will not be configured as an exit relay."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Checking Server Port Reachability"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Tor is trying to determine if your relay's server port is reachable from the"
-" Tor network by connecting to itself at %1:%2. This test could take several "
-"minutes."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Server Port Reachability Test Successful!"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Your relay's server port is reachable from the Tor network!"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Server Port Reachability Test Failed"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Your relay's server port is not reachable by other Tor clients. This can "
-"happen if you are behind a router or firewall that requires you to set up "
-"port forwarding. If %1:%2 is not your correct IP address and server port, "
-"please check your relay's configuration."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Checking Directory Port Reachability"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Tor is trying to determine if your relay's directory port is reachable from "
-"the Tor network by connecting to itself at %1:%2. This test could take "
-"several minutes."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Directory Port Reachability Test Successful!"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Your relay's directory port is reachable from the Tor network!"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Directory Port Reachability Test Failed"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Your relay's directory port is not reachable by other Tor clients. This can "
-"happen if you are behind a router or firewall that requires you to set up "
-"port forwarding. If %1:%2 is not your correct IP address and directory port,"
-" please check your relay's configuration."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Relay Descriptor Rejected"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Your relay's descriptor, which enables clients to connect to your relay, was"
-" rejected by the directory server at %1:%2. The reason given was: %3"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Your Relay is Online"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Your relay is now online and available for Tor clients to use. You should "
-"see an increase in network traffic shown by the Bandwidth Graph within a few"
-" hours as more clients learn about your relay. Thank you for contributing to"
-" the Tor network!"
-msgstr ""
-
+#: stream.cpp:131
msgctxt "Stream"
msgid "New"
msgstr ""
+#: stream.cpp:133
msgctxt "Stream"
msgid "Resolving"
msgstr ""
+#: stream.cpp:134
msgctxt "Stream"
msgid "Connecting"
msgstr ""
+#: stream.cpp:135
msgctxt "Stream"
msgid "Open"
msgstr ""
+#: stream.cpp:136
msgctxt "Stream"
msgid "Failed"
msgstr ""
+#: stream.cpp:137
msgctxt "Stream"
msgid "Closed"
msgstr ""
+#: stream.cpp:138
msgctxt "Stream"
msgid "Retrying"
msgstr ""
+#: stream.cpp:139
msgctxt "Stream"
msgid "Remapped"
msgstr ""
+#: stream.cpp:140
msgctxt "Stream"
msgid "Unknown"
msgstr ""
+#: torprocess.cpp:107
msgctxt "TorProcess"
msgid "Process %1 failed to stop. [%2]"
msgstr ""
+#: torservice.cpp:144
msgctxt "TorService"
msgid "The Tor service is not installed."
msgstr ""
+#: torservice.cpp:162
msgctxt "TorService"
msgid "Unable to start the Tor service."
msgstr ""
+#: torsettings.cpp:108
msgctxt "TorSettings"
msgid "Failed to hash the control password."
msgstr ""
-msgctxt "TorrcDialog"
-msgid "Editing torrc"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid ""
-"Save settings. If unchecked it will only apply settings to the current Tor "
-"instance."
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Cut"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Copy"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Paste"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Undo"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Redo"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Select All"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Apply all"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Apply selection only"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Error connecting to Tor"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Selection is empty. Please select some text, or check \"Apply all\""
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Error at line %1: \"%2\""
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Error"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "An error ocurred while opening torrc file"
-msgstr ""
-
+#: upnpcontrol.cpp:139
msgctxt "UPNPControl"
msgid "Success"
msgstr ""
+#: upnpcontrol.cpp:141
msgctxt "UPNPControl"
msgid "No UPnP-enabled devices found"
msgstr ""
+#: upnpcontrol.cpp:143
msgctxt "UPNPControl"
msgid "No valid UPnP-enabled Internet gateway devices found"
msgstr ""
+#: upnpcontrol.cpp:145
msgctxt "UPNPControl"
msgid "WSAStartup failed"
msgstr ""
+#: upnpcontrol.cpp:147
msgctxt "UPNPControl"
msgid "Failed to add a port mapping"
msgstr ""
+#: upnpcontrol.cpp:149
msgctxt "UPNPControl"
msgid "Failed to retrieve a port mapping"
msgstr ""
+#: upnpcontrol.cpp:151
msgctxt "UPNPControl"
msgid "Failed to remove a port mapping"
msgstr ""
+#: upnpcontrol.cpp:153
msgctxt "UPNPControl"
msgid "Unknown error"
msgstr ""
+#: upnptestdialog.cpp:112
msgctxt "UPNPTestDialog"
msgid "Discovering UPnP-enabled devices"
msgstr ""
+#: upnptestdialog.cpp:117
msgctxt "UPNPTestDialog"
msgid "Updating directory port mapping"
msgstr ""
+#: upnptestdialog.cpp:122
msgctxt "UPNPTestDialog"
msgid "Updating relay port mapping"
msgstr ""
+#: upnptestdialog.cpp:127
msgctxt "UPNPTestDialog"
msgid "Test completed successfully!"
msgstr ""
+#: upnptestdialog.ui:13
msgctxt "UPNPTestDialog"
msgid "Testing UPnP Support"
msgstr ""
+#: upnptestdialog.ui:92
msgctxt "UPNPTestDialog"
msgid "Testing Universal Plug & Play Support"
msgstr ""
+#: updateprocess.cpp:195
msgctxt "UpdateProcess"
msgid ""
-"Vidalia was unable to check for available software updates because it could "
-"not find '%1'."
+"Vidalia was unable to check for available software updates because Tor's "
+"handy pocket creature died. Sorry."
msgstr ""
+#: updateprocess.cpp:211
msgctxt "UpdateProcess"
msgid ""
-"Vidalia was unable to check for available software updates because Tor's "
-"update process exited unexpectedly."
+"Vidalia was unable to check for available software updates because it could "
+"not find '%1'."
msgstr ""
+#: updateprogressdialog.cpp:30
msgctxt "UpdateProgressDialog"
msgid "Checking for available updates..."
msgstr ""
+#: updateprogressdialog.ui:87
msgctxt "UpdateProgressDialog"
msgid "Hide"
msgstr ""
+#: updateprogressdialog.cpp:41
msgctxt "UpdateProgressDialog"
msgid "Downloading updates..."
msgstr ""
+#: updateprogressdialog.cpp:45
msgctxt "UpdateProgressDialog"
msgid "Installing updated software..."
msgstr ""
+#: updateprogressdialog.cpp:54
msgctxt "UpdateProgressDialog"
msgid "Done! Your software is now up to date."
msgstr ""
+#: updateprogressdialog.cpp:60
msgctxt "UpdateProgressDialog"
msgid "OK"
msgstr ""
+#: updateprogressdialog.ui:13
msgctxt "UpdateProgressDialog"
msgid "Software Updates"
msgstr ""
+#: updateprogressdialog.ui:36
msgctxt "UpdateProgressDialog"
msgid "Checking for updates..."
msgstr ""
+#: updateprogressdialog.ui:80
msgctxt "UpdateProgressDialog"
msgid "Cancel"
msgstr ""
+#: updatesavailabledialog.ui:13
msgctxt "UpdatesAvailableDialog"
msgid "Software Updates Available"
msgstr ""
+#: updatesavailabledialog.ui:38
msgctxt "UpdatesAvailableDialog"
msgid "Remind Me Later"
msgstr ""
+#: updatesavailabledialog.ui:45
msgctxt "UpdatesAvailableDialog"
msgid "Install"
msgstr ""
+#: updatesavailabledialog.ui:57
msgctxt "UpdatesAvailableDialog"
msgid "The following updated software packages are ready for installation:"
msgstr ""
+#: updatesavailabledialog.ui:78
msgctxt "UpdatesAvailableDialog"
msgid "Package"
msgstr ""
+#: updatesavailabledialog.ui:83
msgctxt "UpdatesAvailableDialog"
msgid "Version"
msgstr ""
+#: vmessagebox.cpp:77
msgctxt "VMessageBox"
msgid "OK"
msgstr ""
+#: vmessagebox.cpp:78
msgctxt "VMessageBox"
msgid "Cancel"
msgstr ""
+#: vmessagebox.cpp:79
msgctxt "VMessageBox"
msgid "Yes"
msgstr ""
+#: vmessagebox.cpp:80
msgctxt "VMessageBox"
msgid "No"
msgstr ""
+#: vmessagebox.cpp:81
msgctxt "VMessageBox"
msgid "Help"
msgstr ""
+#: vmessagebox.cpp:82
msgctxt "VMessageBox"
msgid "Retry"
msgstr ""
+#: vmessagebox.cpp:83
msgctxt "VMessageBox"
msgid "Show Log"
msgstr ""
+#: vmessagebox.cpp:84
msgctxt "VMessageBox"
msgid "Show Settings"
msgstr ""
+#: vmessagebox.cpp:85
msgctxt "VMessageBox"
msgid "Continue"
msgstr ""
+#: vmessagebox.cpp:86
msgctxt "VMessageBox"
msgid "Quit"
msgstr ""
+#: vmessagebox.cpp:87
msgctxt "VMessageBox"
msgid "Browse"
msgstr ""
+#: main.cpp:80
msgctxt "Vidalia"
msgid "Invalid Argument"
msgstr ""
+#: main.cpp:94
msgctxt "Vidalia"
msgid "Vidalia is already running"
msgstr ""
+#: vidalia.cpp:191
msgctxt "Vidalia"
msgid "Displays this usage message and exits."
msgstr ""
+#: vidalia.cpp:193
msgctxt "Vidalia"
msgid "Resets ALL stored Vidalia settings."
msgstr ""
+#: vidalia.cpp:195
msgctxt "Vidalia"
msgid "Sets the directory Vidalia uses for data files."
msgstr ""
+#: vidalia.cpp:197
msgctxt "Vidalia"
msgid "Sets the name and location of Vidalia's pidfile."
msgstr ""
+#: vidalia.cpp:199
msgctxt "Vidalia"
msgid "Sets the name and location of Vidalia's logfile."
msgstr ""
+#: vidalia.cpp:202
msgctxt "Vidalia"
msgid "Sets the verbosity of Vidalia's logging."
msgstr ""
+#: vidalia.cpp:205
msgctxt "Vidalia"
msgid "Sets Vidalia's interface style."
msgstr ""
+#: vidalia.cpp:208
msgctxt "Vidalia"
msgid "Sets Vidalia's language."
msgstr ""
+#: vidalia.cpp:212
msgctxt "Vidalia"
msgid "Vidalia Usage Information"
msgstr ""
-msgctxt "Vidalia"
-msgid "Unable to open log file '%1': %2"
-msgstr ""
-
-msgctxt "Vidalia"
-msgid "Value required for parameter :"
-msgstr ""
-
+#: vidalia.cpp:260
msgctxt "Vidalia"
msgid "Invalid language code specified:"
msgstr ""
+#: vidalia.cpp:267
msgctxt "Vidalia"
msgid "Invalid GUI style specified:"
msgstr ""
+#: vidalia.cpp:273
msgctxt "Vidalia"
msgid "Invalid log level specified:"
msgstr ""
+#: vidalia.cpp:279
+msgctxt "Vidalia"
+msgid "Unable to open log file '%1': %2"
+msgstr ""
+
+#: main.cpp:100
msgctxt "Vidalia"
msgid ""
-"Another Vidalia process is possibly already running. If there really is not another Vidalia process running, you can choose to continue anyway.\n"
+"Another Vidalia process is possibly already running. If there really is not "
+"another Vidalia process running, you can choose to continue anyway.\n"
"\n"
"Would you like to continue starting Vidalia?"
msgstr ""
+#: stringutil.cpp:323
msgctxt "stringutil.h"
-msgid "%1 secs"
+msgid "%1 days"
msgstr ""
+#: stringutil.cpp:325
msgctxt "stringutil.h"
-msgid "%1 B/s"
+msgid "%1 hours"
msgstr ""
+#: stringutil.cpp:327
msgctxt "stringutil.h"
-msgid "%1 KB/s"
+msgid "%1 mins"
msgstr ""
+#: stringutil.cpp:329
msgctxt "stringutil.h"
-msgid "%1 MB/s"
+msgid "%1 secs"
msgstr ""
+#: stringutil.cpp:348
msgctxt "stringutil.h"
-msgid "%1 GB/s"
+msgid "%1 B/s"
msgstr ""
+#: stringutil.cpp:350
msgctxt "stringutil.h"
-msgid "%1 days"
+msgid "%1 KB/s"
msgstr ""
+#: stringutil.cpp:352
msgctxt "stringutil.h"
-msgid "%1 hours"
+msgid "%1 MB/s"
msgstr ""
+#: stringutil.cpp:354
msgctxt "stringutil.h"
-msgid "%1 mins"
+msgid "%1 GB/s"
msgstr ""
-
-
diff --git a/src/vidalia/i18n/po/so/qt_so.po b/src/vidalia/i18n/po/so/qt_so.po
index 2544f49..0797d11 100644
--- a/src/vidalia/i18n/po/so/qt_so.po
+++ b/src/vidalia/i18n/po/so/qt_so.po
@@ -1,11 +1,10 @@
#
-# Translators:
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-08-20 03:25+0000\n"
-"PO-Revision-Date: 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"
@@ -431,5 +430,3 @@ msgstr ""
msgctxt "QFileSystemModel"
msgid "%1 bytes"
msgstr ""
-
-
diff --git a/src/vidalia/i18n/po/so/vidalia_so.po b/src/vidalia/i18n/po/so/vidalia_so.po
index 9c0e0be..22b0f4e 100644
--- a/src/vidalia/i18n/po/so/vidalia_so.po
+++ b/src/vidalia/i18n/po/so/vidalia_so.po
@@ -1,18 +1,15 @@
-#
-# Translators:
+#, fuzzy
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: 2010-12-05 20:03+0000\n"
-"Last-Translator: \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: 2009-05-19 23:56+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
+"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: so\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
"X-Generator: Vidalia ts2po 0.2\n"
msgctxt "AboutDialog"
@@ -35,13 +32,28 @@ msgctxt "AboutDialog"
msgid "Qt 4.4.2"
msgstr ""
+msgctxt "AboutDialog"
+msgid "Vidalia"
+msgstr ""
+
+msgctxt "AboutDialog"
+msgid "Tor"
+msgstr ""
+
+msgctxt "AboutDialog"
+msgid "Qt"
+msgstr ""
+
+msgctxt "AboutDialog"
+msgid "version"
+msgstr ""
+
msgctxt "AdvancedPage"
msgid "'%1' is not a valid IP address."
msgstr ""
msgctxt "AdvancedPage"
-msgid ""
-"You selected 'Password' authentication, but did not specify a password."
+msgid "You selected 'Password' authentication, but did not specify a password."
msgstr ""
msgctxt "AdvancedPage"
@@ -81,6 +93,10 @@ msgid "Vidalia was unable to install the Tor service."
msgstr ""
msgctxt "AdvancedPage"
+msgid "Control Port"
+msgstr ""
+
+msgctxt "AdvancedPage"
msgid "Authentication:"
msgstr ""
@@ -137,68 +153,7 @@ msgid "Select the directory used to store data for the Tor software"
msgstr ""
msgctxt "AdvancedPage"
-msgid "Tor Control"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "Use TCP connection (ControlPort)"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "Path:"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "Use Unix domain socket (ControlSocket)"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "Edit current torrc"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "NOTE: this will edit the currently loaded torrc"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "ControlSocket path doesn't exist."
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid ""
-"The specified Tor configuration file location contains characters that "
-"cannot be represented in your system's current 8-bit character encoding."
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid ""
-"The specified Tor data directory location contains characters that cannot be"
-" represented in your system's current 8-bit character encoding."
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "Warning"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "You changed torrc path, would you like to restart Tor?"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "Tor Configuration File (torrc);;All Files (*)"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "Select a file to use for Tor socket path"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "Configure ControlPort automatically"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid ""
-"Vidalia was unable to remove the Tor service.\n"
+msgid "Vidalia was unable to remove the Tor service.\n"
"\n"
"You may need to remove it manually."
msgstr ""
@@ -440,9 +395,7 @@ msgid "Remember my password"
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid ""
-"Vidalia has connected to a running Tor process that requires a password. "
-"Please enter your control password:"
+msgid "Vidalia has connected to a running Tor process that requires a password. Please enter your control password:"
msgstr ""
msgctxt "ControlSocket"
@@ -1158,10 +1111,6 @@ msgid "Zimbabwe"
msgstr ""
msgctxt "CountryInfo"
-msgid "Zaire"
-msgstr ""
-
-msgctxt "CountryInfo"
msgid "Albania"
msgstr ""
@@ -1257,55 +1206,6 @@ msgctxt "CountryInfo"
msgid "Taiwan"
msgstr ""
-msgctxt "CrashReportDialog"
-msgid "Submit a Crash Report"
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid "Vidalia encountered an error and needed to close"
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid "Restart Vidalia"
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid "Don't Restart"
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid "Unable to restart Vidalia"
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid ""
-"We were unable to automatically restart Vidalia. Please restart Vidalia "
-"manually."
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid "Please fill a ticket in:"
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid ""
-"<a "
-"href=\"https://trac.torproject.org/projects/tor/newticket\">https://trac.torproject.org/projects/tor/newticket</a>"
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid ""
-"A crash report has been created that you can send to the Vidalia developers "
-"to help identify and fix the problem. The submitted report does not contain "
-"any personally identifying information."
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid ""
-"with a description of what you were doing before the application crashed, "
-"along with the following files corresponding to the crash report:"
-msgstr ""
-
msgctxt "GeneralPage"
msgid "Executables (*.exe)"
msgstr ""
@@ -1323,6 +1223,10 @@ msgid "You must specify the name of your Tor executable."
msgstr ""
msgctxt "GeneralPage"
+msgid "The proxy arguments specified are not properly formatted."
+msgstr ""
+
+msgctxt "GeneralPage"
msgid "Start Vidalia when my system starts"
msgstr ""
@@ -1519,10 +1423,7 @@ msgid "Opening External Link"
msgstr ""
msgctxt "HelpTextBrowser"
-msgid ""
-"Vidalia can open the link you selected in your default Web browser. If your "
-"browser is not currently configured to use Tor then the request will not be "
-"anonymous."
+msgid "Vidalia can open the link you selected in your default Web browser. If your browser is not currently configured to use Tor then the request will not be anonymous."
msgstr ""
msgctxt "HelpTextBrowser"
@@ -1534,9 +1435,7 @@ msgid "Unable to Open Link"
msgstr ""
msgctxt "HelpTextBrowser"
-msgid ""
-"Vidalia was unable to open the selected link in your Web browser. You can "
-"still copy the URL and paste it into your browser."
+msgid "Vidalia was unable to open the selected link in your Web browser. You can still copy the URL and paste it into your browser."
msgstr ""
msgctxt "HelpTextBrowser"
@@ -1579,30 +1478,6 @@ msgctxt "LogEvent"
msgid "Unknown"
msgstr ""
-msgctxt "LogTreeItem"
-msgid "Debug"
-msgstr ""
-
-msgctxt "LogTreeItem"
-msgid "Info"
-msgstr ""
-
-msgctxt "LogTreeItem"
-msgid "Notice"
-msgstr ""
-
-msgctxt "LogTreeItem"
-msgid "Warning"
-msgstr ""
-
-msgctxt "LogTreeItem"
-msgid "Error"
-msgstr ""
-
-msgctxt "LogTreeItem"
-msgid "Unknown"
-msgstr ""
-
msgctxt "MainWindow"
msgid "Start Tor"
msgstr ""
@@ -1816,9 +1691,7 @@ msgid "Error Starting Tor"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Vidalia was unable to start Tor. Check your settings to ensure the correct "
-"name and location of your Tor executable is specified."
+msgid "Vidalia was unable to start Tor. Check your settings to ensure the correct name and location of your Tor executable is specified."
msgstr ""
msgctxt "MainWindow"
@@ -1854,9 +1727,7 @@ msgid "Cookie Authentication Required"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"The Tor software requires Vidalia to send the contents of an authentication "
-"cookie, but Vidalia was unable to find one."
+msgid "The Tor software requires Vidalia to send the contents of an authentication cookie, but Vidalia was unable to find one."
msgstr ""
msgctxt "MainWindow"
@@ -1876,9 +1747,7 @@ msgid "Error Registering for Events"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Vidalia was unable to register for some events. Many of Vidalia's features "
-"may be unavailable."
+msgid "Vidalia was unable to register for some events. Many of Vidalia's features may be unavailable."
msgstr ""
msgctxt "MainWindow"
@@ -1898,9 +1767,7 @@ msgid "Tor Update Available"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended. Please visit the Tor website to download the latest version."
+msgid "The currently installed version of Tor is out of date or no longer recommended. Please visit the Tor website to download the latest version."
msgstr ""
msgctxt "MainWindow"
@@ -1908,9 +1775,7 @@ msgid "Tor website: %1"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"All subsequent connections will appear to be different than your old "
-"connections."
+msgid "All subsequent connections will appear to be different than your old connections."
msgstr ""
msgctxt "MainWindow"
@@ -2002,21 +1867,15 @@ msgid "Password Reset Failed"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Vidalia tried to reset Tor's control password, but was not able to restart "
-"the Tor software. Please check your Task Manager to ensure there are no "
-"other Tor processes running."
+msgid "Vidalia tried to reset Tor's control password, but was not able to restart the Tor software. Please check your Task Manager to ensure there are no other Tor processes running."
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended."
+msgid "The currently installed version of Tor is out of date or no longer recommended."
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Would you like to check if a newer package is available for installation?"
+msgid "Would you like to check if a newer package is available for installation?"
msgstr ""
msgctxt "MainWindow"
@@ -2024,9 +1883,11 @@ msgid "Potentially Unsafe Connection"
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 ""
msgctxt "MainWindow"
@@ -2038,9 +1899,7 @@ msgid "Your software is up to date"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"There are no new Tor software packages available for your computer at this "
-"time."
+msgid "There are no new Tor software packages available for your computer at this time."
msgstr ""
msgctxt "MainWindow"
@@ -2056,52 +1915,52 @@ msgid "The following error occurred:"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Anything sent over this connection could be monitored. Please check your "
-"application's configuration and use only encrypted protocols, such as SSL, "
-"if possible."
-msgstr ""
-
-msgctxt "MainWindow"
msgid "failed (%1)"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
+msgid "Your relay is shutting down.\n"
"Click 'Stop' again to stop your relay now."
msgstr ""
msgctxt "MainWindow"
-msgid "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 ""
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 ""
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 ""
+
+msgctxt "MainWindow"
+msgid "File"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "About Vidalia"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Home"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Check For Updates"
msgstr ""
msgctxt "MessageLog"
@@ -2345,68 +2204,50 @@ 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"
+msgid "Always Save New Log Messages"
msgstr ""
msgctxt "MessageLog"
-msgid "Tor Status"
+msgid "Browse"
msgstr ""
msgctxt "MessageLog"
-msgid "Advanced"
+msgid "Enable automatically saving all new log messages to a file"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
+msgid "Automatically save new log messages to a file"
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 ""
msgctxt "MessageLog"
-msgid ""
-"Messages that only appear when \n"
+msgid "Messages that only appear when \n"
"something has gone wrong with Tor."
msgstr ""
msgctxt "MessageLog"
-msgid ""
-"Messages that appear infrequently \n"
+msgid "Messages that appear infrequently \n"
"during normal Tor operation and are \n"
"not considered errors, but you may \n"
"care about."
msgstr ""
msgctxt "MessageLog"
-msgid ""
-"Messages that appear frequently \n"
+msgid "Messages that appear frequently \n"
"during normal Tor operation."
msgstr ""
msgctxt "MessageLog"
-msgid ""
-"Hyper-verbose messages primarily of \n"
+msgid "Hyper-verbose messages primarily of \n"
"interest to Tor developers."
msgstr ""
msgctxt "MessageLog"
-msgid ""
-"Cannot write file %1\n"
+msgid "Cannot write file %1\n"
"\n"
"%2."
msgstr ""
@@ -2528,15 +2369,11 @@ msgid "Copy (Ctrl+C)"
msgstr ""
msgctxt "NetworkPage"
-msgid ""
-"You must specify both an IP address or hostname and a port number to "
-"configure Tor to use a proxy to access the Internet."
+msgid "You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet."
msgstr ""
msgctxt "NetworkPage"
-msgid ""
-"You must specify one or more ports to which your firewall allows you to "
-"connect."
+msgid "You must specify one or more ports to which your firewall allows you to connect."
msgstr ""
msgctxt "NetworkPage"
@@ -2556,10 +2393,18 @@ msgid "Proxy Settings"
msgstr ""
msgctxt "NetworkPage"
+msgid "HTTP Proxy:"
+msgstr ""
+
+msgctxt "NetworkPage"
msgid "Username:"
msgstr ""
msgctxt "NetworkPage"
+msgid "Use this proxy for HTTPS also"
+msgstr ""
+
+msgctxt "NetworkPage"
msgid "Password:"
msgstr ""
@@ -2588,9 +2433,7 @@ msgid "80, 443"
msgstr ""
msgctxt "NetworkPage"
-msgid ""
-"Check to encrypt directory requests and, optionally, use bridge relays to "
-"access the Tor network"
+msgid "Check to encrypt directory requests and, optionally, use bridge relays to access the Tor network"
msgstr ""
msgctxt "NetworkPage"
@@ -2602,10 +2445,18 @@ msgid "Bridge Settings"
msgstr ""
msgctxt "NetworkPage"
+msgid "The Tor software you are currently running does not support bridges. <br>Directory connections will still be encrypted."
+msgstr ""
+
+msgctxt "NetworkPage"
msgid "Add a Bridge:"
msgstr ""
msgctxt "NetworkPage"
+msgid "<a href=\"bridges.finding\">How do I find a bridge?</a>"
+msgstr ""
+
+msgctxt "NetworkPage"
msgid "Remove the selected bridges from the list"
msgstr ""
@@ -2626,43 +2477,13 @@ msgid "<a href=\"bridges.finding\">How can I find bridges?</a>"
msgstr ""
msgctxt "NetworkPage"
-msgid ""
-"No new bridges are currently available. You can either wait a while and try "
-"again, or try another method of finding new bridges."
+msgid "No new bridges are currently available. You can either wait a while and try again, or try another method of finding new bridges."
msgstr ""
msgctxt "NetworkPage"
msgid "Click Help to see other methods of finding new bridges."
msgstr ""
-msgctxt "NetworkPage"
-msgid "Address:"
-msgstr ""
-
-msgctxt "NetworkPage"
-msgid "Type:"
-msgstr ""
-
-msgctxt "NetworkPage"
-msgid "You must select the proxy type."
-msgstr ""
-
-msgctxt "NetworkPage"
-msgid "SOCKS 4"
-msgstr ""
-
-msgctxt "NetworkPage"
-msgid "SOCKS 5"
-msgstr ""
-
-msgctxt "NetworkPage"
-msgid "HTTP"
-msgstr ""
-
-msgctxt "NetworkPage"
-msgid "HTTP / HTTPS"
-msgstr ""
-
msgctxt "Policy"
msgid "accept"
msgstr ""
@@ -2816,15 +2637,11 @@ msgid "Bridge Support Unavailable"
msgstr ""
msgctxt "ServerPage"
-msgid ""
-"You have configured Tor to act as a bridge relay for censored users, but "
-"your version of Tor does not support bridges."
+msgid "You have configured Tor to act as a bridge relay for censored users, but your version of Tor does not support bridges."
msgstr ""
msgctxt "ServerPage"
-msgid ""
-"Please upgrade your Tor software or configure Tor to act as a normal Tor "
-"relay."
+msgid "Please upgrade your Tor software or configure Tor to act as a normal Tor relay."
msgstr ""
msgctxt "ServerPage"
@@ -2892,9 +2709,7 @@ msgid "Basic Settings"
msgstr ""
msgctxt "ServerPage"
-msgid ""
-"For Internet connections with fast download speed but slow upload, please "
-"list your upload speed here."
+msgid "For Internet connections with fast download speed but slow upload, please list your upload speed here."
msgstr ""
msgctxt "ServerPage"
@@ -2950,9 +2765,7 @@ msgid "Peak bandwidth rate limit"
msgstr ""
msgctxt "ServerPage"
-msgid ""
-"Your maximum bandwidth rate must be greater than or equal to your average "
-"bandwidth rate. Both values must be at least 20 KB/s."
+msgid "Your maximum bandwidth rate must be greater than or equal to your average bandwidth rate. Both values must be at least 20 KB/s."
msgstr ""
msgctxt "ServerPage"
@@ -3012,14 +2825,11 @@ msgid "Show help topic on exit policies"
msgstr ""
msgctxt "ServerPage"
-msgid ""
-"What Internet resources should users be able to access from your relay?"
+msgid "What Internet resources should users be able to access from your relay?"
msgstr ""
msgctxt "ServerPage"
-msgid ""
-"Tor will still block some outgoing mail and file sharing applications by "
-"default to reduce spam and other abuse."
+msgid "Tor will still block some outgoing mail and file sharing applications by default to reduce spam and other abuse."
msgstr ""
msgctxt "ServerPage"
@@ -3031,8 +2841,7 @@ msgid "Let others access your bridge by giving them this line:"
msgstr ""
msgctxt "ServerPage"
-msgid ""
-"This is the identity of your bridge relay that you can give to other people"
+msgid "This is the identity of your bridge relay that you can give to other people"
msgstr ""
msgctxt "ServerPage"
@@ -3048,9 +2857,7 @@ msgid "No clients have used your relay recently."
msgstr ""
msgctxt "ServerPage"
-msgid ""
-"Leave your relay running so clients have a better chance of finding and "
-"using it."
+msgid "Leave your relay running so clients have a better chance of finding and using it."
msgstr ""
msgctxt "ServerPage"
@@ -3062,9 +2869,7 @@ msgid "Vidalia was unable to retrieve your bridge's usage history."
msgstr ""
msgctxt "ServerPage"
-msgid ""
-"Tor returned an improperly formatted response when Vidalia requested your "
-"bridge's usage history."
+msgid "Tor returned an improperly formatted response when Vidalia requested your bridge's usage history."
msgstr ""
msgctxt "ServerPage"
@@ -3080,20 +2885,11 @@ msgid "<a href=\"#bridgeUsage\">Who has used my bridge?</a>"
msgstr ""
msgctxt "ServerPage"
-msgid "<a href=\"#bridgeHelp\">What's this?</a>"
-msgstr ""
-
-msgctxt "ServerPage"
-msgid "Automatically distribute my bridge address"
-msgstr ""
-
-msgctxt "ServerPage"
msgid "Mirror the Relay Directory"
msgstr ""
msgctxt "ServerPage"
-msgid ""
-"Email address at which you may be reached if there is a\n"
+msgid "Email address at which you may be reached if there is a\n"
"problem with your relay. You might also include your PGP or GPG fingerprint."
msgstr ""
@@ -3102,9 +2898,7 @@ msgid "Error while trying to unpublish all services"
msgstr ""
msgctxt "ServicePage"
-msgid ""
-"Please configure at least a service directory and a virtual port for each "
-"service you want to save. Remove the other ones."
+msgid "Please configure at least a service directory and a virtual port for each service you want to save. Remove the other ones."
msgstr ""
msgctxt "ServicePage"
@@ -3179,251 +2973,6 @@ msgctxt "ServicePage"
msgid "Created by Tor"
msgstr ""
-msgctxt "StatusEventWidget"
-msgid "Copy to Clipboard"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "The Tor Software is Running"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "You are currently running version \"%1\" of the Tor software."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "The Tor Software is not Running"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Click \"Start Tor\" in the Vidalia Control Panel to restart the Tor "
-"software. If Tor exited unexpectedly, select the \"Advanced\" tab above for "
-"details about any errors encountered."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"You are currently running version \"%1\" of the Tor software, which is no "
-"longer recommended. Please upgrade to the most recent version of the "
-"software, which may contain important security, reliability and performance "
-"fixes."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"You are currently running version \"%1\" of the Tor software, which may no "
-"longer work with the current Tor network. Please upgrade to the most recent "
-"version of the software, which may contain important security, reliability "
-"and performance fixes."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Your Tor Software is Out-of-date"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Connected to the Tor Network"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"We were able to successfully establish a connection to the Tor network. You "
-"can now configure your applications to use the Internet anonymously."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Tor Software Error"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"The Tor software encountered an internal bug. Please report the following "
-"error message to the Tor developers at bugs.torproject.org: \"%1\""
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Tor has determined that your computer's clock may be set to %1 seconds in "
-"the past compared to the source \"%2\". If your clock is not correct, Tor "
-"will not be able to function. Please verify your computer displays the "
-"correct time."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Tor has determined that your computer's clock may be set to %1 seconds in "
-"the future compared to the source \"%2\". If your clock is not correct, Tor "
-"will not be able to function. Please verify your computer displays the "
-"correct time."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Your Computer's Clock is Potentially Incorrect"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"One of the applications on your computer may have attempted to make an "
-"unencrypted connection through Tor to port %1. Sending unencrypted "
-"information over the Tor network is dangerous and not recommended. For your "
-"protection, Tor has automatically closed this connection."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"One of the applications on your computer may have attempted to make an "
-"unencrypted connection through Tor to port %1. Sending unencrypted "
-"information over the Tor network is dangerous and not recommended."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Potentially Dangerous Connection!"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"One of your applications established a connection through Tor to \"%1\" "
-"using a protocol that may leak information about your destination. Please "
-"ensure you configure your applications to use only SOCKS4a or SOCKS5 with "
-"remote hostname resolution."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Unknown SOCKS Protocol"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"One of your applications tried to establish a connection through Tor using a"
-" protocol that Tor does not understand. Please ensure you configure your "
-"applications to use only SOCKS4a or SOCKS5 with remote hostname resolution."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Invalid Destination Hostname"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"One of your applications tried to establish a connection through Tor to "
-"\"%1\", which Tor does not recognize as a valid hostname. Please check your "
-"application's configuration."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "External IP Address Changed"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Tor has determined your relay's public IP address is currently %1%2. If that"
-" is not correct, please consider setting the 'Address' option in your "
-"relay's configuration."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "DNS Hijacking Detected"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Tor detected that your DNS provider is providing false responses for domains"
-" that do not exist. Some ISPs and other DNS providers, such as OpenDNS, are "
-"known to do this in order to display their own search or advertising pages."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Tor detected that your DNS provider is providing false responses for well "
-"known domains. Since clients rely on Tor network relays to provide accurate "
-"DNS repsonses, your relay will not be configured as an exit relay."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Checking Server Port Reachability"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Tor is trying to determine if your relay's server port is reachable from the"
-" Tor network by connecting to itself at %1:%2. This test could take several "
-"minutes."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Server Port Reachability Test Successful!"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Your relay's server port is reachable from the Tor network!"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Server Port Reachability Test Failed"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Your relay's server port is not reachable by other Tor clients. This can "
-"happen if you are behind a router or firewall that requires you to set up "
-"port forwarding. If %1:%2 is not your correct IP address and server port, "
-"please check your relay's configuration."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Checking Directory Port Reachability"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Tor is trying to determine if your relay's directory port is reachable from "
-"the Tor network by connecting to itself at %1:%2. This test could take "
-"several minutes."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Directory Port Reachability Test Successful!"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Your relay's directory port is reachable from the Tor network!"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Directory Port Reachability Test Failed"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Your relay's directory port is not reachable by other Tor clients. This can "
-"happen if you are behind a router or firewall that requires you to set up "
-"port forwarding. If %1:%2 is not your correct IP address and directory port,"
-" please check your relay's configuration."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Relay Descriptor Rejected"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Your relay's descriptor, which enables clients to connect to your relay, was"
-" rejected by the directory server at %1:%2. The reason given was: %3"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Your Relay is Online"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Your relay is now online and available for Tor clients to use. You should "
-"see an increase in network traffic shown by the Bandwidth Graph within a few"
-" hours as more clients learn about your relay. Thank you for contributing to"
-" the Tor network!"
-msgstr ""
-
msgctxt "Stream"
msgid "New"
msgstr ""
@@ -3476,68 +3025,6 @@ msgctxt "TorSettings"
msgid "Failed to hash the control password."
msgstr ""
-msgctxt "TorrcDialog"
-msgid "Editing torrc"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid ""
-"Save settings. If unchecked it will only apply settings to the current Tor "
-"instance."
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Cut"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Copy"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Paste"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Undo"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Redo"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Select All"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Apply all"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Apply selection only"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Error connecting to Tor"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Selection is empty. Please select some text, or check \"Apply all\""
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Error at line %1: \"%2\""
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Error"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "An error ocurred while opening torrc file"
-msgstr ""
-
msgctxt "UPNPControl"
msgid "Success"
msgstr ""
@@ -3595,15 +3082,11 @@ msgid "Testing Universal Plug & Play Support"
msgstr ""
msgctxt "UpdateProcess"
-msgid ""
-"Vidalia was unable to check for available software updates because it could "
-"not find '%1'."
+msgid "Vidalia was unable to check for available software updates because it could not find '%1'."
msgstr ""
msgctxt "UpdateProcess"
-msgid ""
-"Vidalia was unable to check for available software updates because Tor's "
-"update process exited unexpectedly."
+msgid "Vidalia was unable to check for available software updates because Tor's update process exited unexpectedly."
msgstr ""
msgctxt "UpdateProgressDialog"
@@ -3759,10 +3242,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 ""
@@ -3775,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 ""
@@ -3812,5 +3290,3 @@ msgstr ""
msgctxt "stringutil.h"
msgid "%1 mins"
msgstr ""
-
-
diff --git a/src/vidalia/i18n/po/son/qt_son.po b/src/vidalia/i18n/po/son/qt_son.po
index 894527b..ca0cf6d 100644
--- a/src/vidalia/i18n/po/son/qt_son.po
+++ b/src/vidalia/i18n/po/son/qt_son.po
@@ -1,11 +1,10 @@
#
-# Translators:
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-08-20 03:25+0000\n"
-"PO-Revision-Date: 2010-12-05 19:59+0000\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"
@@ -431,5 +430,3 @@ msgstr ""
msgctxt "QFileSystemModel"
msgid "%1 bytes"
msgstr ""
-
-
diff --git a/src/vidalia/i18n/po/son/vidalia_son.po b/src/vidalia/i18n/po/son/vidalia_son.po
index 0298fe2..cc59096 100644
--- a/src/vidalia/i18n/po/son/vidalia_son.po
+++ b/src/vidalia/i18n/po/son/vidalia_son.po
@@ -1,11 +1,10 @@
#
-# Translators:
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-09-07 14:40+0000\n"
-"PO-Revision-Date: 2010-12-05 20:03+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"
@@ -193,10 +192,6 @@ 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"
@@ -236,10 +231,6 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr ""
-
-msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -279,6 +270,10 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr ""
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -432,17 +427,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"
@@ -1266,44 +1270,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"
@@ -1331,10 +1342,6 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr ""
-
-msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1362,6 +1369,10 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr ""
+
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1644,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 ""
@@ -1680,10 +1663,6 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1796,10 +1775,6 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1882,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 ""
@@ -1934,82 +1897,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 ""
@@ -2057,19 +1949,39 @@ 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)"
+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"
@@ -2091,17 +2003,35 @@ msgid ""
msgstr ""
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"
@@ -2357,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"
@@ -2412,10 +2334,6 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2515,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 ""
@@ -2840,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 ""
@@ -3088,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 ""
@@ -3132,10 +3070,6 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
-msgid "Form"
-msgstr ""
-
-msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3424,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 ""
@@ -3460,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 ""
@@ -3538,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 ""
@@ -3666,6 +3646,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 ""
@@ -3759,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 ""
@@ -3812,5 +3796,3 @@ msgstr ""
msgctxt "stringutil.h"
msgid "%1 mins"
msgstr ""
-
-
diff --git a/src/vidalia/i18n/po/sq/qt_sq.po b/src/vidalia/i18n/po/sq/qt_sq.po
index a816e4f..42e8a0f 100644
--- a/src/vidalia/i18n/po/sq/qt_sq.po
+++ b/src/vidalia/i18n/po/sq/qt_sq.po
@@ -1,12 +1,10 @@
-# Translators:
-# Translators:
-# runasand <runa.sandvik at gmail.com>, 2011.
+#
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-08-20 03:25+0000\n"
-"PO-Revision-Date: 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"
diff --git a/src/vidalia/i18n/po/sq/vidalia_sq.po b/src/vidalia/i18n/po/sq/vidalia_sq.po
index f23f9a6..8e0dfa5 100644
--- a/src/vidalia/i18n/po/sq/vidalia_sq.po
+++ b/src/vidalia/i18n/po/sq/vidalia_sq.po
@@ -1,19 +1,15 @@
-#
-# 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: 2012-03-21 17:52+0000\n"
-"PO-Revision-Date: 2012-03-22 08:51+0000\n"
-"Last-Translator: runasand <runa.sandvik at gmail.com>\n"
+"Project-Id-Version: Vidalia\n"
+"Report-Msgid-Bugs-To: translations at vidalia-project.net\n"
+"POT-Creation-Date: 2009-05-19 23:56+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: \n"
"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: sq\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Vidalia ts2po 0.2\n"
msgctxt "AboutDialog"
@@ -36,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 ""
+
+msgctxt "AboutDialog"
+msgid "version"
+msgstr ""
+
msgctxt "AdvancedPage"
msgid "'%1' is not a valid IP address."
msgstr "'%1' nuk është adres IP e vlefshme."
msgctxt "AdvancedPage"
-msgid ""
-"You selected 'Password' authentication, but did not specify a password."
+msgid "You selected 'Password' authentication, but did not specify a password."
msgstr "Ju zgjodhët autentikim me password, por nuk zgjodhët asnjë password."
msgctxt "AdvancedPage"
@@ -82,6 +93,10 @@ msgid "Vidalia was unable to install the Tor service."
msgstr "Vidalia nuk mundi të instalojë shërbimin Tor."
msgctxt "AdvancedPage"
+msgid "Control Port"
+msgstr "Porta e kontrollit"
+
+msgctxt "AdvancedPage"
msgid "Authentication:"
msgstr "Autentikimi:"
@@ -138,75 +153,7 @@ msgid "Select the directory used to store data for the Tor software"
msgstr ""
msgctxt "AdvancedPage"
-msgid "Tor Control"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "Use TCP connection (ControlPort)"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "Path:"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "Use Unix domain socket (ControlSocket)"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "Edit current torrc"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "NOTE: this will edit the currently loaded torrc"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "ControlSocket path doesn't exist."
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid ""
-"The specified Tor configuration file location contains characters that "
-"cannot be represented in your system's current 8-bit character encoding."
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid ""
-"The specified Tor data directory location contains characters that cannot be"
-" represented in your system's current 8-bit character encoding."
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "Warning"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "You changed torrc path, would you like to restart Tor?"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "Tor Configuration File (torrc);;All Files (*)"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "Select a file to use for Tor socket path"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "Configure ControlPort automatically"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid ""
-"You've checked the autoconfiguration option for the ControlPort, but "
-"provided no Data Directory. Please add one, or uncheck the \"Configure "
-"ControlPort automatically\" option."
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid ""
-"Vidalia was unable to remove the Tor service.\n"
+msgid "Vidalia was unable to remove the Tor service.\n"
"\n"
"You may need to remove it manually."
msgstr ""
@@ -231,23 +178,6 @@ msgctxt "AppearancePage"
msgid "Vidalia was unable to load the selected language translation."
msgstr ""
-msgctxt "AppearancePage"
-msgid ""
-"System Icon Preferences (changes will take effect when you restart Vidalia)"
-msgstr ""
-
-msgctxt "AppearancePage"
-msgid "Show the Tray Icon and Dock Icon (default)"
-msgstr ""
-
-msgctxt "AppearancePage"
-msgid "Hide the Tray Icon"
-msgstr ""
-
-msgctxt "AppearancePage"
-msgid "Hide the Dock Icon"
-msgstr ""
-
msgctxt "BandwidthGraph"
msgid "Since:"
msgstr "Që Nga:"
@@ -465,9 +395,7 @@ msgid "Remember my password"
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid ""
-"Vidalia has connected to a running Tor process that requires a password. "
-"Please enter your control password:"
+msgid "Vidalia has connected to a running Tor process that requires a password. Please enter your control password:"
msgstr ""
msgctxt "ControlSocket"
@@ -1183,10 +1111,6 @@ msgid "Zimbabwe"
msgstr ""
msgctxt "CountryInfo"
-msgid "Zaire"
-msgstr ""
-
-msgctxt "CountryInfo"
msgid "Albania"
msgstr ""
@@ -1282,55 +1206,6 @@ msgctxt "CountryInfo"
msgid "Taiwan"
msgstr ""
-msgctxt "CrashReportDialog"
-msgid "Submit a Crash Report"
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid "Vidalia encountered an error and needed to close"
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid "Restart Vidalia"
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid "Don't Restart"
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid "Unable to restart Vidalia"
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid ""
-"We were unable to automatically restart Vidalia. Please restart Vidalia "
-"manually."
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid "Please fill a ticket in:"
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid ""
-"<a "
-"href=\"https://trac.torproject.org/projects/tor/newticket\">https://trac.torproject.org/projects/tor/newticket</a>"
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid ""
-"A crash report has been created that you can send to the Vidalia developers "
-"to help identify and fix the problem. The submitted report does not contain "
-"any personally identifying information."
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid ""
-"with a description of what you were doing before the application crashed, "
-"along with the following files corresponding to the crash report:"
-msgstr ""
-
msgctxt "GeneralPage"
msgid "Executables (*.exe)"
msgstr "File exe (*.exe)"
@@ -1348,6 +1223,10 @@ msgid "You must specify the name of your Tor executable."
msgstr ""
msgctxt "GeneralPage"
+msgid "The proxy arguments specified are not properly formatted."
+msgstr ""
+
+msgctxt "GeneralPage"
msgid "Start Vidalia when my system starts"
msgstr ""
@@ -1544,10 +1423,7 @@ msgid "Opening External Link"
msgstr ""
msgctxt "HelpTextBrowser"
-msgid ""
-"Vidalia can open the link you selected in your default Web browser. If your "
-"browser is not currently configured to use Tor then the request will not be "
-"anonymous."
+msgid "Vidalia can open the link you selected in your default Web browser. If your browser is not currently configured to use Tor then the request will not be anonymous."
msgstr ""
msgctxt "HelpTextBrowser"
@@ -1559,9 +1435,7 @@ msgid "Unable to Open Link"
msgstr ""
msgctxt "HelpTextBrowser"
-msgid ""
-"Vidalia was unable to open the selected link in your Web browser. You can "
-"still copy the URL and paste it into your browser."
+msgid "Vidalia was unable to open the selected link in your Web browser. You can still copy the URL and paste it into your browser."
msgstr ""
msgctxt "HelpTextBrowser"
@@ -1604,30 +1478,6 @@ msgctxt "LogEvent"
msgid "Unknown"
msgstr "E Panjohur"
-msgctxt "LogTreeItem"
-msgid "Debug"
-msgstr ""
-
-msgctxt "LogTreeItem"
-msgid "Info"
-msgstr ""
-
-msgctxt "LogTreeItem"
-msgid "Notice"
-msgstr ""
-
-msgctxt "LogTreeItem"
-msgid "Warning"
-msgstr ""
-
-msgctxt "LogTreeItem"
-msgid "Error"
-msgstr ""
-
-msgctxt "LogTreeItem"
-msgid "Unknown"
-msgstr ""
-
msgctxt "MainWindow"
msgid "Start Tor"
msgstr ""
@@ -1773,6 +1623,10 @@ msgid "Connected to the Tor network!"
msgstr ""
msgctxt "MainWindow"
+msgid "Unrecognized startup status"
+msgstr ""
+
+msgctxt "MainWindow"
msgid "miscellaneous"
msgstr ""
@@ -1837,9 +1691,7 @@ msgid "Error Starting Tor"
msgstr "Gabim gjatë nisjes së Tor"
msgctxt "MainWindow"
-msgid ""
-"Vidalia was unable to start Tor. Check your settings to ensure the correct "
-"name and location of your Tor executable is specified."
+msgid "Vidalia was unable to start Tor. Check your settings to ensure the correct name and location of your Tor executable is specified."
msgstr "Vidalia nuk mundi të nisi Torin. Kontrolloni zgjedhjet për tu siguruar që keni vënë emrin dhe vendndodhjen e duhur të binarit të Torit."
msgctxt "MainWindow"
@@ -1875,9 +1727,7 @@ msgid "Cookie Authentication Required"
msgstr "Autentikim me Cookie i Nevojshëm"
msgctxt "MainWindow"
-msgid ""
-"The Tor software requires Vidalia to send the contents of an authentication "
-"cookie, but Vidalia was unable to find one."
+msgid "The Tor software requires Vidalia to send the contents of an authentication cookie, but Vidalia was unable to find one."
msgstr ""
msgctxt "MainWindow"
@@ -1897,9 +1747,7 @@ msgid "Error Registering for Events"
msgstr "Gabim gjat regjistrimit për Events"
msgctxt "MainWindow"
-msgid ""
-"Vidalia was unable to register for some events. Many of Vidalia's features "
-"may be unavailable."
+msgid "Vidalia was unable to register for some events. Many of Vidalia's features may be unavailable."
msgstr ""
msgctxt "MainWindow"
@@ -1919,9 +1767,7 @@ msgid "Tor Update Available"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended. Please visit the Tor website to download the latest version."
+msgid "The currently installed version of Tor is out of date or no longer recommended. Please visit the Tor website to download the latest version."
msgstr ""
msgctxt "MainWindow"
@@ -1929,9 +1775,7 @@ msgid "Tor website: %1"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"All subsequent connections will appear to be different than your old "
-"connections."
+msgid "All subsequent connections will appear to be different than your old connections."
msgstr "Gjithë lidhjet e reja do duken të ndryshme nga ato të vjetrat."
msgctxt "MainWindow"
@@ -1960,7 +1804,7 @@ msgstr "Kombinimet e tastjerës së Vidalias"
msgctxt "MainWindow"
msgid "Setup Relaying"
-msgstr "Konfiguro Urat\n"
+msgstr "Konfiguro Urat"
msgctxt "MainWindow"
msgid "Set up a relay and help the network grow"
@@ -2023,21 +1867,15 @@ msgid "Password Reset Failed"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Vidalia tried to reset Tor's control password, but was not able to restart "
-"the Tor software. Please check your Task Manager to ensure there are no "
-"other Tor processes running."
+msgid "Vidalia tried to reset Tor's control password, but was not able to restart the Tor software. Please check your Task Manager to ensure there are no other Tor processes running."
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended."
+msgid "The currently installed version of Tor is out of date or no longer recommended."
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Would you like to check if a newer package is available for installation?"
+msgid "Would you like to check if a newer package is available for installation?"
msgstr ""
msgctxt "MainWindow"
@@ -2045,9 +1883,11 @@ msgid "Potentially Unsafe Connection"
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 ""
msgctxt "MainWindow"
@@ -2059,9 +1899,7 @@ msgid "Your software is up to date"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"There are no new Tor software packages available for your computer at this "
-"time."
+msgid "There are no new Tor software packages available for your computer at this time."
msgstr ""
msgctxt "MainWindow"
@@ -2077,67 +1915,52 @@ 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 "failed (%1)"
msgstr ""
msgctxt "MainWindow"
-msgid "Bootstrapping torrc from %1 to %2"
+msgid "Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
msgstr ""
msgctxt "MainWindow"
-msgid "(probably Telnet)"
+msgid "You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"\n"
+"Would you like to shutdown gracefully and give clients time to find a new relay?"
msgstr ""
msgctxt "MainWindow"
-msgid "(probably an email client)"
+msgid "Vidalia detected that the Tor software exited unexpectedly.\n"
+"\n"
+"Please check the message log for recent warning or error messages."
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"One of your applications %1 appears to be making a potentially unencrypted "
-"and unsafe connection to port %2."
+msgid ", probably Telnet,"
msgstr ""
msgctxt "MainWindow"
-msgid "failed (%1)"
+msgid ", probably an email client,"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
-msgstr ""
+msgid "Vidalia"
+msgstr "Vidalia"
msgctxt "MainWindow"
-msgid ""
-"Vidalia can't find out how to talk to Tor because it can't access this file: %1\n"
-"\n"
-"Here's the last error message:\n"
-"%2"
+msgid "File"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"It seems Tor has stopped running since Vidalia started it.\n"
-"\n"
-"See the Advanced Message Log for more information."
-msgstr ""
+msgid "About Vidalia"
+msgstr "Informacione mbi Vidalian"
msgctxt "MainWindow"
-msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
-"\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
-msgstr ""
+msgid "Home"
+msgstr "Shpi"
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 "Check For Updates"
msgstr ""
msgctxt "MessageLog"
@@ -2381,6 +2204,10 @@ msgid "messages"
msgstr "mesazhet"
msgctxt "MessageLog"
+msgid "Always Save New Log Messages"
+msgstr "Shpëtoji Gjithmonë Mesazhet e Reja"
+
+msgctxt "MessageLog"
msgid "Browse"
msgstr "Lundro"
@@ -2393,56 +2220,34 @@ msgid "Automatically save new log messages to a file"
msgstr "Shpëtoji automatikisht gjithë mesazhet në fajl"
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 "Shpëtoji Gjithmonë Mesazhet e Reja"
-
-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 ""
msgctxt "MessageLog"
-msgid ""
-"Messages that only appear when \n"
+msgid "Messages that only appear when \n"
"something has gone wrong with Tor."
msgstr ""
msgctxt "MessageLog"
-msgid ""
-"Messages that appear infrequently \n"
+msgid "Messages that appear infrequently \n"
"during normal Tor operation and are \n"
"not considered errors, but you may \n"
"care about."
msgstr ""
msgctxt "MessageLog"
-msgid ""
-"Messages that appear frequently \n"
+msgid "Messages that appear frequently \n"
"during normal Tor operation."
msgstr ""
msgctxt "MessageLog"
-msgid ""
-"Hyper-verbose messages primarily of \n"
+msgid "Hyper-verbose messages primarily of \n"
"interest to Tor developers."
msgstr ""
msgctxt "MessageLog"
-msgid ""
-"Cannot write file %1\n"
+msgid "Cannot write file %1\n"
"\n"
"%2."
msgstr ""
@@ -2552,19 +2357,23 @@ msgid "Ctrl+F"
msgstr "Ctrl+F"
msgctxt "NetworkPage"
+msgid "Invalid Bridge"
+msgstr "Urë e gabuar"
+
+msgctxt "NetworkPage"
+msgid "The specified bridge identifier is not valid."
+msgstr "Emri i urës që u dha nuk është i vlefshëm."
+
+msgctxt "NetworkPage"
msgid "Copy (Ctrl+C)"
msgstr "Kopjo (Ctrl+C)"
msgctxt "NetworkPage"
-msgid ""
-"You must specify both an IP address or hostname and a port number to "
-"configure Tor to use a proxy to access the Internet."
+msgid "You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet."
msgstr "Ju duhet të përcaktoni si adresën IP ose emrin e serverit edhe numrin e portës për të konfiguruar Torin të përdori një proxy për tu lidhur në Internet."
msgctxt "NetworkPage"
-msgid ""
-"You must specify one or more ports to which your firewall allows you to "
-"connect."
+msgid "You must specify one or more ports to which your firewall allows you to connect."
msgstr "Ju duhet të përcaktoni një ose më tepër porta tek të cilat fairuolli juaj lejon lidhjen."
msgctxt "NetworkPage"
@@ -2584,10 +2393,18 @@ msgid "Proxy Settings"
msgstr "Konfigurimi i Proxy"
msgctxt "NetworkPage"
+msgid "HTTP Proxy:"
+msgstr "Proxy HTTP:"
+
+msgctxt "NetworkPage"
msgid "Username:"
msgstr "Përdoruesi:"
msgctxt "NetworkPage"
+msgid "Use this proxy for HTTPS also"
+msgstr "Përdor ktë proxy edhe për HTTPS"
+
+msgctxt "NetworkPage"
msgid "Password:"
msgstr "Password:"
@@ -2616,9 +2433,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 ""
msgctxt "NetworkPage"
@@ -2630,10 +2445,18 @@ msgid "Bridge Settings"
msgstr ""
msgctxt "NetworkPage"
+msgid "The Tor software you are currently running does not support bridges. <br>Directory connections will still be encrypted."
+msgstr ""
+
+msgctxt "NetworkPage"
msgid "Add a Bridge:"
msgstr "Shto një Urë:"
msgctxt "NetworkPage"
+msgid "<a href=\"bridges.finding\">How do I find a bridge?</a>"
+msgstr ""
+
+msgctxt "NetworkPage"
msgid "Remove the selected bridges from the list"
msgstr "Fshiji urat e zgjedhura nga lista"
@@ -2654,43 +2477,13 @@ msgid "<a href=\"bridges.finding\">How can I find bridges?</a>"
msgstr ""
msgctxt "NetworkPage"
-msgid ""
-"No new bridges are currently available. You can either wait a while and try "
-"again, or try another method of finding new bridges."
+msgid "No new bridges are currently available. You can either wait a while and try again, or try another method of finding new bridges."
msgstr ""
msgctxt "NetworkPage"
msgid "Click Help to see other methods of finding new bridges."
msgstr ""
-msgctxt "NetworkPage"
-msgid "Address:"
-msgstr ""
-
-msgctxt "NetworkPage"
-msgid "Type:"
-msgstr ""
-
-msgctxt "NetworkPage"
-msgid "You must select the proxy type."
-msgstr ""
-
-msgctxt "NetworkPage"
-msgid "SOCKS 4"
-msgstr ""
-
-msgctxt "NetworkPage"
-msgid "SOCKS 5"
-msgstr ""
-
-msgctxt "NetworkPage"
-msgid "HTTP / HTTPS"
-msgstr ""
-
-msgctxt "NetworkPage"
-msgid "You must specify one or more bridges."
-msgstr ""
-
msgctxt "Policy"
msgid "accept"
msgstr "Prano"
@@ -2844,15 +2637,11 @@ msgid "Bridge Support Unavailable"
msgstr "Pa funksionalitetin e Urave"
msgctxt "ServerPage"
-msgid ""
-"You have configured Tor to act as a bridge relay for censored users, but "
-"your version of Tor does not support bridges."
+msgid "You have configured Tor to act as a bridge relay for censored users, but your version of Tor does not support bridges."
msgstr "Ju keni konfiguruar Torin të funksionojë edhe si urë për përdoruesit e çensuruar por versioni juaj i Torit nuk e përman funksionalitetin e urave."
msgctxt "ServerPage"
-msgid ""
-"Please upgrade your Tor software or configure Tor to act as a normal Tor "
-"relay."
+msgid "Please upgrade your Tor software or configure Tor to act as a normal Tor relay."
msgstr "Ju lutem instaloni një version më të ri të Tor ose konfiguroni Torin të funksionojë si një Tor relay normal."
msgctxt "ServerPage"
@@ -2868,6 +2657,10 @@ msgid "Run as a client only"
msgstr ""
msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network"
+msgstr "Kanalizo flukset për rrjetin Tor"
+
+msgctxt "ServerPage"
msgid "Relay Port:"
msgstr "Porta për Relay:"
@@ -2916,9 +2709,7 @@ msgid "Basic Settings"
msgstr "Konfigurimet kryesore"
msgctxt "ServerPage"
-msgid ""
-"For Internet connections with fast download speed but slow upload, please "
-"list your upload speed here."
+msgid "For Internet connections with fast download speed but slow upload, please list your upload speed here."
msgstr "Për lidhjet e internetit me shpejtësi të lartë në hyrje por të ulët në dalje ju lutemi vini shpejtësinë në dalje këtu."
msgctxt "ServerPage"
@@ -2974,9 +2765,7 @@ msgid "Peak bandwidth rate limit"
msgstr "Limiti maksimal i nivelit të bandës"
msgctxt "ServerPage"
-msgid ""
-"Your maximum bandwidth rate must be greater than or equal to your average "
-"bandwidth rate. Both values must be at least 20 KB/s."
+msgid "Your maximum bandwidth rate must be greater than or equal to your average bandwidth rate. Both values must be at least 20 KB/s."
msgstr "Banda juaj maksimale duhet të jetë më e madhe ose e barabartë me bandën tuaj mesatare. Të dyja vlerat duhet të jenë të paktën 20 KB/s."
msgctxt "ServerPage"
@@ -3036,14 +2825,11 @@ msgid "Show help topic on exit policies"
msgstr "Shfaq titujt e dokumentacionit që kanë të bëjnë me politikat e daljes"
msgctxt "ServerPage"
-msgid ""
-"What Internet resources should users be able to access from your relay?"
+msgid "What Internet resources should users be able to access from your relay?"
msgstr ""
msgctxt "ServerPage"
-msgid ""
-"Tor will still block some outgoing mail and file sharing applications by "
-"default to reduce spam and other abuse."
+msgid "Tor will still block some outgoing mail and file sharing applications by default to reduce spam and other abuse."
msgstr ""
msgctxt "ServerPage"
@@ -3055,8 +2841,7 @@ msgid "Let others access your bridge by giving them this line:"
msgstr "Lejoini të tjerët të lidhen me urën tuaj duke u dhënë tyre ktë rrjesht:"
msgctxt "ServerPage"
-msgid ""
-"This is the identity of your bridge relay that you can give to other people"
+msgid "This is the identity of your bridge relay that you can give to other people"
msgstr "Ky është identiteti i urës suaj që mund ti jepni personave të tjerë"
msgctxt "ServerPage"
@@ -3072,9 +2857,7 @@ msgid "No clients have used your relay recently."
msgstr ""
msgctxt "ServerPage"
-msgid ""
-"Leave your relay running so clients have a better chance of finding and "
-"using it."
+msgid "Leave your relay running so clients have a better chance of finding and using it."
msgstr ""
msgctxt "ServerPage"
@@ -3086,9 +2869,7 @@ msgid "Vidalia was unable to retrieve your bridge's usage history."
msgstr "Vidalia nuk mundi të shpëtojë zgjedhjet tuaja %1."
msgctxt "ServerPage"
-msgid ""
-"Tor returned an improperly formatted response when Vidalia requested your "
-"bridge's usage history."
+msgid "Tor returned an improperly formatted response when Vidalia requested your bridge's usage history."
msgstr ""
msgctxt "ServerPage"
@@ -3104,28 +2885,11 @@ msgid "<a href=\"#bridgeUsage\">Who has used my bridge?</a>"
msgstr ""
msgctxt "ServerPage"
-msgid "<a href=\"#bridgeHelp\">What's this?</a>"
-msgstr ""
-
-msgctxt "ServerPage"
-msgid "Automatically distribute my bridge address"
-msgstr ""
-
-msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network (exit relay)"
-msgstr ""
-
-msgctxt "ServerPage"
-msgid "Relay traffic inside the Tor network (non-exit relay)"
-msgstr ""
-
-msgctxt "ServerPage"
msgid "Mirror the Relay Directory"
msgstr ""
msgctxt "ServerPage"
-msgid ""
-"Email address at which you may be reached if there is a\n"
+msgid "Email address at which you may be reached if there is a\n"
"problem with your relay. You might also include your PGP or GPG fingerprint."
msgstr ""
@@ -3134,9 +2898,7 @@ msgid "Error while trying to unpublish all services"
msgstr ""
msgctxt "ServicePage"
-msgid ""
-"Please configure at least a service directory and a virtual port for each "
-"service you want to save. Remove the other ones."
+msgid "Please configure at least a service directory and a virtual port for each service you want to save. Remove the other ones."
msgstr ""
msgctxt "ServicePage"
@@ -3211,251 +2973,6 @@ msgctxt "ServicePage"
msgid "Created by Tor"
msgstr ""
-msgctxt "StatusEventWidget"
-msgid "Copy to Clipboard"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "The Tor Software is Running"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "You are currently running version \"%1\" of the Tor software."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "The Tor Software is not Running"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Click \"Start Tor\" in the Vidalia Control Panel to restart the Tor "
-"software. If Tor exited unexpectedly, select the \"Advanced\" tab above for "
-"details about any errors encountered."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"You are currently running version \"%1\" of the Tor software, which is no "
-"longer recommended. Please upgrade to the most recent version of the "
-"software, which may contain important security, reliability and performance "
-"fixes."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"You are currently running version \"%1\" of the Tor software, which may no "
-"longer work with the current Tor network. Please upgrade to the most recent "
-"version of the software, which may contain important security, reliability "
-"and performance fixes."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Your Tor Software is Out-of-date"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Connected to the Tor Network"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"We were able to successfully establish a connection to the Tor network. You "
-"can now configure your applications to use the Internet anonymously."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Tor Software Error"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"The Tor software encountered an internal bug. Please report the following "
-"error message to the Tor developers at bugs.torproject.org: \"%1\""
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Tor has determined that your computer's clock may be set to %1 seconds in "
-"the past compared to the source \"%2\". If your clock is not correct, Tor "
-"will not be able to function. Please verify your computer displays the "
-"correct time."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Tor has determined that your computer's clock may be set to %1 seconds in "
-"the future compared to the source \"%2\". If your clock is not correct, Tor "
-"will not be able to function. Please verify your computer displays the "
-"correct time."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Your Computer's Clock is Potentially Incorrect"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"One of the applications on your computer may have attempted to make an "
-"unencrypted connection through Tor to port %1. Sending unencrypted "
-"information over the Tor network is dangerous and not recommended. For your "
-"protection, Tor has automatically closed this connection."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"One of the applications on your computer may have attempted to make an "
-"unencrypted connection through Tor to port %1. Sending unencrypted "
-"information over the Tor network is dangerous and not recommended."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Potentially Dangerous Connection!"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"One of your applications established a connection through Tor to \"%1\" "
-"using a protocol that may leak information about your destination. Please "
-"ensure you configure your applications to use only SOCKS4a or SOCKS5 with "
-"remote hostname resolution."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Unknown SOCKS Protocol"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"One of your applications tried to establish a connection through Tor using a"
-" protocol that Tor does not understand. Please ensure you configure your "
-"applications to use only SOCKS4a or SOCKS5 with remote hostname resolution."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Invalid Destination Hostname"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"One of your applications tried to establish a connection through Tor to "
-"\"%1\", which Tor does not recognize as a valid hostname. Please check your "
-"application's configuration."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "External IP Address Changed"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Tor has determined your relay's public IP address is currently %1%2. If that"
-" is not correct, please consider setting the 'Address' option in your "
-"relay's configuration."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "DNS Hijacking Detected"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Tor detected that your DNS provider is providing false responses for domains"
-" that do not exist. Some ISPs and other DNS providers, such as OpenDNS, are "
-"known to do this in order to display their own search or advertising pages."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Tor detected that your DNS provider is providing false responses for well "
-"known domains. Since clients rely on Tor network relays to provide accurate "
-"DNS repsonses, your relay will not be configured as an exit relay."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Checking Server Port Reachability"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Tor is trying to determine if your relay's server port is reachable from the"
-" Tor network by connecting to itself at %1:%2. This test could take several "
-"minutes."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Server Port Reachability Test Successful!"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Your relay's server port is reachable from the Tor network!"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Server Port Reachability Test Failed"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Your relay's server port is not reachable by other Tor clients. This can "
-"happen if you are behind a router or firewall that requires you to set up "
-"port forwarding. If %1:%2 is not your correct IP address and server port, "
-"please check your relay's configuration."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Checking Directory Port Reachability"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Tor is trying to determine if your relay's directory port is reachable from "
-"the Tor network by connecting to itself at %1:%2. This test could take "
-"several minutes."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Directory Port Reachability Test Successful!"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Your relay's directory port is reachable from the Tor network!"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Directory Port Reachability Test Failed"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Your relay's directory port is not reachable by other Tor clients. This can "
-"happen if you are behind a router or firewall that requires you to set up "
-"port forwarding. If %1:%2 is not your correct IP address and directory port,"
-" please check your relay's configuration."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Relay Descriptor Rejected"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Your relay's descriptor, which enables clients to connect to your relay, was"
-" rejected by the directory server at %1:%2. The reason given was: %3"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Your Relay is Online"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Your relay is now online and available for Tor clients to use. You should "
-"see an increase in network traffic shown by the Bandwidth Graph within a few"
-" hours as more clients learn about your relay. Thank you for contributing to"
-" the Tor network!"
-msgstr ""
-
msgctxt "Stream"
msgid "New"
msgstr "E re"
@@ -3508,68 +3025,6 @@ msgctxt "TorSettings"
msgid "Failed to hash the control password."
msgstr ""
-msgctxt "TorrcDialog"
-msgid "Editing torrc"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid ""
-"Save settings. If unchecked it will only apply settings to the current Tor "
-"instance."
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Cut"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Copy"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Paste"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Undo"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Redo"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Select All"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Apply all"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Apply selection only"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Error connecting to Tor"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Selection is empty. Please select some text, or check \"Apply all\""
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Error at line %1: \"%2\""
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Error"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "An error ocurred while opening torrc file"
-msgstr ""
-
msgctxt "UPNPControl"
msgid "Success"
msgstr ""
@@ -3627,15 +3082,11 @@ msgid "Testing Universal Plug & Play Support"
msgstr ""
msgctxt "UpdateProcess"
-msgid ""
-"Vidalia was unable to check for available software updates because it could "
-"not find '%1'."
+msgid "Vidalia was unable to check for available software updates because it could not find '%1'."
msgstr ""
msgctxt "UpdateProcess"
-msgid ""
-"Vidalia was unable to check for available software updates because Tor's "
-"update process exited unexpectedly."
+msgid "Vidalia was unable to check for available software updates because Tor's update process exited unexpectedly."
msgstr ""
msgctxt "UpdateProgressDialog"
@@ -3791,10 +3242,6 @@ msgid "Unable to open log file '%1': %2"
msgstr "E pamundur të hap fajlin e logut '%1': %2"
msgctxt "Vidalia"
-msgid "Value required for parameter :"
-msgstr ""
-
-msgctxt "Vidalia"
msgid "Invalid language code specified:"
msgstr ""
@@ -3807,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 ""
@@ -3844,3 +3290,4 @@ 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 3bcb96d..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:
-# 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"
@@ -201,7 +199,9 @@ msgctxt "QFileDialog"
msgid ""
"%1 already exists.\n"
"Do you want to replace it?"
-msgstr "%1 већ постоји.\nДа ли желите да га замените?"
+msgstr ""
+"%1 већ постоји.\n"
+"Да ли желите да га замените?"
#: qfiledialog.cpp:1690
msgctxt "QFileDialog"
@@ -209,7 +209,10 @@ msgid ""
"%1\n"
"File not found.\n"
"Please verify the correct file name was given."
-msgstr "%1\nДатотека није пронађена.\nПроверите да ли је дат исправан назив датотеке."
+msgstr ""
+"%1\n"
+"Датотека није пронађена.\n"
+"Проверите да ли је дат исправан назив датотеке."
#: qdirmodel.cpp:833
msgctxt "QFileDialog"
@@ -267,14 +270,19 @@ msgid ""
"%1\n"
"Directory not found.\n"
"Please verify the correct directory name was given."
-msgstr "%1\nДиректоријум није пронађен.\nПроверите да ли је дат исправан назив директоријума."
+msgstr ""
+"%1\n"
+"Директоријум није пронађен.\n"
+"Проверите да ли је дат исправан назив директоријума."
#: qfiledialog.cpp:2281
msgctxt "QFileDialog"
msgid ""
"'%1' is write protected.\n"
"Do you want to delete it anyway?"
-msgstr "„%1“ је заштићен од писања.\nДа ли желите да га избришете?"
+msgstr ""
+"„%1“ је заштићен од писања.\n"
+"Да ли желите да га избришете?"
#: qfiledialog.cpp:2286
msgctxt "QFileDialog"
@@ -371,7 +379,9 @@ msgctxt "QFileSystemModel"
msgid ""
"<b>The name \"%1\" can not be used.</b><p>Try using another name, with fewer"
" characters or no punctuations marks."
-msgstr "<b>„%1“ назив се не може користити.</b><p>Пробајте друго име с мање знакова или без интерпункцијских знакова."
+msgstr ""
+"<b>„%1“ назив се не може користити.</b><p>Пробајте друго име с мање знакова "
+"или без интерпункцијских знакова."
#: qfilesystemmodel.cpp:832
msgctxt "QFileSystemModel"
diff --git a/src/vidalia/i18n/po/sr/vidalia_sr.po b/src/vidalia/i18n/po/sr/vidalia_sr.po
index 189b983..8b28d4d 100644
--- a/src/vidalia/i18n/po/sr/vidalia_sr.po
+++ b/src/vidalia/i18n/po/sr/vidalia_sr.po
@@ -1,25 +1,15 @@
-#
-# Translators:
-# <branislavhorvat at gmail.com>, 2012.
-# <mahavidyas at gmail.com>, 2012.
-# <portalscg at gmail.com>, 2012.
-# runasand <runa.sandvik at gmail.com>, 2011.
-# <sdpuls at gmail.com>, 2011.
-# Vanja <medjutim at yahoo.com>, 2011.
msgid ""
msgstr ""
-"Project-Id-Version: The Tor Project\n"
-"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2012-03-21 17:52+0000\n"
-"PO-Revision-Date: 2012-03-22 08:51+0000\n"
-"Last-Translator: portalscg <portalscg at gmail.com>\n"
-"Language-Team: translations at vidalia-project.net\n"
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: translations at vidalia-project.net\n"
+"POT-Creation-Date: 2009-05-19 23:56+0000\n"
+"PO-Revision-Date: 2010-06-20 16:50-0600\n"
+"Last-Translator: George Bush <theranchcowboy at googlemail.com>\n"
+"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: sr\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
-"X-Generator: Vidalia ts2po 0.2\n"
+"X-Generator: Pootle 1.1.0\n"
msgctxt "AboutDialog"
msgid "About Vidalia"
@@ -41,3811 +31,3261 @@ msgctxt "AboutDialog"
msgid "Qt 4.4.2"
msgstr "Qt 4.4.2"
+msgctxt "AboutDialog"
+msgid "Vidalia"
+msgstr "Vidalia"
+
+msgctxt "AboutDialog"
+msgid "Tor"
+msgstr "Tor"
+
+msgctxt "AboutDialog"
+msgid "Qt"
+msgstr "Qt"
+
+msgctxt "AboutDialog"
+msgid "version"
+msgstr "издање"
+
msgctxt "AdvancedPage"
msgid "'%1' is not a valid IP address."
msgstr "„%1“ није исправна IP адреса."
msgctxt "AdvancedPage"
-msgid ""
-"You selected 'Password' authentication, but did not specify a password."
-msgstr "Изабрали сте проверу 'Лозинком', али нисте изабрали лозинку."
+msgid "You selected 'Password' authentication, but did not specify a password."
+msgstr ""
msgctxt "AdvancedPage"
msgid "Select Tor Configuration File"
-msgstr "Изаберите Тор Конфигурациону датотеку"
+msgstr ""
msgctxt "AdvancedPage"
msgid "File Not Found"
-msgstr "Датотека није пронађена"
+msgstr ""
msgctxt "AdvancedPage"
msgid "%1 does not exist. Would you like to create it?"
-msgstr "%1 не постоји. Да ли желите да креирате."
+msgstr ""
msgctxt "AdvancedPage"
msgid "Failed to Create File"
-msgstr "Није успео да креира датотеку"
+msgstr ""
msgctxt "AdvancedPage"
msgid "Unable to create %1 [%2]"
-msgstr "Није могуће креирати %1 [%2]"
+msgstr ""
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 "Није могуће инсталирати Tor сервис "
+msgstr ""
msgctxt "AdvancedPage"
msgid "Vidalia was unable to install the Tor service."
-msgstr "Програм Vidalia није био у могућности да инсталира Тор сервис. "
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Control Port"
+msgstr ""
msgctxt "AdvancedPage"
msgid "Authentication:"
-msgstr "Аутентификација:"
+msgstr ""
msgctxt "AdvancedPage"
msgid "Address:"
-msgstr "Адреса:"
+msgstr ""
msgctxt "AdvancedPage"
msgid "None"
-msgstr "Ниједан"
+msgstr ""
msgctxt "AdvancedPage"
msgid "Cookie"
-msgstr "Колачић"
+msgstr ""
msgctxt "AdvancedPage"
msgid "Password"
-msgstr "Лозинка"
+msgstr ""
msgctxt "AdvancedPage"
msgid "Randomly Generate"
-msgstr "Насумично Генериши"
+msgstr ""
msgctxt "AdvancedPage"
msgid ":"
-msgstr ": "
+msgstr ""
msgctxt "AdvancedPage"
msgid "Tor Configuration File"
-msgstr "Тор конфигурациона датотека"
+msgstr ""
msgctxt "AdvancedPage"
msgid "Start the Tor software with the specified configuration file (torrc)"
-msgstr "Покрени Тор са наведеним конфигурационим фајлом (torrc)"
+msgstr ""
msgctxt "AdvancedPage"
msgid "Select path to your configuration file"
-msgstr "Изабери путању конфигурационог фајла"
+msgstr ""
msgctxt "AdvancedPage"
msgid "Browse"
-msgstr "Претражити"
+msgstr ""
msgctxt "AdvancedPage"
msgid "Data Directory"
-msgstr "Директоријум са подацима"
+msgstr ""
msgctxt "AdvancedPage"
msgid "Store data for the Tor software in the following directory"
-msgstr "Ускладишти податке за Tor програм у следећем директоријуму"
+msgstr ""
msgctxt "AdvancedPage"
msgid "Select the directory used to store data for the Tor software"
-msgstr "Изаберите директоријум који се користи за складиштење података за Тор"
-
-msgctxt "AdvancedPage"
-msgid "Tor Control"
-msgstr "Tor Kontrola"
-
-msgctxt "AdvancedPage"
-msgid "Use TCP connection (ControlPort)"
-msgstr "Koristi TCP vezu(Kontrolni Port)"
-
-msgctxt "AdvancedPage"
-msgid "Path:"
-msgstr "Staza:"
-
-msgctxt "AdvancedPage"
-msgid "Use Unix domain socket (ControlSocket)"
-msgstr "Koristi Unix domain utičnicu (KontrolnaUtičnica)"
-
-msgctxt "AdvancedPage"
-msgid "Edit current torrc"
-msgstr "Edituj trenutni torrc"
-
-msgctxt "AdvancedPage"
-msgid "NOTE: this will edit the currently loaded torrc"
-msgstr "NAPOMENA:ovo će uneti izmene u trenutno pokrenuti torrc"
-
-msgctxt "AdvancedPage"
-msgid "ControlSocket path doesn't exist."
-msgstr "Staza kontrolne utičnice ne postoji"
-
-msgctxt "AdvancedPage"
-msgid ""
-"The specified Tor configuration file location contains characters that "
-"cannot be represented in your system's current 8-bit character encoding."
-msgstr "Zadata lokacija Tor konfiguracionog fajla sadrži karaktere koji nemogu biti predstavljeni u vašem 8-bitnom enkoding sistemu."
-
-msgctxt "AdvancedPage"
-msgid ""
-"The specified Tor data directory location contains characters that cannot be"
-" represented in your system's current 8-bit character encoding."
-msgstr "Zadata lokacija Tor direktorijuma podaaka sadrži karaktere koji nemogu biti predstavljeni u vašem 8-bitnom enkoding sistemu."
-
-msgctxt "AdvancedPage"
-msgid "Warning"
-msgstr "Upozorenje"
-
-msgctxt "AdvancedPage"
-msgid "You changed torrc path, would you like to restart Tor?"
-msgstr "Promenili ste stazu torrca, dali bi ste želeli da restartujete Tor?"
-
-msgctxt "AdvancedPage"
-msgid "Tor Configuration File (torrc);;All Files (*)"
-msgstr "Tor Konfiguracioni Fajl (torrc);;Svi Fajlovi (*)"
-
-msgctxt "AdvancedPage"
-msgid "Select a file to use for Tor socket path"
-msgstr "Izaberi fajl koji ćete koristiti kao Tor stazu za utičnicu"
-
-msgctxt "AdvancedPage"
-msgid "Configure ControlPort automatically"
-msgstr "Подеси аутоматски контролни порт"
-
-msgctxt "AdvancedPage"
-msgid ""
-"You've checked the autoconfiguration option for the ControlPort, but "
-"provided no Data Directory. Please add one, or uncheck the \"Configure "
-"ControlPort automatically\" option."
msgstr ""
msgctxt "AdvancedPage"
-msgid ""
-"Vidalia was unable to remove the Tor service.\n"
+msgid "Vidalia was unable to remove the Tor service.\n"
"\n"
"You may need to remove it manually."
-msgstr "Vidalia није био у могућности да уклони Tor сервис. Можда ћете морати да га уклоните ручно."
+msgstr ""
msgctxt "AppearancePage"
msgid "Language"
-msgstr "Језик"
+msgstr ""
msgctxt "AppearancePage"
msgid "Choose the language used in Vidalia"
-msgstr "Изаберите језик који се користи у програму Vidalia"
-
-msgctxt "AppearancePage"
-msgid "Style"
-msgstr "Стил"
-
-msgctxt "AppearancePage"
-msgid "Choose Vidalia's interface style"
-msgstr "Изабери Видалиа окружење интерфејса"
-
-msgctxt "AppearancePage"
-msgid "Vidalia was unable to load the selected language translation."
-msgstr "Vidalia није могао да учита превод на изабрани језик."
-
-msgctxt "AppearancePage"
-msgid ""
-"System Icon Preferences (changes will take effect when you restart Vidalia)"
msgstr ""
msgctxt "AppearancePage"
-msgid "Show the Tray Icon and Dock Icon (default)"
+msgid "Style"
msgstr ""
msgctxt "AppearancePage"
-msgid "Hide the Tray Icon"
+msgid "Choose Vidalia's interface style"
msgstr ""
msgctxt "AppearancePage"
-msgid "Hide the Dock Icon"
+msgid "Vidalia was unable to load the selected language translation."
msgstr ""
msgctxt "BandwidthGraph"
msgid "Since:"
-msgstr "Од:"
+msgstr ""
msgctxt "BandwidthGraph"
msgid "Hide Settings"
-msgstr "Сакриј Подешавања"
+msgstr ""
msgctxt "BandwidthGraph"
msgid "Show Settings"
-msgstr "Прикажи Подешавања"
+msgstr ""
msgctxt "BandwidthGraph"
msgid "Tor Bandwidth Usage"
-msgstr "Тор пропусни опсег"
+msgstr ""
msgctxt "BandwidthGraph"
msgid "Reset"
-msgstr "Ресетовање"
+msgstr ""
msgctxt "BandwidthGraph"
msgid "Receive Rate"
-msgstr "Прими Оцену"
+msgstr ""
msgctxt "BandwidthGraph"
msgid "Send Rate"
-msgstr "Пошаљи Оцену"
+msgstr ""
msgctxt "BandwidthGraph"
msgid "Always on Top"
-msgstr "Увек на врху"
+msgstr ""
msgctxt "BandwidthGraph"
msgid "Style"
-msgstr "Стил"
+msgstr ""
msgctxt "BandwidthGraph"
msgid "Changes the transparency of the Bandwidth Graph"
-msgstr "Промене транспарентност графике протока"
+msgstr ""
msgctxt "BandwidthGraph"
msgid "100"
-msgstr "100"
+msgstr ""
msgctxt "BandwidthGraph"
msgid "% Opaque"
-msgstr "% Непрозиран"
+msgstr ""
msgctxt "BandwidthGraph"
msgid "Save"
-msgstr "Сачувај"
+msgstr ""
msgctxt "BandwidthGraph"
msgid "Cancel"
-msgstr "Отказати"
+msgstr ""
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
-msgstr "Покретање 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"
-msgstr "Нови"
+msgstr ""
msgctxt "Circuit"
msgid "Open"
-msgstr "Отворено"
+msgstr ""
msgctxt "Circuit"
msgid "Building"
-msgstr "Изгради"
+msgstr ""
msgctxt "Circuit"
msgid "Failed"
-msgstr "Није успело"
+msgstr ""
msgctxt "Circuit"
msgid "Closed"
-msgstr "Затворен"
+msgstr ""
msgctxt "Circuit"
msgid "Unknown"
-msgstr "Непознат"
+msgstr ""
msgctxt "CircuitItem"
msgid "<Path Empty>"
-msgstr "<Path Empty>"
+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 "Затвори круг (ДЕЛ)"
+msgstr ""
msgctxt "CircuitListWidget"
msgid "Close Stream (Del)"
-msgstr "Затвори ток (ДЕЛ)"
+msgstr ""
msgctxt "ConfigDialog"
msgid "General"
-msgstr "Опште"
+msgstr ""
msgctxt "ConfigDialog"
msgid "Network"
-msgstr "Мрежа"
+msgstr ""
msgctxt "ConfigDialog"
msgid "Sharing"
-msgstr "Дељење"
+msgstr ""
msgctxt "ConfigDialog"
msgid "Services"
-msgstr "Услуге"
+msgstr ""
msgctxt "ConfigDialog"
msgid "Appearance"
-msgstr "Изглед"
+msgstr ""
msgctxt "ConfigDialog"
msgid "Advanced"
-msgstr "Напредан"
+msgstr ""
msgctxt "ConfigDialog"
msgid "Help"
-msgstr "Помоћ"
+msgstr ""
msgctxt "ConfigDialog"
msgid "Error Saving Settings"
-msgstr "Грешка чувања подешавања"
+msgstr ""
msgctxt "ConfigDialog"
msgid "Vidalia was unable to save your %1 settings."
-msgstr "Видалиа није био у могућности да сачува%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 "Vidalia није могао да се повеже са Tor. (%1)"
+msgstr ""
msgctxt "ControlConnection"
msgid "Control socket is not connected."
-msgstr "Контролна утичница није повезана."
+msgstr ""
msgctxt "ControlPasswordInputDialog"
msgid "Password Required"
-msgstr "Потребна је лозинка"
+msgstr ""
msgctxt "ControlPasswordInputDialog"
msgid "Remember my password"
-msgstr "Запамти моју лозинку"
+msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid ""
-"Vidalia has connected to a running Tor process that requires a password. "
-"Please enter your control password:"
-msgstr "Vidalia је повезан за покретање Tor процеса који захтева лозинку. Молимо Вас да унесете лозинку:"
+msgid "Vidalia has connected to a running Tor process that requires a password. Please enter your control password:"
+msgstr ""
msgctxt "ControlSocket"
msgid "Control socket is not connected."
-msgstr "Контролна утичница није повезан."
+msgstr ""
msgctxt "ControlSocket"
msgid "Error sending control command. [%1]"
-msgstr "Грешка при слању контролне команде. [%1]"
+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 "Зимбабве"
-
-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 "Тајван"
-
-msgctxt "CrashReportDialog"
-msgid "Submit a Crash Report"
-msgstr "Pošaljite izveštaj o rušenju"
-
-msgctxt "CrashReportDialog"
-msgid "Vidalia encountered an error and needed to close"
-msgstr "Vidalia je imala grešku, i potrebno je da se zatvori"
-
-msgctxt "CrashReportDialog"
-msgid "Restart Vidalia"
-msgstr "Ponovo pokreni Vidalia"
-
-msgctxt "CrashReportDialog"
-msgid "Don't Restart"
-msgstr "Nemoj da pokrećeš ponovo"
-
-msgctxt "CrashReportDialog"
-msgid "Unable to restart Vidalia"
-msgstr "Nemoguće je ponovo pokrenuti Vidalia"
-
-msgctxt "CrashReportDialog"
-msgid ""
-"We were unable to automatically restart Vidalia. Please restart Vidalia "
-"manually."
-msgstr "Mi nismo u mogućnosti da restartujemo Vidalia automatski. Molimo vas da restartujete Vidalia ručno."
-
-msgctxt "CrashReportDialog"
-msgid "Please fill a ticket in:"
-msgstr "Молимо вас да попуните извештај:"
-
-msgctxt "CrashReportDialog"
-msgid ""
-"<a "
-"href=\"https://trac.torproject.org/projects/tor/newticket\">https://trac.torproject.org/projects/tor/newticket</a>"
-msgstr "<a href=\"https://trac.torproject.org/projects/tor/newticket\">https://trac.torproject.org/projects/tor/newticket</a>"
-
-msgctxt "CrashReportDialog"
-msgid ""
-"A crash report has been created that you can send to the Vidalia developers "
-"to help identify and fix the problem. The submitted report does not contain "
-"any personally identifying information."
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid ""
-"with a description of what you were doing before the application crashed, "
-"along with the following files corresponding to the crash report:"
msgstr ""
msgctxt "GeneralPage"
msgid "Executables (*.exe)"
-msgstr "Извршне (*. 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 "The proxy arguments specified are not properly formatted."
+msgstr ""
msgctxt "GeneralPage"
msgid "Start Vidalia when my system starts"
-msgstr "Почетак Видалиа када мој систем почне"
+msgstr ""
msgctxt "GeneralPage"
msgid "Browse"
-msgstr "Претражи"
+msgstr ""
msgctxt "GeneralPage"
msgid "Start the Tor software when Vidalia starts"
-msgstr "Покрени Тор софтвер када се покрене Видалиа"
+msgstr ""
msgctxt "GeneralPage"
msgid "Tor"
-msgstr "Тор"
+msgstr ""
msgctxt "GeneralPage"
msgid "Proxy Application (optional)"
-msgstr "Проки апликација (опционо)"
+msgstr ""
msgctxt "GeneralPage"
msgid "Start a proxy application when Tor starts"
-msgstr "Покрени прокси апликацију када се покрене Тор"
+msgstr ""
msgctxt "GeneralPage"
msgid "Proxy Application Arguments:"
-msgstr "Аргументи прокси апликације:"
+msgstr ""
msgctxt "GeneralPage"
msgid "Software Updates"
-msgstr "Ажурирање софтвера"
+msgstr ""
msgctxt "GeneralPage"
msgid "Check for new software updates automatically"
-msgstr "Проверите да ли је нови софтвер доступан"
+msgstr ""
msgctxt "GeneralPage"
msgid "Check Now"
-msgstr "Провери одмах"
+msgstr ""
msgctxt "GraphFrame"
msgid "%1 KB/s"
-msgstr "%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 "Испоручен XML фајл није валидан садржај документа."
+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 "Иди на почетну страну (Ctrl+H)"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Ctrl+H"
-msgstr "Ctrl+H "
+msgstr ""
msgctxt "HelpBrowser"
msgid "Find"
-msgstr "Пронађи"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Search for a word or phrase on current page (Ctrl+F)"
-msgstr "Тражи реч или фразу на тренутној страници (Цтрл + Ф)"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Ctrl+F"
-msgstr "ЦТРЛ + Ф"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Close"
-msgstr "Затвори"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Close Vidalia Help"
-msgstr "Затвори Видалиа Помоћ"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Esc"
-msgstr "Есц"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Find:"
-msgstr "Пронађи:"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Find Previous"
-msgstr "Пронађи Претходно"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Find Next"
-msgstr "Пронађи Следеће"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Case sensitive"
-msgstr "Велика и мала слова"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Whole words only"
-msgstr "Само целе речи"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Help Topics"
-msgstr "Помоћ Теме"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Contents"
-msgstr "Садржај"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Search"
-msgstr "Претрага"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Searching for:"
-msgstr "Тражи:"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Found Documents"
-msgstr "Пронађени Документи"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Error Loading Help Contents:"
-msgstr "Грешка при учитавању Помоћног Садржаја:"
+msgstr ""
msgctxt "HelpTextBrowser"
msgid "Opening External Link"
-msgstr "Отварање Спољног линка"
+msgstr ""
msgctxt "HelpTextBrowser"
-msgid ""
-"Vidalia can open the link you selected in your default Web browser. If your "
-"browser is not currently configured to use Tor then the request will not be "
-"anonymous."
-msgstr "Видалиа неможе да отворим линк који сте одабрали у Вашем подразумеваном Веб читачу. Уколико ваш прегледач тренутно није конфигурисан да користи Тор онда захтев неће бити анонимна."
+msgid "Vidalia can open the link you selected in your default Web browser. If your browser is not currently configured to use Tor then the request will not be anonymous."
+msgstr ""
msgctxt "HelpTextBrowser"
msgid "Do you want Vidalia to open the link in your Web browser?"
-msgstr "Да ли желите да Видалиа отворили линк у вашем веб читачу?"
+msgstr ""
msgctxt "HelpTextBrowser"
msgid "Unable to Open Link"
-msgstr "Не може се отворити линк"
+msgstr ""
msgctxt "HelpTextBrowser"
-msgid ""
-"Vidalia was unable to open the selected link in your Web browser. You can "
-"still copy the URL and paste it into your browser."
-msgstr "Видалиа није могао да отвори изабрану везу у Веб прегледачу. Још увек можете да копирате УРЛ адресу и налепите га у свом прегледачу."
+msgid "Vidalia was unable to open the selected link in your Web browser. You can still copy the URL and paste it into your browser."
+msgstr ""
msgctxt "HelpTextBrowser"
msgid "Error opening help file:"
-msgstr "Грешка при отварању фајла за помоћ:"
+msgstr ""
msgctxt "LicenseDialog"
msgid "License Information"
-msgstr "Информације о лиценци"
+msgstr ""
msgctxt "LicenseDialog"
msgid "License"
-msgstr "Лиценца"
+msgstr ""
msgctxt "LicenseDialog"
msgid "Credits"
-msgstr "Кредити"
+msgstr ""
msgctxt "LogEvent"
msgid "Debug"
-msgstr "Oтклањање грешке"
+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 "Непознато"
-
-msgctxt "LogTreeItem"
-msgid "Debug"
-msgstr "Debuguj"
-
-msgctxt "LogTreeItem"
-msgid "Info"
-msgstr "Informacije"
-
-msgctxt "LogTreeItem"
-msgid "Notice"
-msgstr "obratite Pažnju"
-
-msgctxt "LogTreeItem"
-msgid "Warning"
-msgstr "Upozorenje"
-
-msgctxt "LogTreeItem"
-msgid "Error"
-msgstr "Greška"
-
-msgctxt "LogTreeItem"
-msgid "Unknown"
-msgstr "Nepoznato"
+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 "Нови идентитет"
+msgstr ""
msgctxt "MainWindow"
msgid "Ctrl+T"
-msgstr "Ctrl+T "
+msgstr ""
msgctxt "MainWindow"
msgid "Ctrl+B"
-msgstr "Ctrl+B "
+msgstr ""
msgctxt "MainWindow"
msgid "Ctrl+L"
-msgstr "Ctrl+L "
+msgstr ""
msgctxt "MainWindow"
msgid "Ctrl+N"
-msgstr "Ctrl+N "
+msgstr ""
msgctxt "MainWindow"
msgid "Ctrl+?"
-msgstr "Ctrl+? "
+msgstr ""
msgctxt "MainWindow"
msgid "Ctrl+I"
-msgstr "Ctrl+I "
+msgstr ""
msgctxt "MainWindow"
msgid "Ctrl+P"
-msgstr "Ctrl+P "
+msgstr ""
msgctxt "MainWindow"
msgid "Tor"
-msgstr "Тор"
+msgstr ""
msgctxt "MainWindow"
msgid "View"
-msgstr "Погледај"
+msgstr ""
msgctxt "MainWindow"
msgid "Vidalia Help"
-msgstr "Видалиа Помоћ"
+msgstr ""
msgctxt "MainWindow"
msgid "Error starting web browser"
-msgstr "Грешка покретања веб претраживача"
+msgstr ""
msgctxt "MainWindow"
msgid "Vidalia was unable to start the configured web browser"
-msgstr "Видалиа није могао да почне конфигурисање веб претраживача"
+msgstr ""
msgctxt "MainWindow"
msgid "Error starting IM client"
-msgstr "Грешка покретање ИМ клијента"
+msgstr ""
msgctxt "MainWindow"
msgid "Vidalia was unable to start the configured IM client"
-msgstr "Видалиа није могао да почне конфигурисање клијента за ћаскање"
+msgstr ""
msgctxt "MainWindow"
msgid "Error starting proxy server"
-msgstr "Грешка покретање прокси сервера"
+msgstr ""
msgctxt "MainWindow"
msgid "Vidalia was unable to start the configured proxy server"
-msgstr "Видалиа није могао да почне конфигурисање прокси сервера"
+msgstr ""
msgctxt "MainWindow"
msgid "Connecting to a relay directory"
-msgstr "Повезивање са релеј директоријумом"
+msgstr ""
msgctxt "MainWindow"
msgid "Establishing an encrypted directory connection"
-msgstr "Успостављање шифроване везе директоријума"
+msgstr ""
msgctxt "MainWindow"
msgid "Retrieving network status"
-msgstr "Преузимање мрежног статуса"
+msgstr ""
msgctxt "MainWindow"
msgid "Loading network status"
-msgstr "Учитавање мрежног статуса"
+msgstr ""
msgctxt "MainWindow"
msgid "Loading authority certificates"
-msgstr "Преузимање сертификата ауторитета"
+msgstr ""
msgctxt "MainWindow"
msgid "Requesting relay information"
-msgstr "Захтев за пренос информације"
+msgstr ""
msgctxt "MainWindow"
msgid "Loading relay information"
-msgstr "Учитавање преноса информације"
+msgstr ""
msgctxt "MainWindow"
msgid "Connecting to the Tor network"
-msgstr "Повезивање на Тор мрежу"
+msgstr ""
msgctxt "MainWindow"
msgid "Establishing a Tor circuit"
-msgstr "Успостављање Тор круга"
+msgstr ""
msgctxt "MainWindow"
msgid "Connected to the Tor network!"
-msgstr "Повезан са Тор мрежом!"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Unrecognized startup status"
+msgstr ""
msgctxt "MainWindow"
msgid "miscellaneous"
-msgstr "разно"
+msgstr ""
msgctxt "MainWindow"
msgid "identity mismatch"
-msgstr "идентитет неусклађен"
+msgstr ""
msgctxt "MainWindow"
msgid "done"
-msgstr "ради"
+msgstr ""
msgctxt "MainWindow"
msgid "connection refused"
-msgstr "веза одбијена"
+msgstr ""
msgctxt "MainWindow"
msgid "connection timeout"
-msgstr "веза је истекла"
+msgstr ""
msgctxt "MainWindow"
msgid "read/write error"
-msgstr "грешка при писању/читању"
+msgstr ""
msgctxt "MainWindow"
msgid "no route to host"
-msgstr "нема путање до сервера"
+msgstr ""
msgctxt "MainWindow"
msgid "insufficient resources"
-msgstr "недовољна средства"
+msgstr ""
msgctxt "MainWindow"
msgid "unknown"
-msgstr "непознат"
+msgstr ""
msgctxt "MainWindow"
msgid "Tor is not running"
-msgstr "Тор не ради"
+msgstr ""
msgctxt "MainWindow"
msgid "Tor is shutting down"
-msgstr "Тор се искључује"
+msgstr ""
msgctxt "MainWindow"
msgid "Stop Tor Now"
-msgstr "Заустави Тор Сада"
+msgstr ""
msgctxt "MainWindow"
msgid "Stop Tor"
-msgstr "Заустави Тор"
+msgstr ""
msgctxt "MainWindow"
msgid "Starting the Tor software"
-msgstr "Покретање Тор софтвера"
+msgstr ""
msgctxt "MainWindow"
msgid "Starting Tor"
-msgstr "Tor се покреће"
+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 "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 ""
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 "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"
-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 " Tor захтева од Vidalia-е да пошаље садржај колачића за пријављивање, али Vidalia не може да га пронађе."
+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 "Да ли желите да потражите фајл 'контролни_пријав_колачић' ?"
+msgstr ""
msgctxt "MainWindow"
msgid "Data Directory"
-msgstr "Директоријум са подацима"
+msgstr ""
msgctxt "MainWindow"
msgid "Control Cookie (control_auth_cookie)"
-msgstr "Контролни колачић (контролни_пријав_колачић)"
+msgstr ""
msgctxt "MainWindow"
msgid "Error Registering for Events"
-msgstr "Грешка при регистровању догађаја"
+msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Vidalia was unable to register for some events. Many of Vidalia's features "
-"may be unavailable."
-msgstr "Vidalia није успела да региструје неке догађаје. Многе могућности Vidalia-е могу бити недоступне."
+msgid "Vidalia was unable to register for some events. Many of Vidalia's features may be unavailable."
+msgstr ""
msgctxt "MainWindow"
msgid "Authentication Error"
-msgstr "Грешка при пријављивању"
+msgstr ""
msgctxt "MainWindow"
msgid "Vidalia was unable to authenticate to the Tor software. (%1)"
-msgstr "Vidalia није успела да се пријави на Tor. (%1)"
+msgstr ""
msgctxt "MainWindow"
msgid "Please check your control port authentication settings."
-msgstr "Молимо да проверите подешавања за порт за пријављивање."
+msgstr ""
msgctxt "MainWindow"
msgid "Tor Update Available"
-msgstr "Доступна је надоградња за Tor"
+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 "Тренутно инсталирана верзија Тор-а је застарела или се више не препоручује. Молимо Вас посетите Тор веб сајт да преузмете најновију верзију."
+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 "Све даље везе ће изгледати другачије од ваших старих веза."
+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 "Vidalia није успела да подеси аутоматско прослеђивање портова."
+msgstr ""
msgctxt "MainWindow"
msgid "Vidalia Control Panel"
-msgstr "Видалиа Контролна табла"
+msgstr ""
msgctxt "MainWindow"
msgid "Status"
-msgstr "Статус"
+msgstr ""
msgctxt "MainWindow"
msgid "Vidalia Shortcuts"
-msgstr "Видалиа Пречице"
+msgstr ""
msgctxt "MainWindow"
msgid "Setup Relaying"
-msgstr "Подеси прослеђивање"
+msgstr ""
msgctxt "MainWindow"
msgid "Set up a relay and help the network grow"
-msgstr "Покрени релеј и помози да се мрежа шири"
+msgstr ""
msgctxt "MainWindow"
msgid "View the Network"
-msgstr "Погледај Мрежу"
+msgstr ""
msgctxt "MainWindow"
msgid "View a map of the Tor network"
-msgstr "Погледај мапу Тор мреже"
+msgstr ""
msgctxt "MainWindow"
msgid "Use a New Identity"
-msgstr "Користите нови идентитет"
+msgstr ""
msgctxt "MainWindow"
msgid "Make subsequent connections appear new"
-msgstr "Уреди да све даље везе изгледају као нове"
+msgstr ""
msgctxt "MainWindow"
msgid "View recent bandwidth usage"
-msgstr "Прикажи скорашње коришћење протока"
+msgstr ""
msgctxt "MainWindow"
msgid "View log message history"
-msgstr "Прикажи историју забележених порука у записнику"
+msgstr ""
msgctxt "MainWindow"
msgid "View help documentation"
-msgstr "Погледај документацију за помоћ"
+msgstr ""
msgctxt "MainWindow"
msgid "Configure Vidalia"
-msgstr "Конфигуриши Видалиа"
+msgstr ""
msgctxt "MainWindow"
msgid "View version and license information"
-msgstr "Погледај верзију и информације о лиценци"
+msgstr ""
msgctxt "MainWindow"
msgid "Exit Vidalia"
-msgstr "Изађи Видалиа"
+msgstr ""
msgctxt "MainWindow"
msgid "Show this window on startup"
-msgstr "Прикажи овај прозор на покретању"
+msgstr ""
msgctxt "MainWindow"
msgid "Hide"
-msgstr "Сакриј"
+msgstr ""
msgctxt "MainWindow"
msgid "Hide this window"
-msgstr "Сакриј овај прозор"
+msgstr ""
msgctxt "MainWindow"
msgid "Password Reset Failed"
-msgstr "Поништавање лозинке није успело"
+msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Vidalia tried to reset Tor's control password, but was not able to restart "
-"the Tor software. Please check your Task Manager to ensure there are no "
-"other Tor processes running."
-msgstr "Vidalia је покушала да ресетује Tor контролну шифру, али није успела да поново покрене Tor. Молимо вас да проверите у Task Manager-у да нема других Tor процеса."
+msgid "Vidalia tried to reset Tor's control 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 "Тренутно инсталирана верзија Тор-а је застарела или се више не препоручује."
+msgid "The currently installed version of Tor is out of date or no longer recommended."
+msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Would you like to check if a newer package is available for installation?"
-msgstr "Желите ли да проверите да ли је новији пакет доступан за инсталацију?"
+msgid "Would you like to check if a newer package is available for installation?"
+msgstr ""
msgctxt "MainWindow"
msgid "Potentially Unsafe Connection"
-msgstr "Веза можда није безбедна"
+msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Tor has automatically closed your connection in order to protect your "
-"anonymity."
-msgstr "Тор је аутоматски затворио вашу везу како би заштитио вашу анонимност."
+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 ""
msgctxt "MainWindow"
msgid "Update Failed"
-msgstr "Ажурирање није успело"
+msgstr ""
msgctxt "MainWindow"
msgid "Your software is up to date"
-msgstr "Ваш софтвер је ажуран"
+msgstr ""
msgctxt "MainWindow"
-msgid ""
-"There are no new Tor software packages available for your computer at this "
-"time."
-msgstr "У овом тренутку нема нових Тор софтверских пакета доступних за ваш рачунар."
+msgid "There are no new Tor software packages available for your computer at this time."
+msgstr ""
msgctxt "MainWindow"
msgid "Installation Failed"
-msgstr "Инсталација није успела"
+msgstr ""
msgctxt "MainWindow"
msgid "Vidalia was unable to install your software updates."
-msgstr "Vidalia није успела да инсталира надоградњу софтвера."
+msgstr ""
msgctxt "MainWindow"
msgid "The following error occurred:"
-msgstr "Следеће грешке:"
+msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Anything sent over this connection could be monitored. Please check your "
-"application's configuration and use only encrypted protocols, such as SSL, "
-"if possible."
-msgstr "Sve što je poslato kroz ovu veyu nemože biti nadgledano, Molimo proverite konfiguraciju aplikacije i koristite jedino enkriptovani protokol, kako shto je SSL ako je to moguće."
+msgid "failed (%1)"
+msgstr ""
msgctxt "MainWindow"
-msgid "Bootstrapping torrc from %1 to %2"
+msgid "Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
msgstr ""
msgctxt "MainWindow"
-msgid "(probably Telnet)"
-msgstr "(вероватно Телнет)"
+msgid "You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"\n"
+"Would you like to shutdown gracefully and give clients time to find a new relay?"
+msgstr ""
msgctxt "MainWindow"
-msgid "(probably an email client)"
-msgstr "(вероватно емаил клијент)"
+msgid "Vidalia detected that the Tor software exited unexpectedly.\n"
+"\n"
+"Please check the message log for recent warning or error messages."
+msgstr ""
msgctxt "MainWindow"
-msgid ""
-"One of your applications %1 appears to be making a potentially unencrypted "
-"and unsafe connection to port %2."
-msgstr "Изгледа да једна од ваших апликација %1 прави потенцијално несигурну везу са портом %2."
+msgid ", probably Telnet,"
+msgstr ""
msgctxt "MainWindow"
-msgid "failed (%1)"
-msgstr "неуспело (%1)"
+msgid ", probably an email client,"
+msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
-msgstr "Ваш релеј се искључује.\nКликните 'Stop' поново да бисте одмах искључили релеј."
+msgid "Vidalia"
+msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Vidalia can't find out how to talk to Tor because it can't access this file: %1\n"
-"\n"
-"Here's the last error message:\n"
-"%2"
+msgid "File"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"It seems Tor has stopped running since Vidalia started it.\n"
-"\n"
-"See the Advanced Message Log for more information."
+msgid "About Vidalia"
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 "Ви тренутно користите релеј. Уколико га угасите сада, то ће прекинути све отворене везе са клијентима.\n\nДа ли желите да благонаклоно искључите релеј како би клијенти имали времена да пронађу нови релеј?"
+msgid "Home"
+msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Vidalia detected that the Tor software exited unexpectedly.\n"
-"\n"
-"Please check the message log for recent warning or error messages."
-msgstr "Vidalia је открила да је Tor био неочеиквано искључен.\n\nМолимо да проверите скорашња упозорења и поруке о грешкама у записнику."
+msgid "Check For Updates"
+msgstr ""
msgctxt "MessageLog"
msgid "Error Setting Filter"
-msgstr "Грешка у подешавању филтра"
+msgstr ""
msgctxt "MessageLog"
msgid "Vidalia was unable to register for Tor's log events."
-msgstr "Vidalia није успела да се региструје на догађаје из записника за Tor."
+msgstr ""
msgctxt "MessageLog"
msgid "Error Opening Log File"
-msgstr "Грешка при отварању фајла са записником"
+msgstr ""
msgctxt "MessageLog"
msgid "Vidalia was unable to open the specified log file."
-msgstr "Vidalia није успела да отвори наведени фајл са записником."
+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 "Пронађено 0 резултата."
+msgstr ""
msgctxt "MessageLog"
msgid "Message Log"
-msgstr "Записник"
+msgstr ""
msgctxt "MessageLog"
msgid "Message Filters..."
-msgstr "Филтери за поруке..."
+msgstr ""
msgctxt "MessageLog"
msgid "Set message filters"
-msgstr "Подеси филтере за поруке"
+msgstr ""
msgctxt "MessageLog"
msgid "History Size..."
-msgstr "Дужина историје порука..."
+msgstr ""
msgctxt "MessageLog"
msgid "Set maximum number of messages to display"
-msgstr "Поставите максимални број порука за приказ"
+msgstr ""
msgctxt "MessageLog"
msgid "Clear"
-msgstr "Обриши"
+msgstr ""
msgctxt "MessageLog"
msgid "Clear all messages from the Message Log (Ctrl+E)"
-msgstr "Обриши све поруке из записника (Ctrl+E)"
+msgstr ""
msgctxt "MessageLog"
msgid "Ctrl+E"
-msgstr "Ctrl+E "
+msgstr ""
msgctxt "MessageLog"
msgid "Copy"
-msgstr "Копирај"
+msgstr ""
msgctxt "MessageLog"
msgid "Copy the selected messages to the clipboard (Ctrl+C)"
-msgstr "Копирај обележене поруке на clipboard (Ctrl+C)"
+msgstr ""
msgctxt "MessageLog"
msgid "Ctrl+C"
-msgstr "Ctrl+C "
+msgstr ""
msgctxt "MessageLog"
msgid "Select All"
-msgstr "Одабери све"
+msgstr ""
msgctxt "MessageLog"
msgid "Select all messages (Ctrl+A)"
-msgstr "Одабери све поруке (Ctrl+A)"
+msgstr ""
msgctxt "MessageLog"
msgid "Ctrl+A"
-msgstr "Ctrl+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 "Ctrl+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 "Esc "
+msgstr ""
msgctxt "MessageLog"
msgid "Find"
-msgstr "Пронађи"
+msgstr ""
msgctxt "MessageLog"
msgid "Find all messages containing the search text (Ctrl+F)"
-msgstr "Пронађи све поруке које садрже тражени текст (Цтрл + Ф)"
+msgstr ""
msgctxt "MessageLog"
msgid "Ctrl+F"
-msgstr "Ctrl+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 "obratite Pažnju"
+msgstr ""
msgctxt "MessageLog"
msgid "Info"
-msgstr "Инфо"
+msgstr ""
msgctxt "MessageLog"
msgid "Debug"
-msgstr "Debug"
+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 "Always Save New Log Messages"
+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 "Osnovno"
-
-msgctxt "MessageLog"
-msgid "Tor Status"
-msgstr "Tor Status"
-
-msgctxt "MessageLog"
-msgid "Advanced"
-msgstr "Napredno"
-
-msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
-msgstr "Увек сачувај нове поруке у записнику"
+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 "Поруке које се јављају када се нешто лоше деси и Tor не може да настави да ради."
+msgstr ""
msgctxt "MessageLog"
-msgid ""
-"Messages that only appear when \n"
+msgid "Messages that only appear when \n"
"something has gone wrong with Tor."
-msgstr "Поруке које се појављују само када је нешто кренуло наопако са Тор-ом."
+msgstr ""
msgctxt "MessageLog"
-msgid ""
-"Messages that appear infrequently \n"
+msgid "Messages that appear infrequently \n"
"during normal Tor operation and are \n"
"not considered errors, but you may \n"
"care about."
-msgstr "Поруке које се ређе јављају током нормалног рада Tor-а а нису грешке, али би свеједно требало да се побринете за њих."
+msgstr ""
msgctxt "MessageLog"
-msgid ""
-"Messages that appear frequently \n"
+msgid "Messages that appear frequently \n"
"during normal Tor operation."
-msgstr "Поруке које се појављују често у току нормалног рада Тор-а."
+msgstr ""
msgctxt "MessageLog"
-msgid ""
-"Hyper-verbose messages primarily of \n"
+msgid "Hyper-verbose messages primarily of \n"
"interest to Tor developers."
-msgstr "Веома детаљне поруке које су првенствено корисне Tor развијачима."
+msgstr ""
msgctxt "MessageLog"
-msgid ""
-"Cannot write file %1\n"
+msgid "Cannot write file %1\n"
"\n"
"%2."
-msgstr "Неуспело писање фајла %1\n\n%2."
+msgstr ""
msgctxt "NetViewer"
msgid "Tor Network Map"
-msgstr "Мапа Tor мреже"
+msgstr ""
msgctxt "NetViewer"
msgid "Refresh"
-msgstr "Освежи"
+msgstr ""
msgctxt "NetViewer"
msgid "Refresh the list of Tor relays and connections"
-msgstr "Освежи листу Tor релеја и веза"
+msgstr ""
msgctxt "NetViewer"
msgid "Ctrl+R"
-msgstr "Ctrl+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 "Esc "
+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 "Ctrl+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 "Ctrl+F "
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "Invalid Bridge"
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "The specified bridge identifier is not valid."
+msgstr ""
msgctxt "NetworkPage"
msgid "Copy (Ctrl+C)"
-msgstr "Копирај (Цтрл + Ц)"
+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 адресу или име и порт да би подесили Tor да користи прокси на интернету."
+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 "Морате навести један или више портова преко којих вам firewall дозвољава да се повежете."
+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 "HTTP Proxy:"
+msgstr ""
msgctxt "NetworkPage"
msgid "Username:"
-msgstr "Корисничко име:"
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "Use this proxy for HTTPS also"
+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 "Означите да бисте се повезивали само на релеје који користе портове које дозвољава ваш firewall"
+msgstr ""
msgctxt "NetworkPage"
msgid "My firewall only lets me connect to certain ports"
-msgstr "Мој firewall дозвољава да се повежем само преко одређених портова"
+msgstr ""
msgctxt "NetworkPage"
msgid "Firewall Settings"
-msgstr "Подешавања за firewall"
+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 "Означите да бисте шифровали захтеве за листингом и, опционо, користили мостове релеје да се приступите Tor мрежи"
+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 "The Tor software you are currently running does not support bridges. <br>Directory connections will still be encrypted."
+msgstr ""
msgctxt "NetworkPage"
msgid "Add a Bridge:"
-msgstr "Додај мост:"
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "<a href=\"bridges.finding\">How do I find a bridge?</a>"
+msgstr ""
msgctxt "NetworkPage"
msgid "Remove the selected bridges from the list"
-msgstr "Уклони изабране мостови са листе"
+msgstr ""
msgctxt "NetworkPage"
msgid "Copy the selected bridges to the clipboard"
-msgstr "Копирај обележене мостове на clipboard"
+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 "Нема нових мостова који су тренутно доступни. Можете да сачекате и покушате поново, или пробајте други метод за проналажење нових мостова."
+msgid "No new bridges are currently available. You can either wait a while and try again, or try another method of finding new bridges."
+msgstr ""
msgctxt "NetworkPage"
msgid "Click Help to see other methods of finding new bridges."
-msgstr "Кликните на дугме Помоћ да бисте видели друге методе за проналажење нових мостова."
-
-msgctxt "NetworkPage"
-msgid "Address:"
-msgstr "Adresa:"
-
-msgctxt "NetworkPage"
-msgid "Type:"
-msgstr "Tip:"
-
-msgctxt "NetworkPage"
-msgid "You must select the proxy type."
-msgstr "Morate izabrati tip proxya."
-
-msgctxt "NetworkPage"
-msgid "SOCKS 4"
-msgstr "SOCKS 4"
-
-msgctxt "NetworkPage"
-msgid "SOCKS 5"
-msgstr "SOCKS 5"
-
-msgctxt "NetworkPage"
-msgid "HTTP / HTTPS"
-msgstr "HTTP / HTTPS"
-
-msgctxt "NetworkPage"
-msgid "You must specify one or more bridges."
-msgstr ""
+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 KB/s "
+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 "Надимак"
+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 "Подесили сте Tor да ради као мост релеј за цензурисане кориснике, али ваша верзија 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 ""
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 ""
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 "Покрени само као клијент"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network"
+msgstr ""
msgctxt "ServerPage"
msgid "Relay Port:"
-msgstr "Портови за прослеђивање:"
+msgstr ""
msgctxt "ServerPage"
msgid "Enable to mirror the relay directory"
-msgstr "Omogući da bi linkovao oslanjajuci direktorijum"
+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 "Порт преко ког корисници и други релеји комуницирају са вашим релејом"
+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 "За интернет везе са брзим download-ом, а спорим upload-ом, молимо наведите брзину вашег upload-а."
+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"
-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 "KB/s "
+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 KB/s."
+msgid "Your maximum bandwidth rate must be greater than or equal to your average bandwidth rate. Both values must be at least 20 KB/s."
+msgstr ""
msgctxt "ServerPage"
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 "Internet Relay Chat (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 "Преузми пошту (ПОП, ИМАП)"
+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 "Instant Messaging (IM)"
+msgstr ""
msgctxt "ServerPage"
msgid "Port 443"
-msgstr "Порт 443"
+msgstr ""
msgctxt "ServerPage"
msgid "Secure Websites (SSL)"
-msgstr "Безбедни Сајтови (ССЛ)"
+msgstr ""
msgctxt "ServerPage"
msgid "Port 80"
-msgstr "Порт 80"
+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 "Којим интернет ресурсима ће корисници моћи да приступе преко вашег релеја?"
+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 ће ипак да блокира неке одлазне мејлове и програме за дељење фајлова како би се смањио спам и друге злоупотребе."
+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 "Дозволите другима да приступе вашем мосту, дајући им ову линију:"
+msgstr ""
msgctxt "ServerPage"
-msgid ""
-"This is the identity of your bridge relay that you can give to other people"
-msgstr "Ово је идентитет вашег моста релеја који можете да дате другим људима"
+msgid "This is the identity of your bridge relay that you can give to other people"
+msgstr ""
msgctxt "ServerPage"
msgid "Copy your bridge relay's identity to the clipboard"
-msgstr "Копирај идентитет вашег релеја на clipboard"
+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 "Оставите ваш релеј да ради како би клијенти имали могућност да га пронађу и користе."
+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 затражила историјат коришћења вашег моста."
+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 "Помоћ цензурисаним корисницима да дођу до Тор мреже"
-
-msgctxt "ServerPage"
-msgid "<a href=\"#bridgeUsage\">Who has used my bridge?</a>"
-msgstr "<a href=\"#bridgeUsage\">Ко је користио мој мост?</a>"
-
-msgctxt "ServerPage"
-msgid "<a href=\"#bridgeHelp\">What's this?</a>"
-msgstr "<a href=\"#bridgeHelp\">Šta je ovo?</a>"
-
-msgctxt "ServerPage"
-msgid "Automatically distribute my bridge address"
-msgstr "Automatski distribuiraj adresu mog bridža"
-
-msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network (exit relay)"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic inside the Tor network (non-exit relay)"
+msgid "<a href=\"#bridgeUsage\">Who has used my bridge?</a>"
msgstr ""
msgctxt "ServerPage"
msgid "Mirror the Relay Directory"
-msgstr "Linkuj relejni direktorijum"
+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 "Емаил адреса на коју можемо да вас контактирамо уколико постоји проблем са вашим релејом. Такође можете да додате ваш PGP или GPG потпис."
+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 "Молимо Вас да конфигуришете барем директоријум услуга и виртуелни порт за сваку услугу коју желите да сачувате. Уклоните остале."
+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 "Цилј може да садржи само адресу:порт, адресу или порт."
+msgstr ""
msgctxt "ServicePage"
msgid "Directory already in use by another service."
-msgstr "Директоријум је већ у употреби од стране другог сервиса."
+msgstr ""
msgctxt "ServicePage"
msgid "Form"
-msgstr "Образац"
+msgstr ""
msgctxt "ServicePage"
msgid "Provided Hidden Services"
-msgstr "Понуђени скривени сервиси"
+msgstr ""
msgctxt "ServicePage"
msgid "Onion Address"
-msgstr "Onion адреса"
+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 "Копирај onion адресу изабраног сервиса на clipboard"
+msgstr ""
msgctxt "ServicePage"
msgid "Browse in local file system and choose directory for selected service"
-msgstr "Погледајте у локалном систему датотека и изаберите директоријум за одабране услуге"
+msgstr ""
msgctxt "ServicePage"
msgid "Created by Tor"
-msgstr "Креирано од Тор-а"
-
-msgctxt "StatusEventWidget"
-msgid "Copy to Clipboard"
-msgstr "Kopiraj u Clipboard"
-
-msgctxt "StatusEventWidget"
-msgid "The Tor Software is Running"
-msgstr "Tor je pokrenut"
-
-msgctxt "StatusEventWidget"
-msgid "You are currently running version \"%1\" of the Tor software."
-msgstr "Trenutno koristite \"%1\" verziju Tor softwera"
-
-msgctxt "StatusEventWidget"
-msgid "The Tor Software is not Running"
-msgstr "Tor softwer nije pokrenut"
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Click \"Start Tor\" in the Vidalia Control Panel to restart the Tor "
-"software. If Tor exited unexpectedly, select the \"Advanced\" tab above for "
-"details about any errors encountered."
-msgstr "Klikni \"Pokreni Tor\" u Vidalia Kontrolnoj Tabli da bi restartovali Tor Softwer. Ako je Tor izašao neočekivano, izaberite \"Napredni\" tab iznad za detalje o bilo kakvoj grešci."
-
-msgctxt "StatusEventWidget"
-msgid ""
-"You are currently running version \"%1\" of the Tor software, which is no "
-"longer recommended. Please upgrade to the most recent version of the "
-"software, which may contain important security, reliability and performance "
-"fixes."
-msgstr "Trenutno koristite verziju \"%1\" Tor softwera koja više nije preporučljiva. Molimo ažurirajte na naj noviju verziju softwera koja možda sadrži važne bezbednosne zakrpe."
-
-msgctxt "StatusEventWidget"
-msgid ""
-"You are currently running version \"%1\" of the Tor software, which may no "
-"longer work with the current Tor network. Please upgrade to the most recent "
-"version of the software, which may contain important security, reliability "
-"and performance fixes."
-msgstr "Trenutno koristite verziju \"%1\" Tor softwera, koji možda neradi sa Tor mrežom. Molimo ažurirajte na naj noviju verziju ovog softwera koja možda sadrži važne bezbednosne zakrpe."
-
-msgctxt "StatusEventWidget"
-msgid "Your Tor Software is Out-of-date"
-msgstr "Vaš Tor softwer nije ažuran"
-
-msgctxt "StatusEventWidget"
-msgid "Connected to the Tor Network"
-msgstr "Povezani ste na Tor mrežu"
-
-msgctxt "StatusEventWidget"
-msgid ""
-"We were able to successfully establish a connection to the Tor network. You "
-"can now configure your applications to use the Internet anonymously."
-msgstr "Uspešno smo uspostavili vezu ka Tor mreži. Sada možete konfigurisati vaše aplikacije da bi ste koristili internet anonimno."
-
-msgctxt "StatusEventWidget"
-msgid "Tor Software Error"
-msgstr "Greška sa Tor softwerom"
-
-msgctxt "StatusEventWidget"
-msgid ""
-"The Tor software encountered an internal bug. Please report the following "
-"error message to the Tor developers at bugs.torproject.org: \"%1\""
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Tor has determined that your computer's clock may be set to %1 seconds in "
-"the past compared to the source \"%2\". If your clock is not correct, Tor "
-"will not be able to function. Please verify your computer displays the "
-"correct time."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Tor has determined that your computer's clock may be set to %1 seconds in "
-"the future compared to the source \"%2\". If your clock is not correct, Tor "
-"will not be able to function. Please verify your computer displays the "
-"correct time."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Your Computer's Clock is Potentially Incorrect"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"One of the applications on your computer may have attempted to make an "
-"unencrypted connection through Tor to port %1. Sending unencrypted "
-"information over the Tor network is dangerous and not recommended. For your "
-"protection, Tor has automatically closed this connection."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"One of the applications on your computer may have attempted to make an "
-"unencrypted connection through Tor to port %1. Sending unencrypted "
-"information over the Tor network is dangerous and not recommended."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Potentially Dangerous Connection!"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"One of your applications established a connection through Tor to \"%1\" "
-"using a protocol that may leak information about your destination. Please "
-"ensure you configure your applications to use only SOCKS4a or SOCKS5 with "
-"remote hostname resolution."
msgstr ""
-msgctxt "StatusEventWidget"
-msgid "Unknown SOCKS Protocol"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"One of your applications tried to establish a connection through Tor using a"
-" protocol that Tor does not understand. Please ensure you configure your "
-"applications to use only SOCKS4a or SOCKS5 with remote hostname resolution."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Invalid Destination Hostname"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"One of your applications tried to establish a connection through Tor to "
-"\"%1\", which Tor does not recognize as a valid hostname. Please check your "
-"application's configuration."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "External IP Address Changed"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Tor has determined your relay's public IP address is currently %1%2. If that"
-" is not correct, please consider setting the 'Address' option in your "
-"relay's configuration."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "DNS Hijacking Detected"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Tor detected that your DNS provider is providing false responses for domains"
-" that do not exist. Some ISPs and other DNS providers, such as OpenDNS, are "
-"known to do this in order to display their own search or advertising pages."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Tor detected that your DNS provider is providing false responses for well "
-"known domains. Since clients rely on Tor network relays to provide accurate "
-"DNS repsonses, your relay will not be configured as an exit relay."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Checking Server Port Reachability"
-msgstr "Провера досупности порта сервера"
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Tor is trying to determine if your relay's server port is reachable from the"
-" Tor network by connecting to itself at %1:%2. This test could take several "
-"minutes."
-msgstr "Tor проверава да ли је сервер порт вашег релеја доступан са Tor мреже повезивањем на %1:%2. Овај тест може потрајати неколико минута."
-
-msgctxt "StatusEventWidget"
-msgid "Server Port Reachability Test Successful!"
-msgstr "Тест доступности сервер порта је успешан!"
-
-msgctxt "StatusEventWidget"
-msgid "Your relay's server port is reachable from the Tor network!"
-msgstr "Сервер порт вашег релеја је доступан са Tor мреже!"
-
-msgctxt "StatusEventWidget"
-msgid "Server Port Reachability Test Failed"
-msgstr "Тест досупности сервер порта није успешан"
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Your relay's server port is not reachable by other Tor clients. This can "
-"happen if you are behind a router or firewall that requires you to set up "
-"port forwarding. If %1:%2 is not your correct IP address and server port, "
-"please check your relay's configuration."
-msgstr "Сервер порт вашег релеја није доступан другим Tor клијентима. Ово се дешава ако користите рутер или firewall који захтева да подесите прослеђивање портова. Ако %1:%2 нису ваша IP адреса и сервер порт, проверите подешавања вашег релеја."
-
-msgctxt "StatusEventWidget"
-msgid "Checking Directory Port Reachability"
-msgstr "Провера досупности порта за листинг"
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Tor is trying to determine if your relay's directory port is reachable from "
-"the Tor network by connecting to itself at %1:%2. This test could take "
-"several minutes."
-msgstr "Tor проверава да ли је порт за листинг вашег релеја доступан из Tor мреже повезивањем на %1:%2. Овај тест моће потрајати неколико минута."
-
-msgctxt "StatusEventWidget"
-msgid "Directory Port Reachability Test Successful!"
-msgstr "Тест доступности порта за листинг је успешан!"
-
-msgctxt "StatusEventWidget"
-msgid "Your relay's directory port is reachable from the Tor network!"
-msgstr "Порт за листинг вашег релеја је доступан са Tor мреже!"
-
-msgctxt "StatusEventWidget"
-msgid "Directory Port Reachability Test Failed"
-msgstr "Тест доступности порта за листинг није успешан"
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Your relay's directory port is not reachable by other Tor clients. This can "
-"happen if you are behind a router or firewall that requires you to set up "
-"port forwarding. If %1:%2 is not your correct IP address and directory port,"
-" please check your relay's configuration."
-msgstr "Порт за листинг вашег релеја није доступан другим Tor клијентима. Ово се дешава ако користите рутер или firewall који захтева да подесите прослеђивање портова. Ако %1:%2 нису ваша IP адреса и порт за листинг, проверите подешавања вашег релеја."
-
-msgctxt "StatusEventWidget"
-msgid "Relay Descriptor Rejected"
-msgstr "Описивач релеја није прихваћен"
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Your relay's descriptor, which enables clients to connect to your relay, was"
-" rejected by the directory server at %1:%2. The reason given was: %3"
-msgstr "Описивач вашег релеја, који омогућава клијентима да се повежу на ваш релеј, није прихваћен од стране сервера за листинг на %1:%2. Наведен је разлог: %3"
-
-msgctxt "StatusEventWidget"
-msgid "Your Relay is Online"
-msgstr "Ваш релеј је онлајн"
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Your relay is now online and available for Tor clients to use. You should "
-"see an increase in network traffic shown by the Bandwidth Graph within a few"
-" hours as more clients learn about your relay. Thank you for contributing to"
-" the Tor network!"
-msgstr "Ваш релеј је сада онлајн и доступан је Tor клијентима на коришћење. Приметићете повећање мрежног саобраћаја на графикону протока у року од пар сати како клијенти буду проналазили ваш релеј. Хвала за доприносу Tor мрежи!"
-
msgctxt "Stream"
msgid "New"
-msgstr "Нови"
+msgstr ""
msgctxt "Stream"
msgid "Resolving"
-msgstr "Решавање"
+msgstr ""
msgctxt "Stream"
msgid "Connecting"
-msgstr "Повезивање"
+msgstr ""
msgctxt "Stream"
msgid "Open"
-msgstr "Отворено"
+msgstr ""
msgctxt "Stream"
msgid "Failed"
-msgstr "Није успело"
+msgstr ""
msgctxt "Stream"
msgid "Closed"
-msgstr "Затворено"
+msgstr ""
msgctxt "Stream"
msgid "Retrying"
-msgstr "Поновно"
+msgstr ""
msgctxt "Stream"
msgid "Remapped"
-msgstr "Remapirano"
+msgstr ""
msgctxt "Stream"
msgid "Unknown"
-msgstr "Непознато"
+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 "Хаширање контролне шифре није успело."
-
-msgctxt "TorrcDialog"
-msgid "Editing torrc"
-msgstr "Мењам torrc"
-
-msgctxt "TorrcDialog"
-msgid ""
-"Save settings. If unchecked it will only apply settings to the current Tor "
-"instance."
-msgstr "Сачувај подешавања. Ако није штиклирано, примениће подешавања само на текућу инстанцу Tor-а."
-
-msgctxt "TorrcDialog"
-msgid "Cut"
-msgstr "Исеци"
-
-msgctxt "TorrcDialog"
-msgid "Copy"
-msgstr "Копирај"
-
-msgctxt "TorrcDialog"
-msgid "Paste"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Undo"
msgstr ""
-msgctxt "TorrcDialog"
-msgid "Redo"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Select All"
-msgstr "Обележи све"
-
-msgctxt "TorrcDialog"
-msgid "Apply all"
-msgstr "Примени све"
-
-msgctxt "TorrcDialog"
-msgid "Apply selection only"
-msgstr "Примени само обележено"
-
-msgctxt "TorrcDialog"
-msgid "Error connecting to Tor"
-msgstr "Грешка при повезивању на Tor"
-
-msgctxt "TorrcDialog"
-msgid "Selection is empty. Please select some text, or check \"Apply all\""
-msgstr "Нема обележених ставки. Молимо да обележите текст, или да штиклирате \"Примени све\""
-
-msgctxt "TorrcDialog"
-msgid "Error at line %1: \"%2\""
-msgstr "Грешка у реду %1: \"%2\""
-
-msgctxt "TorrcDialog"
-msgid "Error"
-msgstr "Грешка"
-
-msgctxt "TorrcDialog"
-msgid "An error ocurred while opening torrc file"
-msgstr "Дошло је до грешке при отварању torrc фајла"
-
msgctxt "UPNPControl"
msgid "Success"
-msgstr "Успешно"
+msgstr ""
msgctxt "UPNPControl"
msgid "No UPnP-enabled devices found"
-msgstr "Нису пронађени UPnP уређаји"
+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 "WSAPokretanje nije uspelo"
+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 "Vidalia није успела да провери доступне надоградње софтвера јер није могла да пронађе '%1'."
+msgid "Vidalia was unable to check for available software updates because it could not find '%1'."
+msgstr ""
msgctxt "UpdateProcess"
-msgid ""
-"Vidalia was unable to check for available software updates because Tor's "
-"update process exited unexpectedly."
-msgstr "Vidalia није успела да провери доступне надоградње софтвера јер је Tor-ов процес за надоградњу неочекивано прекинут."
+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 "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 "Prikaži ovu poruku, a zatim izađi"
+msgstr ""
msgctxt "Vidalia"
msgid "Resets ALL stored Vidalia settings."
-msgstr "Ресетује сва сачувана Видалиа подешавања."
+msgstr ""
msgctxt "Vidalia"
msgid "Sets the directory Vidalia uses for data files."
-msgstr "Подешава директоријум којег Vidalia користи за смештање података."
+msgstr ""
msgctxt "Vidalia"
msgid "Sets the name and location of Vidalia's pidfile."
-msgstr "Подешава име и локацију Vidalia \"pidfile\"-а."
+msgstr ""
msgctxt "Vidalia"
msgid "Sets the name and location of Vidalia's logfile."
-msgstr "Подешава име и локацију Vidalia записника."
+msgstr ""
msgctxt "Vidalia"
msgid "Sets the verbosity of Vidalia's logging."
-msgstr "Подешава опширност Vidalia записника."
+msgstr ""
msgctxt "Vidalia"
msgid "Sets Vidalia's interface style."
-msgstr "Сетови Видалиа интерфејс стила."
+msgstr ""
msgctxt "Vidalia"
msgid "Sets Vidalia's language."
-msgstr "Подешава језик за Vidalia-у."
+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 "Наведени стил графичког интерфејса је неодговарајућ:"
+msgstr ""
msgctxt "Vidalia"
msgid "Invalid log level specified:"
-msgstr "Наведени ниво засписивања у записник је неодговарајућ:"
+msgstr ""
msgctxt "Vidalia"
-msgid ""
-"Another Vidalia process is possibly already running. If there really is not another Vidalia process running, you can choose to continue anyway.\n"
+msgid "Another Vidalia process is possibly already running. If there really is not another Vidalia process running, you can choose to continue anyway.\n"
"\n"
"Would you like to continue starting Vidalia?"
msgstr ""
msgctxt "stringutil.h"
msgid "%1 secs"
-msgstr "%1 секунди"
+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 дана"
+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/st/qt_st.po b/src/vidalia/i18n/po/st/qt_st.po
index 0e27c17..0c50933 100644
--- a/src/vidalia/i18n/po/st/qt_st.po
+++ b/src/vidalia/i18n/po/st/qt_st.po
@@ -1,11 +1,10 @@
#
-# Translators:
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-08-20 03:25+0000\n"
-"PO-Revision-Date: 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"
@@ -431,5 +430,3 @@ msgstr ""
msgctxt "QFileSystemModel"
msgid "%1 bytes"
msgstr ""
-
-
diff --git a/src/vidalia/i18n/po/st/vidalia_st.po b/src/vidalia/i18n/po/st/vidalia_st.po
index 37a6a67..22b0f4e 100644
--- a/src/vidalia/i18n/po/st/vidalia_st.po
+++ b/src/vidalia/i18n/po/st/vidalia_st.po
@@ -1,18 +1,15 @@
-#
-# Translators:
+#, fuzzy
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: 2010-12-05 20:03+0000\n"
-"Last-Translator: \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: 2009-05-19 23:56+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
+"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: st\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
"X-Generator: Vidalia ts2po 0.2\n"
msgctxt "AboutDialog"
@@ -35,13 +32,28 @@ msgctxt "AboutDialog"
msgid "Qt 4.4.2"
msgstr ""
+msgctxt "AboutDialog"
+msgid "Vidalia"
+msgstr ""
+
+msgctxt "AboutDialog"
+msgid "Tor"
+msgstr ""
+
+msgctxt "AboutDialog"
+msgid "Qt"
+msgstr ""
+
+msgctxt "AboutDialog"
+msgid "version"
+msgstr ""
+
msgctxt "AdvancedPage"
msgid "'%1' is not a valid IP address."
msgstr ""
msgctxt "AdvancedPage"
-msgid ""
-"You selected 'Password' authentication, but did not specify a password."
+msgid "You selected 'Password' authentication, but did not specify a password."
msgstr ""
msgctxt "AdvancedPage"
@@ -81,6 +93,10 @@ msgid "Vidalia was unable to install the Tor service."
msgstr ""
msgctxt "AdvancedPage"
+msgid "Control Port"
+msgstr ""
+
+msgctxt "AdvancedPage"
msgid "Authentication:"
msgstr ""
@@ -137,68 +153,7 @@ msgid "Select the directory used to store data for the Tor software"
msgstr ""
msgctxt "AdvancedPage"
-msgid "Tor Control"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "Use TCP connection (ControlPort)"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "Path:"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "Use Unix domain socket (ControlSocket)"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "Edit current torrc"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "NOTE: this will edit the currently loaded torrc"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "ControlSocket path doesn't exist."
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid ""
-"The specified Tor configuration file location contains characters that "
-"cannot be represented in your system's current 8-bit character encoding."
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid ""
-"The specified Tor data directory location contains characters that cannot be"
-" represented in your system's current 8-bit character encoding."
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "Warning"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "You changed torrc path, would you like to restart Tor?"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "Tor Configuration File (torrc);;All Files (*)"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "Select a file to use for Tor socket path"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "Configure ControlPort automatically"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid ""
-"Vidalia was unable to remove the Tor service.\n"
+msgid "Vidalia was unable to remove the Tor service.\n"
"\n"
"You may need to remove it manually."
msgstr ""
@@ -440,9 +395,7 @@ msgid "Remember my password"
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid ""
-"Vidalia has connected to a running Tor process that requires a password. "
-"Please enter your control password:"
+msgid "Vidalia has connected to a running Tor process that requires a password. Please enter your control password:"
msgstr ""
msgctxt "ControlSocket"
@@ -1158,10 +1111,6 @@ msgid "Zimbabwe"
msgstr ""
msgctxt "CountryInfo"
-msgid "Zaire"
-msgstr ""
-
-msgctxt "CountryInfo"
msgid "Albania"
msgstr ""
@@ -1257,55 +1206,6 @@ msgctxt "CountryInfo"
msgid "Taiwan"
msgstr ""
-msgctxt "CrashReportDialog"
-msgid "Submit a Crash Report"
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid "Vidalia encountered an error and needed to close"
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid "Restart Vidalia"
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid "Don't Restart"
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid "Unable to restart Vidalia"
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid ""
-"We were unable to automatically restart Vidalia. Please restart Vidalia "
-"manually."
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid "Please fill a ticket in:"
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid ""
-"<a "
-"href=\"https://trac.torproject.org/projects/tor/newticket\">https://trac.torproject.org/projects/tor/newticket</a>"
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid ""
-"A crash report has been created that you can send to the Vidalia developers "
-"to help identify and fix the problem. The submitted report does not contain "
-"any personally identifying information."
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid ""
-"with a description of what you were doing before the application crashed, "
-"along with the following files corresponding to the crash report:"
-msgstr ""
-
msgctxt "GeneralPage"
msgid "Executables (*.exe)"
msgstr ""
@@ -1323,6 +1223,10 @@ msgid "You must specify the name of your Tor executable."
msgstr ""
msgctxt "GeneralPage"
+msgid "The proxy arguments specified are not properly formatted."
+msgstr ""
+
+msgctxt "GeneralPage"
msgid "Start Vidalia when my system starts"
msgstr ""
@@ -1519,10 +1423,7 @@ msgid "Opening External Link"
msgstr ""
msgctxt "HelpTextBrowser"
-msgid ""
-"Vidalia can open the link you selected in your default Web browser. If your "
-"browser is not currently configured to use Tor then the request will not be "
-"anonymous."
+msgid "Vidalia can open the link you selected in your default Web browser. If your browser is not currently configured to use Tor then the request will not be anonymous."
msgstr ""
msgctxt "HelpTextBrowser"
@@ -1534,9 +1435,7 @@ msgid "Unable to Open Link"
msgstr ""
msgctxt "HelpTextBrowser"
-msgid ""
-"Vidalia was unable to open the selected link in your Web browser. You can "
-"still copy the URL and paste it into your browser."
+msgid "Vidalia was unable to open the selected link in your Web browser. You can still copy the URL and paste it into your browser."
msgstr ""
msgctxt "HelpTextBrowser"
@@ -1579,30 +1478,6 @@ msgctxt "LogEvent"
msgid "Unknown"
msgstr ""
-msgctxt "LogTreeItem"
-msgid "Debug"
-msgstr ""
-
-msgctxt "LogTreeItem"
-msgid "Info"
-msgstr ""
-
-msgctxt "LogTreeItem"
-msgid "Notice"
-msgstr ""
-
-msgctxt "LogTreeItem"
-msgid "Warning"
-msgstr ""
-
-msgctxt "LogTreeItem"
-msgid "Error"
-msgstr ""
-
-msgctxt "LogTreeItem"
-msgid "Unknown"
-msgstr ""
-
msgctxt "MainWindow"
msgid "Start Tor"
msgstr ""
@@ -1816,9 +1691,7 @@ msgid "Error Starting Tor"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Vidalia was unable to start Tor. Check your settings to ensure the correct "
-"name and location of your Tor executable is specified."
+msgid "Vidalia was unable to start Tor. Check your settings to ensure the correct name and location of your Tor executable is specified."
msgstr ""
msgctxt "MainWindow"
@@ -1854,9 +1727,7 @@ msgid "Cookie Authentication Required"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"The Tor software requires Vidalia to send the contents of an authentication "
-"cookie, but Vidalia was unable to find one."
+msgid "The Tor software requires Vidalia to send the contents of an authentication cookie, but Vidalia was unable to find one."
msgstr ""
msgctxt "MainWindow"
@@ -1876,9 +1747,7 @@ msgid "Error Registering for Events"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Vidalia was unable to register for some events. Many of Vidalia's features "
-"may be unavailable."
+msgid "Vidalia was unable to register for some events. Many of Vidalia's features may be unavailable."
msgstr ""
msgctxt "MainWindow"
@@ -1898,9 +1767,7 @@ msgid "Tor Update Available"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended. Please visit the Tor website to download the latest version."
+msgid "The currently installed version of Tor is out of date or no longer recommended. Please visit the Tor website to download the latest version."
msgstr ""
msgctxt "MainWindow"
@@ -1908,9 +1775,7 @@ msgid "Tor website: %1"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"All subsequent connections will appear to be different than your old "
-"connections."
+msgid "All subsequent connections will appear to be different than your old connections."
msgstr ""
msgctxt "MainWindow"
@@ -2002,21 +1867,15 @@ msgid "Password Reset Failed"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Vidalia tried to reset Tor's control password, but was not able to restart "
-"the Tor software. Please check your Task Manager to ensure there are no "
-"other Tor processes running."
+msgid "Vidalia tried to reset Tor's control password, but was not able to restart the Tor software. Please check your Task Manager to ensure there are no other Tor processes running."
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended."
+msgid "The currently installed version of Tor is out of date or no longer recommended."
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Would you like to check if a newer package is available for installation?"
+msgid "Would you like to check if a newer package is available for installation?"
msgstr ""
msgctxt "MainWindow"
@@ -2024,9 +1883,11 @@ msgid "Potentially Unsafe Connection"
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 ""
msgctxt "MainWindow"
@@ -2038,9 +1899,7 @@ msgid "Your software is up to date"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"There are no new Tor software packages available for your computer at this "
-"time."
+msgid "There are no new Tor software packages available for your computer at this time."
msgstr ""
msgctxt "MainWindow"
@@ -2056,52 +1915,52 @@ msgid "The following error occurred:"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Anything sent over this connection could be monitored. Please check your "
-"application's configuration and use only encrypted protocols, such as SSL, "
-"if possible."
-msgstr ""
-
-msgctxt "MainWindow"
msgid "failed (%1)"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
+msgid "Your relay is shutting down.\n"
"Click 'Stop' again to stop your relay now."
msgstr ""
msgctxt "MainWindow"
-msgid "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 ""
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 ""
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 ""
+
+msgctxt "MainWindow"
+msgid "File"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "About Vidalia"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Home"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Check For Updates"
msgstr ""
msgctxt "MessageLog"
@@ -2345,68 +2204,50 @@ 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"
+msgid "Always Save New Log Messages"
msgstr ""
msgctxt "MessageLog"
-msgid "Tor Status"
+msgid "Browse"
msgstr ""
msgctxt "MessageLog"
-msgid "Advanced"
+msgid "Enable automatically saving all new log messages to a file"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
+msgid "Automatically save new log messages to a file"
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 ""
msgctxt "MessageLog"
-msgid ""
-"Messages that only appear when \n"
+msgid "Messages that only appear when \n"
"something has gone wrong with Tor."
msgstr ""
msgctxt "MessageLog"
-msgid ""
-"Messages that appear infrequently \n"
+msgid "Messages that appear infrequently \n"
"during normal Tor operation and are \n"
"not considered errors, but you may \n"
"care about."
msgstr ""
msgctxt "MessageLog"
-msgid ""
-"Messages that appear frequently \n"
+msgid "Messages that appear frequently \n"
"during normal Tor operation."
msgstr ""
msgctxt "MessageLog"
-msgid ""
-"Hyper-verbose messages primarily of \n"
+msgid "Hyper-verbose messages primarily of \n"
"interest to Tor developers."
msgstr ""
msgctxt "MessageLog"
-msgid ""
-"Cannot write file %1\n"
+msgid "Cannot write file %1\n"
"\n"
"%2."
msgstr ""
@@ -2528,15 +2369,11 @@ msgid "Copy (Ctrl+C)"
msgstr ""
msgctxt "NetworkPage"
-msgid ""
-"You must specify both an IP address or hostname and a port number to "
-"configure Tor to use a proxy to access the Internet."
+msgid "You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet."
msgstr ""
msgctxt "NetworkPage"
-msgid ""
-"You must specify one or more ports to which your firewall allows you to "
-"connect."
+msgid "You must specify one or more ports to which your firewall allows you to connect."
msgstr ""
msgctxt "NetworkPage"
@@ -2556,10 +2393,18 @@ msgid "Proxy Settings"
msgstr ""
msgctxt "NetworkPage"
+msgid "HTTP Proxy:"
+msgstr ""
+
+msgctxt "NetworkPage"
msgid "Username:"
msgstr ""
msgctxt "NetworkPage"
+msgid "Use this proxy for HTTPS also"
+msgstr ""
+
+msgctxt "NetworkPage"
msgid "Password:"
msgstr ""
@@ -2588,9 +2433,7 @@ msgid "80, 443"
msgstr ""
msgctxt "NetworkPage"
-msgid ""
-"Check to encrypt directory requests and, optionally, use bridge relays to "
-"access the Tor network"
+msgid "Check to encrypt directory requests and, optionally, use bridge relays to access the Tor network"
msgstr ""
msgctxt "NetworkPage"
@@ -2602,10 +2445,18 @@ msgid "Bridge Settings"
msgstr ""
msgctxt "NetworkPage"
+msgid "The Tor software you are currently running does not support bridges. <br>Directory connections will still be encrypted."
+msgstr ""
+
+msgctxt "NetworkPage"
msgid "Add a Bridge:"
msgstr ""
msgctxt "NetworkPage"
+msgid "<a href=\"bridges.finding\">How do I find a bridge?</a>"
+msgstr ""
+
+msgctxt "NetworkPage"
msgid "Remove the selected bridges from the list"
msgstr ""
@@ -2626,43 +2477,13 @@ msgid "<a href=\"bridges.finding\">How can I find bridges?</a>"
msgstr ""
msgctxt "NetworkPage"
-msgid ""
-"No new bridges are currently available. You can either wait a while and try "
-"again, or try another method of finding new bridges."
+msgid "No new bridges are currently available. You can either wait a while and try again, or try another method of finding new bridges."
msgstr ""
msgctxt "NetworkPage"
msgid "Click Help to see other methods of finding new bridges."
msgstr ""
-msgctxt "NetworkPage"
-msgid "Address:"
-msgstr ""
-
-msgctxt "NetworkPage"
-msgid "Type:"
-msgstr ""
-
-msgctxt "NetworkPage"
-msgid "You must select the proxy type."
-msgstr ""
-
-msgctxt "NetworkPage"
-msgid "SOCKS 4"
-msgstr ""
-
-msgctxt "NetworkPage"
-msgid "SOCKS 5"
-msgstr ""
-
-msgctxt "NetworkPage"
-msgid "HTTP"
-msgstr ""
-
-msgctxt "NetworkPage"
-msgid "HTTP / HTTPS"
-msgstr ""
-
msgctxt "Policy"
msgid "accept"
msgstr ""
@@ -2816,15 +2637,11 @@ msgid "Bridge Support Unavailable"
msgstr ""
msgctxt "ServerPage"
-msgid ""
-"You have configured Tor to act as a bridge relay for censored users, but "
-"your version of Tor does not support bridges."
+msgid "You have configured Tor to act as a bridge relay for censored users, but your version of Tor does not support bridges."
msgstr ""
msgctxt "ServerPage"
-msgid ""
-"Please upgrade your Tor software or configure Tor to act as a normal Tor "
-"relay."
+msgid "Please upgrade your Tor software or configure Tor to act as a normal Tor relay."
msgstr ""
msgctxt "ServerPage"
@@ -2892,9 +2709,7 @@ msgid "Basic Settings"
msgstr ""
msgctxt "ServerPage"
-msgid ""
-"For Internet connections with fast download speed but slow upload, please "
-"list your upload speed here."
+msgid "For Internet connections with fast download speed but slow upload, please list your upload speed here."
msgstr ""
msgctxt "ServerPage"
@@ -2950,9 +2765,7 @@ msgid "Peak bandwidth rate limit"
msgstr ""
msgctxt "ServerPage"
-msgid ""
-"Your maximum bandwidth rate must be greater than or equal to your average "
-"bandwidth rate. Both values must be at least 20 KB/s."
+msgid "Your maximum bandwidth rate must be greater than or equal to your average bandwidth rate. Both values must be at least 20 KB/s."
msgstr ""
msgctxt "ServerPage"
@@ -3012,14 +2825,11 @@ msgid "Show help topic on exit policies"
msgstr ""
msgctxt "ServerPage"
-msgid ""
-"What Internet resources should users be able to access from your relay?"
+msgid "What Internet resources should users be able to access from your relay?"
msgstr ""
msgctxt "ServerPage"
-msgid ""
-"Tor will still block some outgoing mail and file sharing applications by "
-"default to reduce spam and other abuse."
+msgid "Tor will still block some outgoing mail and file sharing applications by default to reduce spam and other abuse."
msgstr ""
msgctxt "ServerPage"
@@ -3031,8 +2841,7 @@ msgid "Let others access your bridge by giving them this line:"
msgstr ""
msgctxt "ServerPage"
-msgid ""
-"This is the identity of your bridge relay that you can give to other people"
+msgid "This is the identity of your bridge relay that you can give to other people"
msgstr ""
msgctxt "ServerPage"
@@ -3048,9 +2857,7 @@ msgid "No clients have used your relay recently."
msgstr ""
msgctxt "ServerPage"
-msgid ""
-"Leave your relay running so clients have a better chance of finding and "
-"using it."
+msgid "Leave your relay running so clients have a better chance of finding and using it."
msgstr ""
msgctxt "ServerPage"
@@ -3062,9 +2869,7 @@ msgid "Vidalia was unable to retrieve your bridge's usage history."
msgstr ""
msgctxt "ServerPage"
-msgid ""
-"Tor returned an improperly formatted response when Vidalia requested your "
-"bridge's usage history."
+msgid "Tor returned an improperly formatted response when Vidalia requested your bridge's usage history."
msgstr ""
msgctxt "ServerPage"
@@ -3080,20 +2885,11 @@ msgid "<a href=\"#bridgeUsage\">Who has used my bridge?</a>"
msgstr ""
msgctxt "ServerPage"
-msgid "<a href=\"#bridgeHelp\">What's this?</a>"
-msgstr ""
-
-msgctxt "ServerPage"
-msgid "Automatically distribute my bridge address"
-msgstr ""
-
-msgctxt "ServerPage"
msgid "Mirror the Relay Directory"
msgstr ""
msgctxt "ServerPage"
-msgid ""
-"Email address at which you may be reached if there is a\n"
+msgid "Email address at which you may be reached if there is a\n"
"problem with your relay. You might also include your PGP or GPG fingerprint."
msgstr ""
@@ -3102,9 +2898,7 @@ msgid "Error while trying to unpublish all services"
msgstr ""
msgctxt "ServicePage"
-msgid ""
-"Please configure at least a service directory and a virtual port for each "
-"service you want to save. Remove the other ones."
+msgid "Please configure at least a service directory and a virtual port for each service you want to save. Remove the other ones."
msgstr ""
msgctxt "ServicePage"
@@ -3179,251 +2973,6 @@ msgctxt "ServicePage"
msgid "Created by Tor"
msgstr ""
-msgctxt "StatusEventWidget"
-msgid "Copy to Clipboard"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "The Tor Software is Running"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "You are currently running version \"%1\" of the Tor software."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "The Tor Software is not Running"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Click \"Start Tor\" in the Vidalia Control Panel to restart the Tor "
-"software. If Tor exited unexpectedly, select the \"Advanced\" tab above for "
-"details about any errors encountered."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"You are currently running version \"%1\" of the Tor software, which is no "
-"longer recommended. Please upgrade to the most recent version of the "
-"software, which may contain important security, reliability and performance "
-"fixes."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"You are currently running version \"%1\" of the Tor software, which may no "
-"longer work with the current Tor network. Please upgrade to the most recent "
-"version of the software, which may contain important security, reliability "
-"and performance fixes."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Your Tor Software is Out-of-date"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Connected to the Tor Network"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"We were able to successfully establish a connection to the Tor network. You "
-"can now configure your applications to use the Internet anonymously."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Tor Software Error"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"The Tor software encountered an internal bug. Please report the following "
-"error message to the Tor developers at bugs.torproject.org: \"%1\""
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Tor has determined that your computer's clock may be set to %1 seconds in "
-"the past compared to the source \"%2\". If your clock is not correct, Tor "
-"will not be able to function. Please verify your computer displays the "
-"correct time."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Tor has determined that your computer's clock may be set to %1 seconds in "
-"the future compared to the source \"%2\". If your clock is not correct, Tor "
-"will not be able to function. Please verify your computer displays the "
-"correct time."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Your Computer's Clock is Potentially Incorrect"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"One of the applications on your computer may have attempted to make an "
-"unencrypted connection through Tor to port %1. Sending unencrypted "
-"information over the Tor network is dangerous and not recommended. For your "
-"protection, Tor has automatically closed this connection."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"One of the applications on your computer may have attempted to make an "
-"unencrypted connection through Tor to port %1. Sending unencrypted "
-"information over the Tor network is dangerous and not recommended."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Potentially Dangerous Connection!"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"One of your applications established a connection through Tor to \"%1\" "
-"using a protocol that may leak information about your destination. Please "
-"ensure you configure your applications to use only SOCKS4a or SOCKS5 with "
-"remote hostname resolution."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Unknown SOCKS Protocol"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"One of your applications tried to establish a connection through Tor using a"
-" protocol that Tor does not understand. Please ensure you configure your "
-"applications to use only SOCKS4a or SOCKS5 with remote hostname resolution."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Invalid Destination Hostname"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"One of your applications tried to establish a connection through Tor to "
-"\"%1\", which Tor does not recognize as a valid hostname. Please check your "
-"application's configuration."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "External IP Address Changed"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Tor has determined your relay's public IP address is currently %1%2. If that"
-" is not correct, please consider setting the 'Address' option in your "
-"relay's configuration."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "DNS Hijacking Detected"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Tor detected that your DNS provider is providing false responses for domains"
-" that do not exist. Some ISPs and other DNS providers, such as OpenDNS, are "
-"known to do this in order to display their own search or advertising pages."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Tor detected that your DNS provider is providing false responses for well "
-"known domains. Since clients rely on Tor network relays to provide accurate "
-"DNS repsonses, your relay will not be configured as an exit relay."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Checking Server Port Reachability"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Tor is trying to determine if your relay's server port is reachable from the"
-" Tor network by connecting to itself at %1:%2. This test could take several "
-"minutes."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Server Port Reachability Test Successful!"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Your relay's server port is reachable from the Tor network!"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Server Port Reachability Test Failed"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Your relay's server port is not reachable by other Tor clients. This can "
-"happen if you are behind a router or firewall that requires you to set up "
-"port forwarding. If %1:%2 is not your correct IP address and server port, "
-"please check your relay's configuration."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Checking Directory Port Reachability"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Tor is trying to determine if your relay's directory port is reachable from "
-"the Tor network by connecting to itself at %1:%2. This test could take "
-"several minutes."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Directory Port Reachability Test Successful!"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Your relay's directory port is reachable from the Tor network!"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Directory Port Reachability Test Failed"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Your relay's directory port is not reachable by other Tor clients. This can "
-"happen if you are behind a router or firewall that requires you to set up "
-"port forwarding. If %1:%2 is not your correct IP address and directory port,"
-" please check your relay's configuration."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Relay Descriptor Rejected"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Your relay's descriptor, which enables clients to connect to your relay, was"
-" rejected by the directory server at %1:%2. The reason given was: %3"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Your Relay is Online"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Your relay is now online and available for Tor clients to use. You should "
-"see an increase in network traffic shown by the Bandwidth Graph within a few"
-" hours as more clients learn about your relay. Thank you for contributing to"
-" the Tor network!"
-msgstr ""
-
msgctxt "Stream"
msgid "New"
msgstr ""
@@ -3476,68 +3025,6 @@ msgctxt "TorSettings"
msgid "Failed to hash the control password."
msgstr ""
-msgctxt "TorrcDialog"
-msgid "Editing torrc"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid ""
-"Save settings. If unchecked it will only apply settings to the current Tor "
-"instance."
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Cut"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Copy"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Paste"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Undo"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Redo"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Select All"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Apply all"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Apply selection only"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Error connecting to Tor"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Selection is empty. Please select some text, or check \"Apply all\""
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Error at line %1: \"%2\""
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Error"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "An error ocurred while opening torrc file"
-msgstr ""
-
msgctxt "UPNPControl"
msgid "Success"
msgstr ""
@@ -3595,15 +3082,11 @@ msgid "Testing Universal Plug & Play Support"
msgstr ""
msgctxt "UpdateProcess"
-msgid ""
-"Vidalia was unable to check for available software updates because it could "
-"not find '%1'."
+msgid "Vidalia was unable to check for available software updates because it could not find '%1'."
msgstr ""
msgctxt "UpdateProcess"
-msgid ""
-"Vidalia was unable to check for available software updates because Tor's "
-"update process exited unexpectedly."
+msgid "Vidalia was unable to check for available software updates because Tor's update process exited unexpectedly."
msgstr ""
msgctxt "UpdateProgressDialog"
@@ -3759,10 +3242,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 ""
@@ -3775,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 ""
@@ -3812,5 +3290,3 @@ msgstr ""
msgctxt "stringutil.h"
msgid "%1 mins"
msgstr ""
-
-
diff --git a/src/vidalia/i18n/po/su/qt_su.po b/src/vidalia/i18n/po/su/qt_su.po
index dfdaa08..c1c0116 100644
--- a/src/vidalia/i18n/po/su/qt_su.po
+++ b/src/vidalia/i18n/po/su/qt_su.po
@@ -1,11 +1,10 @@
#
-# Translators:
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-08-20 03:25+0000\n"
-"PO-Revision-Date: 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"
@@ -431,5 +430,3 @@ msgstr ""
msgctxt "QFileSystemModel"
msgid "%1 bytes"
msgstr ""
-
-
diff --git a/src/vidalia/i18n/po/su/vidalia_su.po b/src/vidalia/i18n/po/su/vidalia_su.po
index b7dcc7c..c7779a7 100644
--- a/src/vidalia/i18n/po/su/vidalia_su.po
+++ b/src/vidalia/i18n/po/su/vidalia_su.po
@@ -1,11 +1,10 @@
#
-# Translators:
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-09-07 14:40+0000\n"
-"PO-Revision-Date: 2010-12-05 20:03+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"
@@ -193,10 +192,6 @@ 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"
@@ -236,10 +231,6 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr ""
-
-msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -279,6 +270,10 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr ""
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -432,17 +427,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"
@@ -1266,44 +1270,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"
@@ -1331,10 +1342,6 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr ""
-
-msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1362,6 +1369,10 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr ""
+
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1644,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 ""
@@ -1680,10 +1663,6 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1796,10 +1775,6 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1882,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 ""
@@ -1934,82 +1897,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 ""
@@ -2057,19 +1949,39 @@ 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)"
+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"
@@ -2091,17 +2003,35 @@ msgid ""
msgstr ""
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"
@@ -2357,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"
@@ -2412,10 +2334,6 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2515,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 ""
@@ -2840,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 ""
@@ -3088,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 ""
@@ -3132,10 +3070,6 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
-msgid "Form"
-msgstr ""
-
-msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3424,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 ""
@@ -3460,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 ""
@@ -3538,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 ""
@@ -3666,6 +3646,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 ""
@@ -3759,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 ""
@@ -3812,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 8a4cb9c..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:
-# 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: 2012-02-14 09:47+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"
@@ -210,7 +207,7 @@ msgid ""
"%1\n"
"File not found.\n"
"Please verify the correct file name was given."
-msgstr "%1 \nFilen hittades inte.\nVar god bekräfta att det korrekta filnamnet har angetts."
+msgstr ""
#: qdirmodel.cpp:833
msgctxt "QFileDialog"
@@ -268,14 +265,14 @@ msgid ""
"%1\n"
"Directory not found.\n"
"Please verify the correct directory name was given."
-msgstr "%1\nMappen hittades inte.\nVar god bekräfta att det korrekta mappnamnet har angetts."
+msgstr ""
#: qfiledialog.cpp:2281
msgctxt "QFileDialog"
msgid ""
"'%1' is write protected.\n"
"Do you want to delete it anyway?"
-msgstr "'%1' är skrivskyddat.\nVill du ta bort det ändå?"
+msgstr ""
#: qfiledialog.cpp:2286
msgctxt "QFileDialog"
@@ -372,7 +369,9 @@ msgctxt "QFileSystemModel"
msgid ""
"<b>The name \"%1\" can not be used.</b><p>Try using another name, with fewer"
" characters or no punctuations marks."
-msgstr "<b>Namnet \"%1\" kan inte användas.</b><p>Försök använda ett nytt namn, med färre tecken eller inga skiljetecken."
+msgstr ""
+"<b>Namnet \"%1\" kan inte användas.</b><p>Försök använda ett nytt namn, med "
+"färre tecken eller inga skiljetecken."
#: qfilesystemmodel.cpp:832
msgctxt "QFileSystemModel"
diff --git a/src/vidalia/i18n/po/sv/vidalia_sv.po b/src/vidalia/i18n/po/sv/vidalia_sv.po
index 109e635..ba5c1f1 100644
--- a/src/vidalia/i18n/po/sv/vidalia_sv.po
+++ b/src/vidalia/i18n/po/sv/vidalia_sv.po
@@ -1,23 +1,16 @@
-#
-# Translators:
-# <bik1230 at gmail.com>, 2012.
-# <lars.edman at bredband.net>, 2012.
-# <marta.leffler at gmail.com>, 2011.
-# runasand <runa.sandvik at gmail.com>, 2011.
msgid ""
msgstr ""
-"Project-Id-Version: The Tor Project\n"
-"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2012-03-21 17:52+0000\n"
-"PO-Revision-Date: 2012-03-22 08:51+0000\n"
-"Last-Translator: Larse <lars.edman at bredband.net>\n"
+"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"
@@ -33,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"
@@ -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,78 +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 "Tor Kontroll"
-
-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 "OBS: det här kommer att ändra den för nuvarande laddade torrc"
-
-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 ""
-"You've checked the autoconfiguration option for the ControlPort, but "
-"provided no Data Directory. Please add one, or uncheck the \"Configure "
-"ControlPort automatically\" option."
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid ""
-"Vidalia was unable to remove the Tor service.\n"
+msgid "Vidalia was unable to remove the Tor service.\n"
"\n"
"You may need to remove it manually."
-msgstr "Vidalia kunde inte ta bort Tor-tjänsten.\n\nDu kan behöva ta bort den manuellt."
+msgstr ""
msgctxt "AppearancePage"
msgid "Language"
@@ -234,23 +178,6 @@ msgctxt "AppearancePage"
msgid "Vidalia was unable to load the selected language translation."
msgstr "Vidalia kunde ej ladda den valda språköversättningen"
-msgctxt "AppearancePage"
-msgid ""
-"System Icon Preferences (changes will take effect when you restart Vidalia)"
-msgstr ""
-
-msgctxt "AppearancePage"
-msgid "Show the Tray Icon and Dock Icon (default)"
-msgstr ""
-
-msgctxt "AppearancePage"
-msgid "Hide the Tray Icon"
-msgstr ""
-
-msgctxt "AppearancePage"
-msgid "Hide the Dock Icon"
-msgstr ""
-
msgctxt "BandwidthGraph"
msgid "Since:"
msgstr "Sedan:"
@@ -309,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"
@@ -468,10 +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:"
-msgstr "Vidalia har anslutit till en pågående Tor process som kräver ett lösenord. Vänligen ange ditt kontrollösenord:"
+msgid "Vidalia has connected to a running Tor process that requires a password. Please enter your control password:"
+msgstr ""
msgctxt "ControlSocket"
msgid "Control socket is not connected."
@@ -491,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"
@@ -519,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"
@@ -663,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"
@@ -699,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"
@@ -731,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"
@@ -815,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"
@@ -923,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"
@@ -967,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"
@@ -1015,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"
@@ -1055,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"
@@ -1067,271 +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"
@@ -1351,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"
@@ -1380,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"
@@ -1408,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."
@@ -1540,17 +1416,14 @@ 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."
+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"
@@ -1562,14 +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."
+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"
@@ -1607,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"
@@ -1776,6 +1623,10 @@ msgid "Connected to the Tor network!"
msgstr "Ansluten till Tor-nätverket!"
msgctxt "MainWindow"
+msgid "Unrecognized startup status"
+msgstr "Okänt starttillstånd"
+
+msgctxt "MainWindow"
msgid "miscellaneous"
msgstr "blandat"
@@ -1840,9 +1691,7 @@ 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."
+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"
@@ -1878,9 +1727,7 @@ 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."
+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"
@@ -1900,9 +1747,7 @@ 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."
+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"
@@ -1922,9 +1767,7 @@ 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."
+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"
@@ -1932,9 +1775,7 @@ msgid "Tor website: %1"
msgstr "Tors hemsida: %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 "Efterföljande anslutningar kommer att framstå som olika från dina gamla anslutningar."
msgctxt "MainWindow"
@@ -1963,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"
@@ -2026,32 +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."
+msgid "Vidalia tried to reset Tor's control 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."
+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?"
-msgstr "Vill du kontrollera om ett nyare paket är tillgängligt för installation?"
+msgid "Would you like to check if a newer package is available for installation?"
+msgstr ""
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."
-msgstr "Tor har automatiskt stängs din anslutning för att skydda din anonymitet."
+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 ""
msgctxt "MainWindow"
msgid "Update Failed"
@@ -2059,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."
@@ -2077,71 +1912,56 @@ msgstr "Vidalia kunde inte avsluta Torprogrammet."
msgctxt "MainWindow"
msgid "The following error occurred:"
-msgstr "Följande fel inträffade:"
+msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Anything 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."
+msgid "failed (%1)"
+msgstr ""
msgctxt "MainWindow"
-msgid "Bootstrapping torrc from %1 to %2"
+msgid "Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
msgstr ""
msgctxt "MainWindow"
-msgid "(probably Telnet)"
+msgid "You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"\n"
+"Would you like to shutdown gracefully and give clients time to find a new relay?"
msgstr ""
msgctxt "MainWindow"
-msgid "(probably an email client)"
+msgid "Vidalia detected that the Tor software exited unexpectedly.\n"
+"\n"
+"Please check the message log for recent warning or error messages."
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"One of your applications %1 appears to be making a potentially unencrypted "
-"and unsafe connection to port %2."
+msgid ", probably Telnet,"
msgstr ""
msgctxt "MainWindow"
-msgid "failed (%1)"
-msgstr "misslyckade (%1)"
+msgid ", probably an email client,"
+msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
-msgstr "Ditt Tor-relä stänger nu ner.⏎\nTryck 'Stopp' igen för att stänga det omgående."
+msgid "Vidalia"
+msgstr "Vidalia"
msgctxt "MainWindow"
-msgid ""
-"Vidalia can't find out how to talk to Tor because it can't access this file: %1\n"
-"\n"
-"Here's the last error message:\n"
-"%2"
+msgid "File"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"It seems Tor has stopped running since Vidalia started it.\n"
-"\n"
-"See the Advanced Message Log for more information."
-msgstr ""
+msgid "About Vidalia"
+msgstr "Om Vidalia"
msgctxt "MainWindow"
-msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
-"\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
-msgstr ""
+msgid "Home"
+msgstr "Hem"
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 upptäckte att Tor programvaran avslutades oväntat.\n\nKontrollera meddelandeloggen för nya varnings- eller felmeddelanden."
+msgid "Check For Updates"
+msgstr ""
msgctxt "MessageLog"
msgid "Error Setting Filter"
@@ -2384,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"
@@ -2396,59 +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."
+msgstr ""
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."
+msgstr ""
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."
+msgstr ""
msgctxt "NetViewer"
msgid "Tor Network Map"
@@ -2536,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"
@@ -2544,30 +2346,34 @@ 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"
msgstr "Ctrl+F"
msgctxt "NetworkPage"
+msgid "Invalid Bridge"
+msgstr "Ogiltig brygga"
+
+msgctxt "NetworkPage"
+msgid "The specified bridge identifier is not valid."
+msgstr "Den angivna bryggidentiteten är ogiltig."
+
+msgctxt "NetworkPage"
msgid "Copy (Ctrl+C)"
msgstr "Kopiera (Ctrl+C)"
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 "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."
+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"
@@ -2587,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:"
@@ -2619,9 +2433,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 "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"
@@ -2633,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"
@@ -2646,52 +2466,22 @@ 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."
-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."
+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 "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 / HTTPS"
-msgstr "HTTP / HTTPS"
-
-msgctxt "NetworkPage"
-msgid "You must specify one or more bridges."
msgstr ""
msgctxt "Policy"
@@ -2760,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:"
@@ -2847,15 +2637,11 @@ 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."
+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."
+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"
@@ -2871,6 +2657,10 @@ msgid "Run as a client only"
msgstr "Kör endast som klient"
msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network"
+msgstr "Vidarebefordra trafik för Tor-nätverket (kör som Tor-router)"
+
+msgctxt "ServerPage"
msgid "Relay Port:"
msgstr "Routerport:"
@@ -2919,9 +2709,7 @@ 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."
+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"
@@ -2977,9 +2765,7 @@ 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."
+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"
@@ -3039,14 +2825,11 @@ 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?"
+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."
+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"
@@ -3058,8 +2841,7 @@ 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"
+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"
@@ -3068,17 +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."
-msgstr "Lämna din router igång så att klienter får större möjlighet att hitta och använda den."
+msgid "Leave your relay running so clients have a better chance of finding and using it."
+msgstr ""
msgctxt "ServerPage"
msgid "Bridge History"
@@ -3089,14 +2869,12 @@ 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."
-msgstr "Tor returnerade ett felaktigt formaterat svar när Vidalia begärde din bryggas användningshistorik."
+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 "Det returnerade svaret var:%1"
+msgstr ""
msgctxt "ServerPage"
msgid "Help censored users reach the Tor network"
@@ -3107,39 +2885,20 @@ 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 "Relay traffic for the Tor network (exit relay)"
-msgstr ""
-
-msgctxt "ServerPage"
-msgid "Relay traffic inside the Tor network (non-exit relay)"
-msgstr ""
-
-msgctxt "ServerPage"
msgid "Mirror the Relay Directory"
-msgstr "Spegla routerkatalogen"
+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."
+msgstr ""
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)"
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 "Konfigurera åtminstone en aktivitetskatalog och en virtuell port för varje aktivitet du vill spara. Ta bort de andra."
msgctxt "ServicePage"
@@ -3214,251 +2973,6 @@ 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"
@@ -3511,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"
@@ -3630,20 +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'."
-msgstr "Vidalia kunde inte söka efter programuppdateringar eftersom den inte kunde hitta '%1'."
+msgid "Vidalia was unable to check for available software updates because it could not find '%1'."
+msgstr ""
msgctxt "UpdateProcess"
-msgid ""
-"Vidalia was unable to check for available software updates because Tor's "
-"update process exited unexpectedly."
-msgstr "Vidalia kunde inte söka efter programuppdateringar eftersom Tors uppdateringsprocess avslutades oväntat."
+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 "Söker efter tillgängliga uppdateringar ..."
+msgstr ""
msgctxt "UpdateProgressDialog"
msgid "Hide"
@@ -3651,7 +3099,7 @@ msgstr "Dölj"
msgctxt "UpdateProgressDialog"
msgid "Downloading updates..."
-msgstr "Hämtar uppdateringar ..."
+msgstr ""
msgctxt "UpdateProgressDialog"
msgid "Installing updated software..."
@@ -3659,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"
@@ -3667,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"
@@ -3683,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"
@@ -3794,27 +3242,22 @@ 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 "Ogiltig språk kod:"
+msgstr ""
msgctxt "Vidalia"
msgid "Invalid GUI style specified:"
-msgstr "Ogiltig GUI stil:"
+msgstr ""
msgctxt "Vidalia"
msgid "Invalid log level specified:"
-msgstr "Ogiltig loggnings nivå:"
+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 "En annan Vidalia process kanske redan körs. Om det faktiskt inte finns en annan Vidalia process kan du forstäta ändå.\n\nVill du fortsätta?"
+msgstr ""
msgctxt "stringutil.h"
msgid "%1 secs"
@@ -3838,12 +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/qt_sw.po b/src/vidalia/i18n/po/sw/qt_sw.po
index d96a0a0..5b0a18f 100644
--- a/src/vidalia/i18n/po/sw/qt_sw.po
+++ b/src/vidalia/i18n/po/sw/qt_sw.po
@@ -1,11 +1,10 @@
#
-# Translators:
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-08-20 03:25+0000\n"
-"PO-Revision-Date: 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"
@@ -431,5 +430,3 @@ msgstr ""
msgctxt "QFileSystemModel"
msgid "%1 bytes"
msgstr ""
-
-
diff --git a/src/vidalia/i18n/po/sw/vidalia_sw.po b/src/vidalia/i18n/po/sw/vidalia_sw.po
index 5509397..d7e175a 100755
--- a/src/vidalia/i18n/po/sw/vidalia_sw.po
+++ b/src/vidalia/i18n/po/sw/vidalia_sw.po
@@ -1,11 +1,10 @@
#
-# Translators:
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-09-07 14:40+0000\n"
-"PO-Revision-Date: 2010-12-05 20:03+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"
@@ -193,10 +192,6 @@ 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"
@@ -236,10 +231,6 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr ""
-
-msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -279,6 +270,10 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr ""
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -432,17 +427,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"
@@ -1266,44 +1270,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"
@@ -1331,10 +1342,6 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr ""
-
-msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1362,6 +1369,10 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr ""
+
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1644,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 ""
@@ -1680,10 +1663,6 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1796,10 +1775,6 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1882,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 ""
@@ -1934,82 +1897,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 ""
@@ -2057,19 +1949,39 @@ 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)"
+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"
@@ -2091,17 +2003,35 @@ msgid ""
msgstr ""
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"
@@ -2357,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"
@@ -2412,10 +2334,6 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2515,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 ""
@@ -2840,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 ""
@@ -3088,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 ""
@@ -3132,10 +3070,6 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
-msgid "Form"
-msgstr ""
-
-msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3424,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 ""
@@ -3460,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 ""
@@ -3538,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 ""
@@ -3666,6 +3646,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 ""
@@ -3759,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 ""
@@ -3812,5 +3796,3 @@ msgstr ""
msgctxt "stringutil.h"
msgid "%1 mins"
msgstr ""
-
-
diff --git a/src/vidalia/i18n/po/ta/qt_ta.po b/src/vidalia/i18n/po/ta/qt_ta.po
index fb948e7..fdc9bd7 100644
--- a/src/vidalia/i18n/po/ta/qt_ta.po
+++ b/src/vidalia/i18n/po/ta/qt_ta.po
@@ -1,11 +1,10 @@
#
-# Translators:
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-08-20 03:25+0000\n"
-"PO-Revision-Date: 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"
@@ -431,5 +430,3 @@ msgstr ""
msgctxt "QFileSystemModel"
msgid "%1 bytes"
msgstr ""
-
-
diff --git a/src/vidalia/i18n/po/ta/vidalia_ta.po b/src/vidalia/i18n/po/ta/vidalia_ta.po
index 740b3bf..bff8877 100644
--- a/src/vidalia/i18n/po/ta/vidalia_ta.po
+++ b/src/vidalia/i18n/po/ta/vidalia_ta.po
@@ -1,11 +1,10 @@
#
-# Translators:
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-09-07 14:40+0000\n"
-"PO-Revision-Date: 2010-12-05 20:03+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"
@@ -193,10 +192,6 @@ 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"
@@ -236,10 +231,6 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr ""
-
-msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -279,6 +270,10 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr ""
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -432,17 +427,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"
@@ -1266,44 +1270,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"
@@ -1331,10 +1342,6 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr ""
-
-msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1362,6 +1369,10 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr ""
+
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1644,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 ""
@@ -1680,10 +1663,6 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1796,10 +1775,6 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1882,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 ""
@@ -1934,82 +1897,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 ""
@@ -2057,19 +1949,39 @@ 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)"
+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"
@@ -2091,17 +2003,35 @@ msgid ""
msgstr ""
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"
@@ -2357,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"
@@ -2412,10 +2334,6 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2515,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 ""
@@ -2840,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 ""
@@ -3088,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 ""
@@ -3132,10 +3070,6 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
-msgid "Form"
-msgstr ""
-
-msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3424,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 ""
@@ -3460,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 ""
@@ -3538,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 ""
@@ -3666,6 +3646,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 ""
@@ -3759,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 ""
@@ -3812,5 +3796,3 @@ msgstr ""
msgctxt "stringutil.h"
msgid "%1 mins"
msgstr ""
-
-
diff --git a/src/vidalia/i18n/po/te/qt_te.po b/src/vidalia/i18n/po/te/qt_te.po
index 3e09d16..267cd8e 100644
--- a/src/vidalia/i18n/po/te/qt_te.po
+++ b/src/vidalia/i18n/po/te/qt_te.po
@@ -1,11 +1,10 @@
#
-# Translators:
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-08-20 03:25+0000\n"
-"PO-Revision-Date: 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"
@@ -431,5 +430,3 @@ msgstr ""
msgctxt "QFileSystemModel"
msgid "%1 bytes"
msgstr ""
-
-
diff --git a/src/vidalia/i18n/po/te/vidalia_te.po b/src/vidalia/i18n/po/te/vidalia_te.po
index 08b6dcc..65ad3df 100644
--- a/src/vidalia/i18n/po/te/vidalia_te.po
+++ b/src/vidalia/i18n/po/te/vidalia_te.po
@@ -1,11 +1,10 @@
#
-# Translators:
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-09-07 14:40+0000\n"
-"PO-Revision-Date: 2010-12-05 20:03+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"
@@ -193,10 +192,6 @@ 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"
@@ -236,10 +231,6 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr ""
-
-msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -279,6 +270,10 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr ""
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -432,17 +427,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"
@@ -1266,44 +1270,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"
@@ -1331,10 +1342,6 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr ""
-
-msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1362,6 +1369,10 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr ""
+
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1644,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 ""
@@ -1680,10 +1663,6 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1796,10 +1775,6 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1882,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 ""
@@ -1934,82 +1897,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 ""
@@ -2057,19 +1949,39 @@ 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)"
+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"
@@ -2091,17 +2003,35 @@ msgid ""
msgstr ""
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"
@@ -2357,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"
@@ -2412,10 +2334,6 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2515,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 ""
@@ -2840,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 ""
@@ -3088,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 ""
@@ -3132,10 +3070,6 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
-msgid "Form"
-msgstr ""
-
-msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3424,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 ""
@@ -3460,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 ""
@@ -3538,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 ""
@@ -3666,6 +3646,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 ""
@@ -3759,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 ""
@@ -3812,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 6ad460c..bb2bcbd 100644
--- a/src/vidalia/i18n/po/templates/vidalia.pot
+++ b/src/vidalia/i18n/po/templates/vidalia.pot
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Vidalia\n"
"Report-Msgid-Bugs-To: translations at vidalia-project.net\n"
-"POT-Creation-Date: 2012-03-21 17:52+0000\n"
+"POT-Creation-Date: 2012-03-21 17:46+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
@@ -14,179 +14,199 @@ msgstr ""
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."
-msgstr "You selected 'Password' authentication, but did not specify a password."
+msgstr ""
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."
-msgstr "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 "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 "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"
+msgstr ""
msgctxt "AdvancedPage"
msgid "Configure ControlPort automatically"
-msgstr "Configure ControlPort automatically"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "<b>WARNING</b>: If you hand pick the password it will be saved as plain text in Vidalia's configuration file. Using a random password is safer."
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Panic"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "<b>WARNING</b>: The panic button will erease the application if pressed"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Enable panic button"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Panic path:"
+msgstr ""
msgctxt "AdvancedPage"
msgid "You've checked the autoconfiguration option for the ControlPort, but provided no Data Directory. Please add one, or uncheck the \"Configure ControlPort automatically\" option."
@@ -198,25 +218,29 @@ msgid "Vidalia was unable to remove the Tor service.\n"
"You may need to remove it manually."
msgstr ""
+msgctxt "AdvancedPage"
+msgid "Select a Directory to Use for Panic"
+msgstr ""
+
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 "AppearancePage"
msgid "System Icon Preferences (changes will take effect when you restart Vidalia)"
@@ -236,939 +260,941 @@ 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"
-
-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 "Vidalia can try to restart Tor for you. Doing so will close all currently active connections through your Tor process."
+msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Remember my password"
-msgstr "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:"
+msgid "You will need to shut down the Tor process before Vidalia can launch a new one."
msgstr ""
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"
@@ -1268,115 +1294,115 @@ 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"
+msgstr ""
msgctxt "CrashReportDialog"
msgid "Don't Restart"
-msgstr "Don't Restart"
+msgstr ""
msgctxt "CrashReportDialog"
msgid "Unable to restart Vidalia"
-msgstr "Unable to restart Vidalia"
+msgstr ""
msgctxt "CrashReportDialog"
msgid "We were unable to automatically restart Vidalia. Please restart Vidalia manually."
-msgstr "We were unable to automatically restart Vidalia. Please restart Vidalia manually."
+msgstr ""
msgctxt "CrashReportDialog"
msgid "Please fill a ticket in:"
-msgstr "Please fill a ticket in:"
+msgstr ""
msgctxt "CrashReportDialog"
msgid "<a href=\"https://trac.torproject.org/projects/tor/newticket\">https://trac.torproject.org/projects/tor/newticket</a>"
-msgstr "<a href=\"https://trac.torproject.org/projects/tor/newticket\">https://trac.torproject.org/projects/tor/newticket</a>"
+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 "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 "with a description of what you were doing before the application crashed, along with the following files corresponding to the crash report:"
+msgstr ""
+
+msgctxt "DebugDialog"
+msgid "Plugin debug output"
+msgstr ""
+
+msgctxt "DebugDialog"
+msgid "Plugin Output"
+msgstr ""
+
+msgctxt "DebugDialog"
+msgid "Syntax Errors"
+msgstr ""
+
+msgctxt "DebugDialog"
+msgid "Exceptions"
+msgstr ""
msgctxt "GeneralPage"
msgid "Executables (*.exe)"
-msgstr "Executables (*.exe)"
+msgstr ""
msgctxt "GeneralPage"
msgid "Select Path to Tor"
-msgstr "Select Path to Tor"
-
-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"
-
-msgctxt "GeneralPage"
-msgid "Proxy Application (optional)"
-msgstr "Proxy Application (optional)"
-
-msgctxt "GeneralPage"
-msgid "Start a proxy application when Tor starts"
-msgstr "Start a proxy application when Tor starts"
-
-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:"
@@ -1388,127 +1414,127 @@ 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:"
@@ -1516,23 +1542,23 @@ 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."
-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."
+msgstr ""
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."
-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."
+msgstr ""
msgctxt "HelpTextBrowser"
msgid "Error opening help file:"
@@ -1540,526 +1566,429 @@ 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"
-
-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"
-
-msgctxt "MainWindow"
-msgid "Error starting web browser"
-msgstr "Error starting web browser"
-
-msgctxt "MainWindow"
-msgid "Vidalia was unable to start the configured web browser"
-msgstr "Vidalia was unable to start the configured web browser"
-
-msgctxt "MainWindow"
-msgid "Error starting IM client"
-msgstr "Error starting IM client"
-
-msgctxt "MainWindow"
-msgid "Vidalia was unable to start the configured IM client"
-msgstr "Vidalia was unable to start the configured IM client"
-
-msgctxt "MainWindow"
-msgid "Error starting proxy server"
-msgstr "Error starting proxy server"
-
-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 "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."
-msgstr "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 "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."
-msgstr "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 "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"
+msgstr ""
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."
+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."
-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."
+msgstr ""
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."
-msgstr "All subsequent connections will appear to be different than your old connections."
+msgstr ""
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"
+msgid "Password Reset Failed"
+msgstr ""
msgctxt "MainWindow"
-msgid "Setup Relaying"
-msgstr "Setup Relaying"
+msgid "The currently installed version of Tor is out of date or no longer recommended."
+msgstr ""
msgctxt "MainWindow"
-msgid "Set up a relay and help the network grow"
-msgstr "Set up a relay and help the network grow"
+msgid "Would you like to check if a newer package is available for installation?"
+msgstr ""
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"
-
-msgctxt "MainWindow"
-msgid "View recent bandwidth usage"
-msgstr "View recent bandwidth usage"
-
-msgctxt "MainWindow"
-msgid "View log message history"
-msgstr "View log message history"
+msgid "Potentially Unsafe Connection"
+msgstr ""
msgctxt "MainWindow"
-msgid "View help documentation"
-msgstr "View help documentation"
+msgid "Tor has automatically closed your connection in order to protect your anonymity."
+msgstr ""
msgctxt "MainWindow"
-msgid "Configure Vidalia"
-msgstr "Configure Vidalia"
+msgid "Update Failed"
+msgstr ""
msgctxt "MainWindow"
-msgid "View version and license information"
-msgstr "View version and license information"
+msgid "Your software is up to date"
+msgstr ""
msgctxt "MainWindow"
-msgid "Exit Vidalia"
-msgstr "Exit Vidalia"
+msgid "There are no new Tor software packages available for your computer at this time."
+msgstr ""
msgctxt "MainWindow"
-msgid "Show this window on startup"
-msgstr "Show this window on startup"
+msgid "Installation Failed"
+msgstr ""
msgctxt "MainWindow"
-msgid "Hide"
-msgstr "Hide"
+msgid "Vidalia was unable to install your software updates."
+msgstr ""
msgctxt "MainWindow"
-msgid "Hide this window"
-msgstr "Hide this window"
+msgid "The following error occurred:"
+msgstr ""
msgctxt "MainWindow"
-msgid "Password Reset Failed"
-msgstr "Password Reset Failed"
+msgid "Anything sent over this connection could be monitored. Please check your application's configuration and use only encrypted protocols, such as SSL, if possible."
+msgstr ""
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 tried to reset Tor's control 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 "toolBar"
+msgstr ""
msgctxt "MainWindow"
-msgid "The currently installed version of Tor is out of date or no longer recommended."
-msgstr "The currently installed version of Tor is out of date or no longer recommended."
+msgid "Restart"
+msgstr ""
msgctxt "MainWindow"
-msgid "Would you like to check if a newer package is available for installation?"
-msgstr "Would you like to check if a newer package is available for installation?"
+msgid "Reload Tor's config"
+msgstr ""
msgctxt "MainWindow"
-msgid "Potentially Unsafe Connection"
-msgstr "Potentially Unsafe Connection"
+msgid "Actions"
+msgstr ""
msgctxt "MainWindow"
-msgid "Tor has automatically closed your connection in order to protect your anonymity."
-msgstr "Tor has automatically closed your connection in order to protect your anonymity."
+msgid "Bootstrapping torrc from %1 to %2"
+msgstr ""
msgctxt "MainWindow"
-msgid "Update Failed"
-msgstr "Update Failed"
+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 "Your software is up to date"
-msgstr "Your software is up to date"
+msgid "Error reloading configuration"
+msgstr ""
msgctxt "MainWindow"
-msgid "There are no new Tor software packages available for your computer at this time."
-msgstr "There are no new Tor software packages available for your computer at this time."
+msgid "Vidalia was unable to reload Tor's configuration."
+msgstr ""
msgctxt "MainWindow"
-msgid "Installation Failed"
-msgstr "Installation Failed"
+msgid "No dettached tabs"
+msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to install your software updates."
-msgstr "Vidalia was unable to install your software updates."
+msgid "Panic is enabled"
+msgstr ""
msgctxt "MainWindow"
-msgid "The following error occurred:"
-msgstr "The following error occurred:"
+msgid "<b>WARNING:</b> The Panic button is enabled. Use it carefully because it will remove Tor completely."
+msgstr ""
msgctxt "MainWindow"
-msgid "Anything sent over this connection could be monitored. Please check your application's configuration and use only encrypted protocols, such as SSL, if possible."
-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."
+msgid "New Circuit"
+msgstr ""
msgctxt "MainWindow"
-msgid "Bootstrapping torrc from %1 to %2"
-msgstr "Bootstrapping torrc from %1 to %2"
+msgid "Debug output"
+msgstr ""
msgctxt "MainWindow"
-msgid "(probably Telnet)"
-msgstr "(probably Telnet)"
+msgid "Panic!"
+msgstr ""
msgctxt "MainWindow"
-msgid "(probably an email client)"
-msgstr "(probably an email client)"
+msgid "Reattach tabs"
+msgstr ""
msgctxt "MainWindow"
-msgid "One of your applications %1 appears to be making a potentially unencrypted and unsafe connection to port %2."
-msgstr "One of your applications %1 appears to be making a potentially unencrypted and unsafe connection to port %2."
+msgid "Plugins"
+msgstr ""
msgctxt "MainWindow"
-msgid "failed (%1)"
+msgid "Your clock is wrong"
msgstr ""
msgctxt "MainWindow"
-msgid "Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+msgid "Your computer's clock is wrong, tor may not work as expected. Please check the Message Log for more information."
msgstr ""
msgctxt "MainWindow"
msgid "Vidalia can't find out how to talk to Tor because it can't access this file: %1\n"
"\n"
"Here's the last error message:\n"
-"%2"
+" %2"
msgstr ""
msgctxt "MainWindow"
@@ -2080,269 +2009,282 @@ msgid "Vidalia detected that the Tor software exited unexpectedly.\n"
"Please check the message log for recent warning or error messages."
msgstr ""
+msgctxt "MainWindow"
+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."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
+msgstr ""
+
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 "toolbar"
+msgstr ""
msgctxt "MessageLog"
msgid "Always Save New Log Messages"
@@ -2382,651 +2324,767 @@ msgid "Cannot write file %1\n"
msgstr ""
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 "NetViewer"
+msgid "<a href=\"server.offline\">Why is my relay offline?</a>"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "If your relay isn't listed among the others, it may be because it doesn't have a Running flag yet. <a href=\"server.consensus\">What's this?</a>"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Exit circuits"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Internal circuits"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Hidden Service circuits"
+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."
-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."
+msgstr ""
msgctxt "NetworkPage"
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."
+msgstr ""
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"
-msgstr "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 "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."
-msgstr "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 "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 / HTTPS"
-msgstr "HTTP / HTTPS"
+msgstr ""
msgctxt "NetworkPage"
msgid "You must specify one or more bridges."
msgstr ""
+msgctxt "PluginEngine"
+msgid "WARNING: %1 doesn't have an info file."
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "%1: Processing..."
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "%4: ERROR: Line: %1 - Column: %2\n"
+"%3"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "%1: Error opening file %2"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "%2: ERROR: Cannot open %1"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "%2: ERROR: Parsing %1"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "Line: %1 - Column: %2\n"
+"Message: %3"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "%1: Starting..."
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "%1: Stoping..."
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "%1: WARNING: doesn't have a GUI, and buildGUI() was called"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "%2:\n"
+"*** Exception in line %1"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "*** Backtrace:"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "(untitled)"
+msgstr ""
+
+msgctxt "PluginWrapper"
+msgid "Error: buildGUI() failed for plugin %1"
+msgstr ""
+
msgctxt "Policy"
msgid "accept"
-msgstr "accept"
+msgstr ""
msgctxt "Policy"
msgid "reject"
-msgstr "reject"
+msgstr ""
+
+msgctxt "QDialogButtonBox"
+msgid "OK"
+msgstr ""
+
+msgctxt "QObject"
+msgid "There were some settings that Vidalia wasn't able to apply together"
+msgstr ""
+
+msgctxt "QObject"
+msgid "Failed to set %1:\n"
+"Reason: %2"
+msgstr ""
+
+msgctxt "QObject"
+msgid "The failed options were saved in your torrc and will be applied when you restart."
+msgstr ""
+
+msgctxt "QObject"
+msgid "The failed options were NOT saved in your torrc and will be applied when you restart."
+msgstr ""
+
+msgctxt "QObject"
+msgid "Vidalia was unable to save the options to the torrc file."
+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."
-msgstr "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 "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 "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"
+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."
-msgstr "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 "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."
-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."
+msgstr ""
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?"
-msgstr "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 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 "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"
-msgstr "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 "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."
-msgstr "Leave your relay running so clients have a better chance of finding and using it."
+msgstr ""
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."
-msgstr "Tor returned an improperly formatted response when Vidalia requested your bridge's usage history."
+msgstr ""
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 for the Tor network (exit relay)"
+msgid "Relay traffic inside the Tor network (non-exit relay)"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic inside the Tor network (non-exit relay)"
+msgid "Relay traffic for the Tor network (exit relay)"
msgstr ""
msgctxt "ServerPage"
@@ -3038,593 +3096,605 @@ msgid "Email address at which you may be reached if there is a\n"
"problem with your relay. You might also include your PGP or GPG fingerprint."
msgstr ""
-msgctxt "ServicePage"
-msgid "Error while trying to unpublish all services"
-msgstr "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 "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"
-
-msgctxt "ServicePage"
-msgid "Please select a Service."
-msgstr "Please select a Service."
-
-msgctxt "ServicePage"
-msgid "Select Service Directory"
-msgstr "Select Service Directory"
-
-msgctxt "ServicePage"
-msgid "Virtual Port may only contain valid port numbers [1..65535]."
-msgstr "Virtual Port may only contain valid port numbers [1..65535]."
-
-msgctxt "ServicePage"
-msgid "Target may only contain address:port, address, or port."
-msgstr "Target may only contain address:port, address, or port."
+msgctxt "ServerPage"
+msgid "day"
+msgstr ""
-msgctxt "ServicePage"
-msgid "Directory already in use by another service."
-msgstr "Directory already in use by another service."
+msgctxt "ServerPage"
+msgid "week"
+msgstr ""
-msgctxt "ServicePage"
-msgid "Form"
-msgstr "Form"
+msgctxt "ServerPage"
+msgid "month"
+msgstr ""
-msgctxt "ServicePage"
-msgid "Provided Hidden Services"
-msgstr "Provided Hidden Services"
+msgctxt "ServerPage"
+msgid "Enable accounting"
+msgstr ""
-msgctxt "ServicePage"
-msgid "Onion Address"
-msgstr "Onion Address"
+msgctxt "ServerPage"
+msgid "h:mm"
+msgstr ""
-msgctxt "ServicePage"
-msgid "Virtual Port"
-msgstr "Virtual Port"
+msgctxt "ServerPage"
+msgid "at"
+msgstr ""
-msgctxt "ServicePage"
-msgid "Target"
-msgstr "Target"
+msgctxt "ServerPage"
+msgid "per"
+msgstr ""
-msgctxt "ServicePage"
-msgid "Directory Path"
-msgstr "Directory Path"
+msgctxt "ServerPage"
+msgid "bytes"
+msgstr ""
-msgctxt "ServicePage"
-msgid "Enabled"
-msgstr "Enabled"
+msgctxt "ServerPage"
+msgid "KB"
+msgstr ""
-msgctxt "ServicePage"
-msgid "Add new service to list"
-msgstr "Add new service to list"
+msgctxt "ServerPage"
+msgid "MB"
+msgstr ""
-msgctxt "ServicePage"
-msgid "Remove selected service from list"
-msgstr "Remove selected service from list"
+msgctxt "ServerPage"
+msgid "GB"
+msgstr ""
-msgctxt "ServicePage"
-msgid "Copy onion address of selected service to clipboard"
-msgstr "Copy onion address of selected service to clipboard"
+msgctxt "ServerPage"
+msgid "TB"
+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"
+msgctxt "ServerPage"
+msgid "Push no more than"
+msgstr ""
-msgctxt "ServicePage"
-msgid "Created by Tor"
-msgstr "Created by Tor"
+msgctxt "ServerPage"
+msgid "time"
+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."
-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."
+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 "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 "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 "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."
-msgstr "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 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 "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 "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 "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 "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 "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 "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 "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 "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 "Unknown SOCKS Protocol"
+msgstr ""
msgctxt "StatusEventWidget"
msgid "One of your applications tried to establish a connection through Tor using a protocol that Tor does not understand. Please ensure you configure your applications to use only SOCKS4a or SOCKS5 with remote hostname resolution."
-msgstr "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 "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 "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 "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 "Tor has determined your relay's public IP address is currently %1%2. If that is not correct, please consider setting the 'Address' option in your relay's configuration."
+msgstr ""
msgctxt "StatusEventWidget"
msgid "DNS Hijacking Detected"
-msgstr "DNS 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 "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 "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 "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 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 "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."
-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."
+msgstr ""
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."
-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."
+msgstr ""
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."
-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."
+msgstr ""
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"
-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"
+msgstr ""
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!"
-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!"
+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 "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 "TorControl"
+msgid "Start failed: %1"
+msgstr ""
+
+msgctxt "TorControl"
+msgid "Process finished: ExitCode=%1"
+msgstr ""
+
+msgctxt "TorControl"
+msgid "Connection failed: %1"
+msgstr ""
+
+msgctxt "TorControl"
+msgid "Disconnected"
+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"
-
-msgctxt "TorrcDialog"
-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."
+msgstr ""
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"
+msgid "Error"
+msgstr ""
msgctxt "TorrcDialog"
-msgid "Apply selection only"
-msgstr "Apply selection only"
+msgid "An error ocurred while opening torrc file"
+msgstr ""
msgctxt "TorrcDialog"
-msgid "Error connecting to Tor"
-msgstr "Error connecting to Tor"
+msgid "Ctrl+X"
+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\""
+msgid "Ctrl+C"
+msgstr ""
msgctxt "TorrcDialog"
-msgid "Error at line %1: \"%2\""
-msgstr "Error at line %1: \"%2\""
+msgid "Ctrl+V"
+msgstr ""
msgctxt "TorrcDialog"
-msgid "Error"
-msgstr "Error"
+msgid "Ctrl+Z"
+msgstr ""
msgctxt "TorrcDialog"
-msgid "An error ocurred while opening torrc file"
-msgstr "An error ocurred while opening torrc file"
+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'."
-msgstr "Vidalia was unable to check for available software updates because it could not find '%1'."
+msgstr ""
msgctxt "UpdateProcess"
msgid "Vidalia was unable to check for available software updates because Tor's update process exited unexpectedly."
-msgstr "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 "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 "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"
+msgstr ""
msgctxt "Vidalia"
msgid "Value required for parameter :"
-msgstr "Value required for parameter :"
+msgstr ""
msgctxt "Vidalia"
msgid "Invalid language code specified:"
@@ -3646,23 +3716,23 @@ msgstr ""
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"
diff --git a/src/vidalia/i18n/po/tg/qt_tg.po b/src/vidalia/i18n/po/tg/qt_tg.po
index bc1f157..d75b2fa 100644
--- a/src/vidalia/i18n/po/tg/qt_tg.po
+++ b/src/vidalia/i18n/po/tg/qt_tg.po
@@ -1,11 +1,10 @@
#
-# Translators:
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-08-20 03:25+0000\n"
-"PO-Revision-Date: 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"
@@ -431,5 +430,3 @@ msgstr ""
msgctxt "QFileSystemModel"
msgid "%1 bytes"
msgstr ""
-
-
diff --git a/src/vidalia/i18n/po/tg/vidalia_tg.po b/src/vidalia/i18n/po/tg/vidalia_tg.po
index 09526d2..041d2e1 100644
--- a/src/vidalia/i18n/po/tg/vidalia_tg.po
+++ b/src/vidalia/i18n/po/tg/vidalia_tg.po
@@ -1,11 +1,10 @@
#
-# Translators:
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-09-07 14:40+0000\n"
-"PO-Revision-Date: 2010-12-05 20:03+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"
@@ -193,10 +192,6 @@ 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"
@@ -236,10 +231,6 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr ""
-
-msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -279,6 +270,10 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr ""
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -432,17 +427,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"
@@ -1266,44 +1270,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"
@@ -1331,10 +1342,6 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr ""
-
-msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1362,6 +1369,10 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr ""
+
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1644,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 ""
@@ -1680,10 +1663,6 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1796,10 +1775,6 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1882,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 ""
@@ -1934,82 +1897,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 ""
@@ -2057,19 +1949,39 @@ 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)"
+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"
@@ -2091,17 +2003,35 @@ msgid ""
msgstr ""
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"
@@ -2357,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"
@@ -2412,10 +2334,6 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2515,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 ""
@@ -2840,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 ""
@@ -3088,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 ""
@@ -3132,10 +3070,6 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
-msgid "Form"
-msgstr ""
-
-msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3424,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 ""
@@ -3460,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 ""
@@ -3538,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 ""
@@ -3666,6 +3646,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 ""
@@ -3759,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 ""
@@ -3812,5 +3796,3 @@ msgstr ""
msgctxt "stringutil.h"
msgid "%1 mins"
msgstr ""
-
-
diff --git a/src/vidalia/i18n/po/th/qt_th.po b/src/vidalia/i18n/po/th/qt_th.po
index 1bb0941..40bb480 100644
--- a/src/vidalia/i18n/po/th/qt_th.po
+++ b/src/vidalia/i18n/po/th/qt_th.po
@@ -1,11 +1,10 @@
#
-# Translators:
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-08-20 03:25+0000\n"
-"PO-Revision-Date: 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"
@@ -431,5 +430,3 @@ msgstr ""
msgctxt "QFileSystemModel"
msgid "%1 bytes"
msgstr ""
-
-
diff --git a/src/vidalia/i18n/po/th/vidalia_th.po b/src/vidalia/i18n/po/th/vidalia_th.po
index 921466a..26c9c8b 100644
--- a/src/vidalia/i18n/po/th/vidalia_th.po
+++ b/src/vidalia/i18n/po/th/vidalia_th.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: 2012-03-21 17:52+0000\n"
-"PO-Revision-Date: 2012-03-22 08:51+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,17 +194,6 @@ msgid "Select a file to use for Tor socket path"
msgstr ""
msgctxt "AdvancedPage"
-msgid "Configure ControlPort automatically"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid ""
-"You've checked the autoconfiguration option for the ControlPort, but "
-"provided no Data Directory. Please add one, or uncheck the \"Configure "
-"ControlPort automatically\" option."
-msgstr ""
-
-msgctxt "AdvancedPage"
msgid ""
"Vidalia was unable to remove the Tor service.\n"
"\n"
@@ -231,23 +220,6 @@ msgctxt "AppearancePage"
msgid "Vidalia was unable to load the selected language translation."
msgstr "Vidalia ไม่สามารถดึงภาษาที่เลือกขึ้นมาใช้ได้"
-msgctxt "AppearancePage"
-msgid ""
-"System Icon Preferences (changes will take effect when you restart Vidalia)"
-msgstr ""
-
-msgctxt "AppearancePage"
-msgid "Show the Tray Icon and Dock Icon (default)"
-msgstr ""
-
-msgctxt "AppearancePage"
-msgid "Hide the Tray Icon"
-msgstr ""
-
-msgctxt "AppearancePage"
-msgid "Hide the Dock Icon"
-msgstr ""
-
msgctxt "BandwidthGraph"
msgid "Since:"
msgstr "ตั้งแต่:"
@@ -261,10 +233,6 @@ msgid "Show Settings"
msgstr "แสดง ส่วนตั้งค่า"
msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr "การใช้ Bandwidth ของ Tor"
-
-msgctxt "BandwidthGraph"
msgid "Reset"
msgstr "ล้างทิ้ง"
@@ -304,6 +272,10 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr "ยกเลิก"
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr ""
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -457,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 ""
-"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"
@@ -1291,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"
@@ -1356,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"
@@ -1387,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"
@@ -1669,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"
@@ -1705,10 +1665,6 @@ msgid "View"
msgstr "มองดู"
msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr "ส่วนช่วยเหลือ Vidalia"
-
-msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr "ผิดพลาดในการสั่งเริ่มโปรแกรมท่องอินเตอร์เน็ต(web browser)"
@@ -1773,6 +1729,10 @@ msgid "Connected to the Tor network!"
msgstr "เชื่อมต่อสู่เครือข่าย Tor เรียบร้อย!"
msgctxt "MainWindow"
+msgid "Unrecognized startup status"
+msgstr "สถานะเริ่มต้นที่ไม่รู้จัก"
+
+msgctxt "MainWindow"
msgid "miscellaneous"
msgstr "เบ็ดเตล็ด"
@@ -1817,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"
@@ -1903,18 +1859,6 @@ msgid ""
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 ควบคุมของคุณ"
-
-msgctxt "MainWindow"
msgid "Tor Update Available"
msgstr "มีโปรแกรม Tor รุ่นใหม่กว่าที่ใช้อยู่ปัจจุบัน"
@@ -1955,82 +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 ""
@@ -2078,66 +1951,89 @@ 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 "Bootstrapping torrc from %1 to %2"
+msgid "toolBar"
msgstr ""
msgctxt "MainWindow"
-msgid "(probably Telnet)"
+msgid "Start"
msgstr ""
msgctxt "MainWindow"
-msgid "(probably an email client)"
+msgid "Stop"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"One of your applications %1 appears to be making a potentially unencrypted "
-"and unsafe connection to port %2."
+msgid "Restart"
msgstr ""
msgctxt "MainWindow"
-msgid "failed (%1)"
+msgid "Reload Tor's config"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+msgid "Actions"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Bootstrapping torrc from %1 to %2"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia can't find out how to talk to Tor because it can't access this file: %1\n"
+"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
"\n"
-"Here's the last error message:\n"
-"%2"
+"Would you like to shutdown gracefully and give clients time to find a new relay?"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"It seems Tor has stopped running since Vidalia started it.\n"
+"Vidalia detected that the Tor software exited unexpectedly.\n"
"\n"
-"See the Advanced Message Log for more information."
+"Please check the message log for recent warning or error messages."
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?"
+"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 ""
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 "Error reloading configuration"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to reload Tor's configuration."
msgstr ""
msgctxt "MessageLog"
@@ -2393,22 +2289,14 @@ msgid "Automatically save new log messages to a file"
msgstr "จัดเก็บ ข้อความสิ่งที่เพิ่งทำไปใหม่ๆ ลงไฟล์โดยอัตโนมัติ"
msgctxt "MessageLog"
-msgid "Basic"
-msgstr ""
+msgid "Always Save New Log Messages"
+msgstr "จัดเก็บข้อความสิ่งที่เพิ่งทำไปใหม่ๆเสมอ"
msgctxt "MessageLog"
-msgid "Tor Status"
+msgid "toolbar"
msgstr ""
msgctxt "MessageLog"
-msgid "Advanced"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
-msgstr "จัดเก็บข้อความสิ่งที่เพิ่งทำไปใหม่ๆเสมอ"
-
-msgctxt "MessageLog"
msgid ""
"Messages that appear when something has \n"
"gone very wrong and Tor cannot proceed."
@@ -2448,10 +2336,6 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr "แผนที่เครือข่าย Tor"
-
-msgctxt "NetViewer"
msgid "Refresh"
msgstr "แสดงใหม่"
@@ -2551,6 +2435,30 @@ 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 ไม่ถูกต้อง "
+
+msgctxt "NetworkPage"
+msgid "The specified bridge identifier is not valid."
+msgstr "ค่า Bridge ที่ระบุ ไม่ถูกต้อง"
+
msgctxt "NetworkPage"
msgid "Copy (Ctrl+C)"
msgstr "คัดลอก (Ctrl+C)"
@@ -2684,11 +2592,11 @@ msgid "SOCKS 5"
msgstr ""
msgctxt "NetworkPage"
-msgid "HTTP / HTTPS"
+msgid "HTTP"
msgstr ""
msgctxt "NetworkPage"
-msgid "You must specify one or more bridges."
+msgid "HTTP / HTTPS"
msgstr ""
msgctxt "Policy"
@@ -3112,11 +3020,11 @@ msgid "Automatically distribute my bridge address"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network (exit relay)"
+msgid "Relay traffic inside the Tor network (non-exit relay)"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic inside the Tor network (non-exit relay)"
+msgid "Relay traffic for the Tor network (exit relay)"
msgstr ""
msgctxt "ServerPage"
@@ -3164,10 +3072,6 @@ msgid "Directory already in use by another service."
msgstr "ที่จัดเก็บนี้มีบริการอื่นใช้อยู่แล้ว"
msgctxt "ServicePage"
-msgid "Form"
-msgstr "แบบฟอร์ม"
-
-msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr "การให้บริการแบบซ่อนตัวตน"
@@ -3456,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 "สร้างใหม่"
@@ -3492,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]"
@@ -3570,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 "สำเร็จ"
@@ -3698,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 "ตกลง"
@@ -3791,10 +3749,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 ""
diff --git a/src/vidalia/i18n/po/ti/qt_ti.po b/src/vidalia/i18n/po/ti/qt_ti.po
index 19c9aa9..5405d06 100644
--- a/src/vidalia/i18n/po/ti/qt_ti.po
+++ b/src/vidalia/i18n/po/ti/qt_ti.po
@@ -1,11 +1,10 @@
#
-# Translators:
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-08-20 03:25+0000\n"
-"PO-Revision-Date: 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"
@@ -431,5 +430,3 @@ msgstr ""
msgctxt "QFileSystemModel"
msgid "%1 bytes"
msgstr ""
-
-
diff --git a/src/vidalia/i18n/po/ti/vidalia_ti.po b/src/vidalia/i18n/po/ti/vidalia_ti.po
index 3b8ded0..6528cb1 100644
--- a/src/vidalia/i18n/po/ti/vidalia_ti.po
+++ b/src/vidalia/i18n/po/ti/vidalia_ti.po
@@ -1,11 +1,10 @@
#
-# Translators:
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-09-07 14:40+0000\n"
-"PO-Revision-Date: 2010-12-05 20:03+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"
@@ -193,10 +192,6 @@ 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"
@@ -236,10 +231,6 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr ""
-
-msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -279,6 +270,10 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr ""
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -432,17 +427,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"
@@ -1266,44 +1270,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"
@@ -1331,10 +1342,6 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr ""
-
-msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1362,6 +1369,10 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr ""
+
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1644,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 ""
@@ -1680,10 +1663,6 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1796,10 +1775,6 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1882,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 ""
@@ -1934,82 +1897,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 ""
@@ -2057,19 +1949,39 @@ 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)"
+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"
@@ -2091,17 +2003,35 @@ msgid ""
msgstr ""
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"
@@ -2357,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"
@@ -2412,10 +2334,6 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2515,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 ""
@@ -2840,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 ""
@@ -3088,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 ""
@@ -3132,10 +3070,6 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
-msgid "Form"
-msgstr ""
-
-msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3424,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 ""
@@ -3460,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 ""
@@ -3538,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 ""
@@ -3666,6 +3646,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 ""
@@ -3759,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 ""
@@ -3812,5 +3796,3 @@ msgstr ""
msgctxt "stringutil.h"
msgid "%1 mins"
msgstr ""
-
-
diff --git a/src/vidalia/i18n/po/tk/qt_tk.po b/src/vidalia/i18n/po/tk/qt_tk.po
index edcd75c..2f82848 100644
--- a/src/vidalia/i18n/po/tk/qt_tk.po
+++ b/src/vidalia/i18n/po/tk/qt_tk.po
@@ -1,11 +1,10 @@
#
-# Translators:
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-08-20 03:25+0000\n"
-"PO-Revision-Date: 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"
@@ -431,5 +430,3 @@ msgstr ""
msgctxt "QFileSystemModel"
msgid "%1 bytes"
msgstr ""
-
-
diff --git a/src/vidalia/i18n/po/tk/vidalia_tk.po b/src/vidalia/i18n/po/tk/vidalia_tk.po
index 9707d96..4c3059b 100644
--- a/src/vidalia/i18n/po/tk/vidalia_tk.po
+++ b/src/vidalia/i18n/po/tk/vidalia_tk.po
@@ -1,11 +1,10 @@
#
-# Translators:
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-09-07 14:40+0000\n"
-"PO-Revision-Date: 2010-12-05 20:03+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"
@@ -193,10 +192,6 @@ 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"
@@ -236,10 +231,6 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr ""
-
-msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -279,6 +270,10 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr ""
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -432,17 +427,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"
@@ -1266,44 +1270,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"
@@ -1331,10 +1342,6 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr ""
-
-msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1362,6 +1369,10 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr ""
+
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1644,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 ""
@@ -1680,10 +1663,6 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1796,10 +1775,6 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1882,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 ""
@@ -1934,82 +1897,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 ""
@@ -2057,19 +1949,39 @@ 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)"
+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"
@@ -2091,17 +2003,35 @@ msgid ""
msgstr ""
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"
@@ -2357,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"
@@ -2412,10 +2334,6 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2515,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 ""
@@ -2840,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 ""
@@ -3088,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 ""
@@ -3132,10 +3070,6 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
-msgid "Form"
-msgstr ""
-
-msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3424,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 ""
@@ -3460,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 ""
@@ -3538,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 ""
@@ -3666,6 +3646,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 ""
@@ -3759,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 ""
@@ -3812,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 8f71cc8..1a4d18e 100644
--- a/src/vidalia/i18n/po/tr/qt_tr.po
+++ b/src/vidalia/i18n/po/tr/qt_tr.po
@@ -1,14 +1,11 @@
-# Translators:
-# Translators:
-# Deniz <>, 2012.
-# runasand <runa.sandvik at gmail.com>, 2011.
+#
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-08-20 03:25+0000\n"
-"PO-Revision-Date: 2012-02-14 09:47+0000\n"
-"Last-Translator: Deniz <>\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"
@@ -90,17 +87,17 @@ msgstr "Kaydetme"
#: qdialogbuttonbox.cpp:554
msgctxt "QDialogButtonBox"
msgid "Discard"
-msgstr "Iptal"
+msgstr "Kaydetme"
#: qdialogbuttonbox.cpp:557
msgctxt "QDialogButtonBox"
msgid "&Yes"
-msgstr "&Evet"
+msgstr "Evet"
#: qdialogbuttonbox.cpp:560
msgctxt "QDialogButtonBox"
msgid "Yes to &All"
-msgstr "&Tümüne evet"
+msgstr "Tümüne evet"
#: qdialogbuttonbox.cpp:563
msgctxt "QDialogButtonBox"
@@ -110,7 +107,7 @@ msgstr "Hayır"
#: qdialogbuttonbox.cpp:566
msgctxt "QDialogButtonBox"
msgid "N&o to All"
-msgstr "Tümüne h&ayır"
+msgstr "Tümüne hayır"
#: qdialogbuttonbox.cpp:569
msgctxt "QDialogButtonBox"
@@ -180,7 +177,7 @@ msgstr "Tüm Dosyalar"
#: qfiledialog.cpp:881
msgctxt "QFileDialog"
msgid "Directories"
-msgstr "Dizinler"
+msgstr "Klasörler"
#: qfiledialog.cpp:2408
msgctxt "QFileDialog"
@@ -202,7 +199,9 @@ msgctxt "QFileDialog"
msgid ""
"%1 already exists.\n"
"Do you want to replace it?"
-msgstr "%1 Belirtilen dosya zaten var.\nDeğiştirmek ister misiniz?"
+msgstr ""
+"%1 Belirtilen dosya zaten var.\n"
+"Değiştirmek ister misiniz?"
#: qfiledialog.cpp:1690
msgctxt "QFileDialog"
@@ -210,7 +209,10 @@ msgid ""
"%1\n"
"File not found.\n"
"Please verify the correct file name was given."
-msgstr "%1\nDosya bulunamadı. \nLütfen dosya adından emin olup tekrar deneyin."
+msgstr ""
+"%1\n"
+"Dosya bulunamadı. \n"
+"Lütfen dosya adından emin olup tekrar deneyin."
#: qdirmodel.cpp:833
msgctxt "QFileDialog"
@@ -268,14 +270,19 @@ msgid ""
"%1\n"
"Directory not found.\n"
"Please verify the correct directory name was given."
-msgstr "%1\nKlasör bulunamadı.\n Lütfen Klasör adından emin olarak tekrar deneyiniz."
+msgstr ""
+"%1\n"
+"Klasör bulunamadı.\n"
+" Lütfen Klasör adından emin olarak tekrar deneyiniz."
#: qfiledialog.cpp:2281
msgctxt "QFileDialog"
msgid ""
"'%1' is write protected.\n"
"Do you want to delete it anyway?"
-msgstr "%1 yazmaya karşı korumalı.\nYine de silmek ister misiniz?"
+msgstr ""
+"%1 yazmaya karşı korumalı.\n"
+"Yine de silmek ister misiniz?"
#: qfiledialog.cpp:2286
msgctxt "QFileDialog"
@@ -315,7 +322,7 @@ msgstr "Bilinmiyor"
#: qfiledialog.cpp:439
msgctxt "QFileDialog"
msgid "Find Directory"
-msgstr "Dizin bul"
+msgstr "Klasör bul"
#: qfiledialog.cpp:458
msgctxt "QFileDialog"
@@ -335,12 +342,12 @@ msgstr "Yeni klasör"
#: qfiledialog.cpp:465
msgctxt "QFileDialog"
msgid "&New Folder"
-msgstr "&Yeni klasör"
+msgstr "Yeni klasör"
#: qfiledialog.cpp:917
msgctxt "QFileDialog"
msgid "&Choose"
-msgstr "&Seç"
+msgstr "seç"
#: qsidebar.cpp:388
msgctxt "QFileDialog"
@@ -372,7 +379,9 @@ msgctxt "QFileSystemModel"
msgid ""
"<b>The name \"%1\" can not be used.</b><p>Try using another name, with fewer"
" characters or no punctuations marks."
-msgstr "<b>\"%1\" ismi kullanılamıyor.</b><p> Lütfen başka bir ismi biraz daha az karakterle veya yazım işareti kullanmadan deneyin."
+msgstr ""
+"<b>\"%1\" ismi kullanılamıyor.</b><p> Lütfen başka bir ismi biraz daha az "
+"karakterle veya yazım işareti kullanmadan deneyin."
#: qfilesystemmodel.cpp:832
msgctxt "QFileSystemModel"
diff --git a/src/vidalia/i18n/po/tr/vidalia_tr.po b/src/vidalia/i18n/po/tr/vidalia_tr.po
index 3d1d0ae..764dd12 100644
--- a/src/vidalia/i18n/po/tr/vidalia_tr.po
+++ b/src/vidalia/i18n/po/tr/vidalia_tr.po
@@ -1,17 +1,13 @@
#
# Translators:
-# Caglar Ulkuderner <caglar at ulkuderner.net>, 2012.
-# <cannuhlar at hotmail.com>, 2012.
-# Deniz <>, 2012.
# runasand <runa.sandvik at gmail.com>, 2011.
-# <zahmetr at gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2012-03-21 17:52+0000\n"
-"PO-Revision-Date: 2012-04-08 19:44+0000\n"
-"Last-Translator: ZahMeTR <zahmetr at gmail.com>\n"
+"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"
@@ -47,7 +43,7 @@ msgstr "'%1' geçerli bir IP adresi değil."
msgctxt "AdvancedPage"
msgid ""
"You selected 'Password' authentication, but did not specify a password."
-msgstr "Parola ile kimlik doğrulamayı seçtiniz ama bir parola girmediniz."
+msgstr "Parola ile kimlik kanıtlamayı seçtiniz ama bir parola girmediniz."
msgctxt "AdvancedPage"
msgid "Select Tor Configuration File"
@@ -107,7 +103,7 @@ msgstr "Parola"
msgctxt "AdvancedPage"
msgid "Randomly Generate"
-msgstr "Rastgele Uret"
+msgstr "Rastgele Seç"
msgctxt "AdvancedPage"
msgid ":"
@@ -123,7 +119,7 @@ msgstr "Tor'u, belirtilen yapılandırma dosyası (torrc) ile çalıştır"
msgctxt "AdvancedPage"
msgid "Select path to your configuration file"
-msgstr "Yapılandırma dosyasının konumun seç"
+msgstr "Yapılandırma dosyasının için klasör seç"
msgctxt "AdvancedPage"
msgid "Browse"
@@ -131,7 +127,7 @@ msgstr "Gözat"
msgctxt "AdvancedPage"
msgid "Data Directory"
-msgstr "Veri Klasörü"
+msgstr "Kayıt Klasörü"
msgctxt "AdvancedPage"
msgid "Store data for the Tor software in the following directory"
@@ -143,69 +139,58 @@ msgstr "Tor için kullanılacak kayıt klasörünü seç"
msgctxt "AdvancedPage"
msgid "Tor Control"
-msgstr "Tor Kontrolü"
+msgstr ""
msgctxt "AdvancedPage"
msgid "Use TCP connection (ControlPort)"
-msgstr "TCP bağlantısı kullan (ControlPort)"
+msgstr ""
msgctxt "AdvancedPage"
msgid "Path:"
-msgstr "Konum:"
+msgstr ""
msgctxt "AdvancedPage"
msgid "Use Unix domain socket (ControlSocket)"
-msgstr "Unix alanadı soketi kullan (Kontrol Soketi)"
+msgstr ""
msgctxt "AdvancedPage"
msgid "Edit current torrc"
-msgstr "Mevcut torrc'yi düzenle"
+msgstr ""
msgctxt "AdvancedPage"
msgid "NOTE: this will edit the currently loaded torrc"
-msgstr "Not: bu ayar şuan kullanılan torrc'yi düzenler."
+msgstr ""
msgctxt "AdvancedPage"
msgid "ControlSocket path doesn't exist."
-msgstr "ControlSocket konumu bulunmuyor"
+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 "Belirtilen Tor ayar dosyası, şu anda kullandığınız 8-bit karakter kodlamasıyla gösterilemeyen karakterler içermektedir."
+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 "Belirtilen Tor veri dizini, şu anda kullandığınız 8-bit karakter kodlamasıyla gösterilemeyen karakterler içermektedir."
+msgstr ""
msgctxt "AdvancedPage"
msgid "Warning"
-msgstr "Uyarı"
+msgstr ""
msgctxt "AdvancedPage"
msgid "You changed torrc path, would you like to restart Tor?"
-msgstr "torrc konumunu değiştirdiniz, Tor'u yeniden başlatmak ister misiniz?"
+msgstr ""
msgctxt "AdvancedPage"
msgid "Tor Configuration File (torrc);;All Files (*)"
-msgstr "Tor Ayar Dosyası (torrc);; Bütün Dosyalar (*)"
+msgstr ""
msgctxt "AdvancedPage"
msgid "Select a file to use for Tor socket path"
-msgstr "Tor soket konumu için bir dosya seçin"
-
-msgctxt "AdvancedPage"
-msgid "Configure ControlPort automatically"
-msgstr "ControlPort u otomatik ayarla"
-
-msgctxt "AdvancedPage"
-msgid ""
-"You've checked the autoconfiguration option for the ControlPort, but "
-"provided no Data Directory. Please add one, or uncheck the \"Configure "
-"ControlPort automatically\" option."
msgstr ""
msgctxt "AdvancedPage"
@@ -235,23 +220,6 @@ msgctxt "AppearancePage"
msgid "Vidalia was unable to load the selected language translation."
msgstr "Vidalia seçmiş olduğunuz dili yükleyemiyor."
-msgctxt "AppearancePage"
-msgid ""
-"System Icon Preferences (changes will take effect when you restart Vidalia)"
-msgstr "Sistem Simgesi Ayarları (Vidalia'yı yeniden başlatmanız gerekir)"
-
-msgctxt "AppearancePage"
-msgid "Show the Tray Icon and Dock Icon (default)"
-msgstr "TrayIcon ve DockIcon göster (Varsayılan)"
-
-msgctxt "AppearancePage"
-msgid "Hide the Tray Icon"
-msgstr "TrayIcon gizle"
-
-msgctxt "AppearancePage"
-msgid "Hide the Dock Icon"
-msgstr "DockIcon u gizle"
-
msgctxt "BandwidthGraph"
msgid "Since:"
msgstr "Başlangıç:"
@@ -265,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"
@@ -298,7 +262,7 @@ msgstr "100"
msgctxt "BandwidthGraph"
msgid "% Opaque"
-msgstr "% Mat"
+msgstr "% Saydam"
msgctxt "BandwidthGraph"
msgid "Save"
@@ -308,9 +272,13 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr "İptal"
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr ""
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
-msgstr "HTTPS köprü isteğini başlatıyor..."
+msgstr "HTTPS isteğini başlatıyor..."
msgctxt "BridgeDownloader"
msgid "Connecting to %1:%2..."
@@ -318,7 +286,7 @@ msgstr "Bağlanıyor %1:%2..."
msgctxt "BridgeDownloader"
msgid "Sending an HTTPS request for bridges..."
-msgstr "Köprüler için HTTPS isteğini gönderiyor..."
+msgstr "HTTPS başlatma isteğini gönderiyor..."
msgctxt "BridgeDownloader"
msgid "Downloading a list of bridges..."
@@ -346,7 +314,7 @@ msgstr "# Kullanıcılar"
msgctxt "BridgeUsageDialog"
msgid "Clients from the following countries have used your relay since %1"
-msgstr "%1 tarihinden beri belirlenen ülkelerden sizin köprünüzü kullanan kullanıcılar"
+msgstr "%1 tarihinden beri belirlenen ülkelerden sizi kullanan kullanıcılar"
msgctxt "BridgeUsageDialog"
msgid "Bridge Usage Summary"
@@ -461,18 +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:"
-msgstr "Vidalia parola gerektiren bir Tor sürecine bağlandı. Lütfen kontrol parolasını giriniz:"
+"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"
msgid "Control socket is not connected."
@@ -516,19 +493,19 @@ msgstr "Ermenistan"
msgctxt "CountryInfo"
msgid "Australia"
-msgstr "Avustralya"
+msgstr "Australia"
msgctxt "CountryInfo"
msgid "Azerbaijan"
-msgstr "Azerbaycan"
+msgstr "Azerbaijan"
msgctxt "CountryInfo"
msgid "Bahamas"
-msgstr "Bahamalar"
+msgstr "Bahamas"
msgctxt "CountryInfo"
msgid "Bangladesh"
-msgstr "Bengaldeş"
+msgstr "Bangladesh"
msgctxt "CountryInfo"
msgid "Barbados"
@@ -536,11 +513,11 @@ msgstr "Barbados"
msgctxt "CountryInfo"
msgid "Belarus"
-msgstr "Beyaz Rusya"
+msgstr "Belarus"
msgctxt "CountryInfo"
msgid "Belgium"
-msgstr "Belçika"
+msgstr "Belgium"
msgctxt "CountryInfo"
msgid "Belize"
@@ -552,19 +529,19 @@ msgstr "Bhutan"
msgctxt "CountryInfo"
msgid "Bolivia"
-msgstr "Bolivya"
+msgstr "Bolivia"
msgctxt "CountryInfo"
msgid "Bosnia & Herzegovina"
-msgstr "Bosna-Hersek"
+msgstr "Bosnia & Herzegovina"
msgctxt "CountryInfo"
msgid "Botswana"
-msgstr "Botsvana"
+msgstr "Botswana"
msgctxt "CountryInfo"
msgid "Brazil"
-msgstr "Brezilya"
+msgstr "Brazil"
msgctxt "CountryInfo"
msgid "Brunei Darussalam"
@@ -572,7 +549,7 @@ msgstr "Brunei Darussalam"
msgctxt "CountryInfo"
msgid "Bulgaria"
-msgstr "Bulgaristan"
+msgstr "Bulgaria"
msgctxt "CountryInfo"
msgid "Burkina Faso"
@@ -584,27 +561,27 @@ msgstr "Burundi"
msgctxt "CountryInfo"
msgid "Cambodia"
-msgstr "Kamboçya"
+msgstr "Cambodia"
msgctxt "CountryInfo"
msgid "Cameroon"
-msgstr "Kamerun"
+msgstr "Cameroon"
msgctxt "CountryInfo"
msgid "Canada"
-msgstr "Kanada"
+msgstr "Canada"
msgctxt "CountryInfo"
msgid "Cape Verde"
-msgstr "Yeşil Burun Adaları"
+msgstr "Cape Verde"
msgctxt "CountryInfo"
msgid "Central African Republic"
-msgstr "Orta Afrika Cumhuriyeti"
+msgstr "Central African Republic"
msgctxt "CountryInfo"
msgid "Chad"
-msgstr "Çad"
+msgstr "Chad"
msgctxt "CountryInfo"
msgid "Chile"
@@ -612,7 +589,7 @@ msgstr "Chile"
msgctxt "CountryInfo"
msgid "China"
-msgstr "Şili"
+msgstr "China"
msgctxt "CountryInfo"
msgid "Colombia"
@@ -620,63 +597,63 @@ msgstr "Colombia"
msgctxt "CountryInfo"
msgid "Comoros"
-msgstr "Kolombiya"
+msgstr "Comoros"
msgctxt "CountryInfo"
msgid "Congo, The Democratic Republic of the"
-msgstr "Demokratik Kongo Cumhuriyeti"
+msgstr "Congo, The Democratic Republic of the"
msgctxt "CountryInfo"
msgid "Congo"
-msgstr "Kongo"
+msgstr "Congo"
msgctxt "CountryInfo"
msgid "Costa Rica"
-msgstr "Kosta Rika"
+msgstr "Costa Rica"
msgctxt "CountryInfo"
msgid "Cote d’Ivoire"
-msgstr "Fildişi Sahilleri"
+msgstr "Cote d’Ivoire"
msgctxt "CountryInfo"
msgid "Croatia"
-msgstr "Hırvatistan"
+msgstr "Croatia"
msgctxt "CountryInfo"
msgid "Cuba"
-msgstr "Küba"
+msgstr "Cuba"
msgctxt "CountryInfo"
msgid "Cyprus"
-msgstr "Kıbrıs"
+msgstr "Cyprus"
msgctxt "CountryInfo"
msgid "Czech Republic"
-msgstr "Çek Cumhuriyeti"
+msgstr "Czech Republic"
msgctxt "CountryInfo"
msgid "Denmark"
-msgstr "Danimarka"
+msgstr "Denmark"
msgctxt "CountryInfo"
msgid "Djibouti"
-msgstr "Cibuti"
+msgstr "Djibouti"
msgctxt "CountryInfo"
msgid "Dominica"
-msgstr "Dominika"
+msgstr "Dominica"
msgctxt "CountryInfo"
msgid "Dominican Republic"
-msgstr "Dominik Cumhuriyeti"
+msgstr "Dominican Republic"
msgctxt "CountryInfo"
msgid "Ecuador"
-msgstr "Ekvador"
+msgstr "Ecuador"
msgctxt "CountryInfo"
msgid "Egypt"
-msgstr "Mısır"
+msgstr "Egypt"
msgctxt "CountryInfo"
msgid "El Salvador"
@@ -684,19 +661,19 @@ msgstr "El Salvador"
msgctxt "CountryInfo"
msgid "Equatorial Guinea"
-msgstr "Ekvatoryal Gine"
+msgstr "Equatorial Guinea"
msgctxt "CountryInfo"
msgid "Eritrea"
-msgstr "Eritre"
+msgstr "Eritrea"
msgctxt "CountryInfo"
msgid "Estonia"
-msgstr "Estonya"
+msgstr "Estonia"
msgctxt "CountryInfo"
msgid "France"
-msgstr "Fransa"
+msgstr "France"
msgctxt "CountryInfo"
msgid "Gabon"
@@ -704,19 +681,19 @@ msgstr "Gabon"
msgctxt "CountryInfo"
msgid "Gambia"
-msgstr "Gambiya"
+msgstr "Gambia"
msgctxt "CountryInfo"
msgid "Georgia"
-msgstr "Gürcistan"
+msgstr "Georgia"
msgctxt "CountryInfo"
msgid "Germany"
-msgstr "Almanya"
+msgstr "Germany"
msgctxt "CountryInfo"
msgid "Ghana"
-msgstr "Gana"
+msgstr "Ghana"
msgctxt "CountryInfo"
msgid "Grenada"
@@ -728,11 +705,11 @@ msgstr "Guatemala"
msgctxt "CountryInfo"
msgid "Guinea"
-msgstr "Gine"
+msgstr "Guinea"
msgctxt "CountryInfo"
msgid "Guinea-Bissau"
-msgstr "Gine-Bissau"
+msgstr "Guinea-Bissau"
msgctxt "CountryInfo"
msgid "Guyana"
@@ -752,27 +729,27 @@ msgstr "Honduras"
msgctxt "CountryInfo"
msgid "Israel"
-msgstr "Israil"
+msgstr "Israel"
msgctxt "CountryInfo"
msgid "Italy"
-msgstr "Italya"
+msgstr "Italy"
msgctxt "CountryInfo"
msgid "Jamaica"
-msgstr "Jamaika"
+msgstr "Jamaica"
msgctxt "CountryInfo"
msgid "Japan"
-msgstr "Japonya"
+msgstr "Japan"
msgctxt "CountryInfo"
msgid "Jordan"
-msgstr "Urdun"
+msgstr "Jordan"
msgctxt "CountryInfo"
msgid "Kazakhstan"
-msgstr "Kazakistan"
+msgstr "Kazakhstan"
msgctxt "CountryInfo"
msgid "Kenya"
@@ -784,11 +761,11 @@ msgstr "Kiribati"
msgctxt "CountryInfo"
msgid "Kuwait"
-msgstr "Kuveyt"
+msgstr "Kuwait"
msgctxt "CountryInfo"
msgid "Kyrgyzstan"
-msgstr "Kirgizstan"
+msgstr "Kyrgyzstan"
msgctxt "CountryInfo"
msgid "Laos"
@@ -796,11 +773,11 @@ msgstr "Laos"
msgctxt "CountryInfo"
msgid "Latvia"
-msgstr "Letonya"
+msgstr "Latvia"
msgctxt "CountryInfo"
msgid "Lebanon"
-msgstr "Lubnan"
+msgstr "Lebanon"
msgctxt "CountryInfo"
msgid "Lesotho"
@@ -808,27 +785,27 @@ msgstr "Lesotho"
msgctxt "CountryInfo"
msgid "Liberia"
-msgstr "Liberya"
+msgstr "Liberia"
msgctxt "CountryInfo"
msgid "Liechtenstein"
-msgstr "Lihtenştayn"
+msgstr "Liechtenstein"
msgctxt "CountryInfo"
msgid "Lithuania"
-msgstr "Litvanya"
+msgstr "Lithuania"
msgctxt "CountryInfo"
msgid "Luxembourg"
-msgstr "Luksemburg"
+msgstr "Luxembourg"
msgctxt "CountryInfo"
msgid "Macedonia"
-msgstr "Makedonya"
+msgstr "Macedonia"
msgctxt "CountryInfo"
msgid "Madagascar"
-msgstr "Madagaskar"
+msgstr "Madagascar"
msgctxt "CountryInfo"
msgid "Malawi"
@@ -836,7 +813,7 @@ msgstr "Malawi"
msgctxt "CountryInfo"
msgid "Malaysia"
-msgstr "Malezya"
+msgstr "Malaysia"
msgctxt "CountryInfo"
msgid "Mali"
@@ -848,11 +825,11 @@ msgstr "Malta"
msgctxt "CountryInfo"
msgid "Marshall Islands"
-msgstr "Marshall Adaları"
+msgstr "Marshall Islands"
msgctxt "CountryInfo"
msgid "Mauritania"
-msgstr "Moritanya"
+msgstr "Mauritania"
msgctxt "CountryInfo"
msgid "Mauritius"
@@ -860,7 +837,7 @@ msgstr "Mauritius"
msgctxt "CountryInfo"
msgid "Micronesia"
-msgstr "Mikronezya"
+msgstr "Micronesia"
msgctxt "CountryInfo"
msgid "Moldova"
@@ -868,27 +845,27 @@ msgstr "Moldova"
msgctxt "CountryInfo"
msgid "Monaco"
-msgstr "Monako"
+msgstr "Monaco"
msgctxt "CountryInfo"
msgid "Mongolia"
-msgstr "Mongolya"
+msgstr "Mongolia"
msgctxt "CountryInfo"
msgid "Montenegro"
-msgstr "Karadağ"
+msgstr "Montenegro"
msgctxt "CountryInfo"
msgid "Morocco"
-msgstr "Fas"
+msgstr "Morocco"
msgctxt "CountryInfo"
msgid "Mozambique"
-msgstr "Mozambik"
+msgstr "Mozambique"
msgctxt "CountryInfo"
msgid "Namibia"
-msgstr "Namibiya"
+msgstr "Namibia"
msgctxt "CountryInfo"
msgid "Nauru"
@@ -900,31 +877,31 @@ msgstr "Nepal"
msgctxt "CountryInfo"
msgid "Netherlands"
-msgstr "Hollanda"
+msgstr "Netherlands"
msgctxt "CountryInfo"
msgid "New Zealand"
-msgstr "Yeni Zelanda"
+msgstr "New Zealand"
msgctxt "CountryInfo"
msgid "Nicaragua"
-msgstr "Nikaragua"
+msgstr "Nicaragua"
msgctxt "CountryInfo"
msgid "Niger"
-msgstr "Nijer"
+msgstr "Niger"
msgctxt "CountryInfo"
msgid "Nigeria"
-msgstr "Nijerya"
+msgstr "Nigeria"
msgctxt "CountryInfo"
msgid "Norway"
-msgstr "Norveç"
+msgstr "Norway"
msgctxt "CountryInfo"
msgid "Oman"
-msgstr "Umman"
+msgstr "Oman"
msgctxt "CountryInfo"
msgid "Pakistan"
@@ -936,7 +913,7 @@ msgstr "Palau"
msgctxt "CountryInfo"
msgid "Palestine"
-msgstr "Filistin"
+msgstr "Palestine"
msgctxt "CountryInfo"
msgid "Panama"
@@ -944,7 +921,7 @@ msgstr "Panama"
msgctxt "CountryInfo"
msgid "Papua New Guinea"
-msgstr "Papua Yeni Gine"
+msgstr "Papua New Guinea"
msgctxt "CountryInfo"
msgid "Paraguay"
@@ -956,27 +933,27 @@ msgstr "Peru"
msgctxt "CountryInfo"
msgid "Philippines"
-msgstr "Filipinler"
+msgstr "Philippines"
msgctxt "CountryInfo"
msgid "Poland"
-msgstr "Polonya"
+msgstr "Poland"
msgctxt "CountryInfo"
msgid "Portugal"
-msgstr "Portekiz"
+msgstr "Portugal"
msgctxt "CountryInfo"
msgid "Qatar"
-msgstr "Katar"
+msgstr "Qatar"
msgctxt "CountryInfo"
msgid "Romania"
-msgstr "Romanya"
+msgstr "Romania"
msgctxt "CountryInfo"
msgid "Russia"
-msgstr "Rusya"
+msgstr "Russia"
msgctxt "CountryInfo"
msgid "Rwanda"
@@ -1008,7 +985,7 @@ msgstr "Sao Tome & Principe"
msgctxt "CountryInfo"
msgid "Saudi Arabia"
-msgstr "Suudi Arabistan"
+msgstr "Saudi Arabia"
msgctxt "CountryInfo"
msgid "Senegal"
@@ -1020,7 +997,7 @@ msgstr "Serbia"
msgctxt "CountryInfo"
msgid "Seychelles"
-msgstr "Seyşeller"
+msgstr "Seychelles"
msgctxt "CountryInfo"
msgid "Sierra Leone"
@@ -1028,31 +1005,31 @@ msgstr "Sierra Leone"
msgctxt "CountryInfo"
msgid "Singapore"
-msgstr "Singapur"
+msgstr "Singapore"
msgctxt "CountryInfo"
msgid "Slovakia"
-msgstr "Slovakya"
+msgstr "Slovakia"
msgctxt "CountryInfo"
msgid "Slovenia"
-msgstr "Slovenya"
+msgstr "Slovenia"
msgctxt "CountryInfo"
msgid "Solomon Islands"
-msgstr "Solomon Adaları"
+msgstr "Solomon Islands"
msgctxt "CountryInfo"
msgid "Somalia"
-msgstr "Somali"
+msgstr "Somalia"
msgctxt "CountryInfo"
msgid "South Africa"
-msgstr "Güney Afrika"
+msgstr "South Africa"
msgctxt "CountryInfo"
msgid "Spain"
-msgstr "Ispanya"
+msgstr "Spain"
msgctxt "CountryInfo"
msgid "Sri Lanka"
@@ -1064,39 +1041,39 @@ msgstr "Sudan"
msgctxt "CountryInfo"
msgid "Suriname"
-msgstr "Surinam"
+msgstr "Suriname"
msgctxt "CountryInfo"
msgid "Swaziland"
-msgstr "Svaziland"
+msgstr "Swaziland"
msgctxt "CountryInfo"
msgid "Sweden"
-msgstr "Isveç"
+msgstr "Sweden"
msgctxt "CountryInfo"
msgid "Switzerland"
-msgstr "Isviçre"
+msgstr "Switzerland"
msgctxt "CountryInfo"
msgid "Syria"
-msgstr "Suriye"
+msgstr "Syria"
msgctxt "CountryInfo"
msgid "Tajikistan"
-msgstr "Tacikistan"
+msgstr "Tajikistan"
msgctxt "CountryInfo"
msgid "Tanzania"
-msgstr "Tanzanya"
+msgstr "Tanzania"
msgctxt "CountryInfo"
msgid "Thailand"
-msgstr "Tayland"
+msgstr "Thailand"
msgctxt "CountryInfo"
msgid "Timor-Leste (East Timor)"
-msgstr "Timor-Leste (Doğu Timor)"
+msgstr "Timor-Leste (East Timor)"
msgctxt "CountryInfo"
msgid "Togo"
@@ -1112,7 +1089,7 @@ msgstr "Trinidad & Tobago"
msgctxt "CountryInfo"
msgid "Tunisia"
-msgstr "Tunus"
+msgstr "Tunisia"
msgctxt "CountryInfo"
msgid "Turkey"
@@ -1132,19 +1109,19 @@ msgstr "Uganda"
msgctxt "CountryInfo"
msgid "Ukraine"
-msgstr "Ukrayna"
+msgstr "Ukraine"
msgctxt "CountryInfo"
msgid "United Arab Emirates"
-msgstr "Birleşik Arap Emirlikleri"
+msgstr "United Arab Emirates"
msgctxt "CountryInfo"
msgid "United Kingdom"
-msgstr "Birleşik Krallık"
+msgstr "United Kingdom"
msgctxt "CountryInfo"
msgid "United States"
-msgstr "Birleşik Devletler"
+msgstr "United States"
msgctxt "CountryInfo"
msgid "Uruguay"
@@ -1152,7 +1129,7 @@ msgstr "Uruguay"
msgctxt "CountryInfo"
msgid "Uzbekistan"
-msgstr "Özbekistan"
+msgstr "Uzbekistan"
msgctxt "CountryInfo"
msgid "Vanuatu"
@@ -1160,7 +1137,7 @@ msgstr "Vanuatu"
msgctxt "CountryInfo"
msgid "Vatican"
-msgstr "Vatikan"
+msgstr "Vatican"
msgctxt "CountryInfo"
msgid "Venezuela"
@@ -1172,7 +1149,7 @@ msgstr "Vietnam"
msgctxt "CountryInfo"
msgid "Western Sahara"
-msgstr "Batı Sahra"
+msgstr "Western Sahara"
msgctxt "CountryInfo"
msgid "Yemen"
@@ -1180,7 +1157,7 @@ msgstr "Yemen"
msgctxt "CountryInfo"
msgid "Zambia"
-msgstr "Zambiya"
+msgstr "Zambia"
msgctxt "CountryInfo"
msgid "Zimbabwe"
@@ -1188,23 +1165,23 @@ msgstr "Zimbabwe"
msgctxt "CountryInfo"
msgid "Zaire"
-msgstr "Demokratik Kongo Cumhuriyeti"
+msgstr ""
msgctxt "CountryInfo"
msgid "Albania"
-msgstr "Arnavutluk"
+msgstr "Albania"
msgctxt "CountryInfo"
msgid "Algeria"
-msgstr "Cezayir"
+msgstr "Algeria"
msgctxt "CountryInfo"
msgid "Austria"
-msgstr "Avusturya"
+msgstr "Austria"
msgctxt "CountryInfo"
msgid "Bahrain"
-msgstr "Bahreyn"
+msgstr "Bahrain"
msgctxt "CountryInfo"
msgid "Benin"
@@ -1212,7 +1189,7 @@ msgstr "Benin"
msgctxt "CountryInfo"
msgid "Ethiopia"
-msgstr "Ethiyopya"
+msgstr "Ethiopia"
msgctxt "CountryInfo"
msgid "Fiji"
@@ -1220,11 +1197,11 @@ msgstr "Fiji"
msgctxt "CountryInfo"
msgid "Finland"
-msgstr "Finlandiya"
+msgstr "Finland"
msgctxt "CountryInfo"
msgid "Greece"
-msgstr "Yunanistan"
+msgstr "Greece"
msgctxt "CountryInfo"
msgid "Guam"
@@ -1232,19 +1209,19 @@ msgstr "Guam"
msgctxt "CountryInfo"
msgid "Hungary"
-msgstr "Macaristan"
+msgstr "Hungary"
msgctxt "CountryInfo"
msgid "Iceland"
-msgstr "Izlanda"
+msgstr "Iceland"
msgctxt "CountryInfo"
msgid "India"
-msgstr "Hindistan"
+msgstr "India"
msgctxt "CountryInfo"
msgid "Indonesia"
-msgstr "Endonezya"
+msgstr "Indonesia"
msgctxt "CountryInfo"
msgid "Iran"
@@ -1252,19 +1229,19 @@ msgstr "Iran"
msgctxt "CountryInfo"
msgid "Iraq"
-msgstr "Irak"
+msgstr "Iraq"
msgctxt "CountryInfo"
msgid "Ireland"
-msgstr "Irlanda"
+msgstr "Ireland"
msgctxt "CountryInfo"
msgid "Korea, North"
-msgstr "Kore, Kuzey"
+msgstr "Korea, North"
msgctxt "CountryInfo"
msgid "Korea, South"
-msgstr "Korea, Güney"
+msgstr "Korea, South"
msgctxt "CountryInfo"
msgid "Libya"
@@ -1272,68 +1249,75 @@ msgstr "Libya"
msgctxt "CountryInfo"
msgid "Maldives"
-msgstr "Maldivler"
+msgstr "Maldives"
msgctxt "CountryInfo"
msgid "Mexico"
-msgstr "Meksika"
+msgstr "Mexico"
msgctxt "CountryInfo"
msgid "Myanmar"
-msgstr "Burma"
+msgstr "Myanmar"
msgctxt "CountryInfo"
msgid "Taiwan"
-msgstr "Tayvan"
+msgstr "Taiwan"
msgctxt "CrashReportDialog"
msgid "Submit a Crash Report"
-msgstr "Çökme Raporu Gönder"
+msgstr ""
msgctxt "CrashReportDialog"
msgid "Vidalia encountered an error and needed to close"
-msgstr "Vidalia bir sorunla karşılaştı ve kapanması gerekiyor."
+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'yı yeniden başlat."
+msgstr ""
msgctxt "CrashReportDialog"
msgid "Don't Restart"
-msgstr "Yeniden Başlatma"
+msgstr ""
msgctxt "CrashReportDialog"
msgid "Unable to restart Vidalia"
-msgstr "Vidalia yeniden başlatılamadı."
+msgstr ""
msgctxt "CrashReportDialog"
msgid ""
"We were unable to automatically restart Vidalia. Please restart Vidalia "
"manually."
-msgstr "Vidalia'yı yeniden otomatik olarak başlatamadık. Lütfen Vidalia'yı manuel olarak başlatın."
-
-msgctxt "CrashReportDialog"
-msgid "Please fill a ticket in:"
-msgstr "Bir başvuru doldurun"
+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 "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."
-msgstr "Sorunu belirlemek ve çözmek için Vidalia geliştiricilerine gönderebileceğiniz bir çökme raporu yaratıldı. Bu rapor herhangi bir kişisel bilgi içermez."
+msgctxt "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:"
-msgstr "uyguluma çökmeden önce yaptıklarınızın bir açıklaması ile, ayrıca çökme raporuyla ilgili şu dosyalarla birlikte:"
+msgctxt "CrashReportUploader"
+msgid "Receiving response..."
+msgstr ""
msgctxt "GeneralPage"
msgid "Executables (*.exe)"
@@ -1345,7 +1329,7 @@ msgstr "Tor için klasör seç"
msgctxt "GeneralPage"
msgid "Select Proxy Executable"
-msgstr "Vekil Sunucu Uygulamasını Seçin"
+msgstr "Proxy seçin"
msgctxt "GeneralPage"
msgid "You must specify the name of your Tor executable."
@@ -1353,23 +1337,19 @@ msgstr "Tor için bir isim belirlemek zorundasınız."
msgctxt "GeneralPage"
msgid "Start Vidalia when my system starts"
-msgstr "Bilgisayarla birlikte başlat"
+msgstr "Windows'la birlikte başlat"
msgctxt "GeneralPage"
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"
msgctxt "GeneralPage"
msgid "Proxy Application (optional)"
-msgstr "Vekil Sunucu (isteğe bağlı)"
+msgstr "Proxy (isteğe bağlı)"
msgctxt "GeneralPage"
msgid "Start a proxy application when Tor starts"
@@ -1377,20 +1357,24 @@ msgstr "Tor başladığında proxyide başlat"
msgctxt "GeneralPage"
msgid "Proxy Application Arguments:"
-msgstr "Vekil Sunucu parametreleri:"
+msgstr "Proxy parametleri:"
msgctxt "GeneralPage"
msgid "Software Updates"
-msgstr "Yazılım Güncellemeleri"
+msgstr "Güncellemeler"
msgctxt "GeneralPage"
msgid "Check for new software updates automatically"
-msgstr "Güncellemeleri otomatik kontrol et"
+msgstr "Güncellemeleri otomatik kontor et"
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"
@@ -1517,7 +1501,7 @@ msgstr "büyük-küçük harfe duyarlı"
msgctxt "HelpBrowser"
msgid "Whole words only"
-msgstr "Tam sözcükler"
+msgstr "Tam szöcükler"
msgctxt "HelpBrowser"
msgid "Help Topics"
@@ -1545,7 +1529,7 @@ msgstr "Yardım içeriğini yüklerken hata oluştu:"
msgctxt "HelpTextBrowser"
msgid "Opening External Link"
-msgstr "Harici Link Açılıyor"
+msgstr "Başka bir link açma"
msgctxt "HelpTextBrowser"
msgid ""
@@ -1556,7 +1540,7 @@ msgstr "Vidali seçmiş olduğunuz adresi web gezgininizde açabiliyor. Eğer we
msgctxt "HelpTextBrowser"
msgid "Do you want Vidalia to open the link in your Web browser?"
-msgstr "Vidalia'nın linki web tarayıcınızda açmasını ister misiniz?"
+msgstr "Vidalianın web gezgininde açmasını istermisin?"
msgctxt "HelpTextBrowser"
msgid "Unable to Open Link"
@@ -1566,7 +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 tarayıcınızda açamıyor. Adresi web tarayıcınıza 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:"
@@ -1610,31 +1594,31 @@ msgstr "Bilinmeyen"
msgctxt "LogTreeItem"
msgid "Debug"
-msgstr "Hata ayıkla"
+msgstr ""
msgctxt "LogTreeItem"
msgid "Info"
-msgstr "Bilgi"
+msgstr ""
msgctxt "LogTreeItem"
msgid "Notice"
-msgstr "Bildirim"
+msgstr ""
msgctxt "LogTreeItem"
msgid "Warning"
-msgstr "Uyarı"
+msgstr ""
msgctxt "LogTreeItem"
msgid "Error"
-msgstr "Hata"
+msgstr ""
msgctxt "LogTreeItem"
msgid "Unknown"
-msgstr "Bilinmeyen"
+msgstr ""
msgctxt "MainWindow"
msgid "Start Tor"
-msgstr "Tor'u Başlat"
+msgstr "Başlat"
msgctxt "MainWindow"
msgid "Exit"
@@ -1642,19 +1626,19 @@ msgstr "Çıkış"
msgctxt "MainWindow"
msgid "Bandwidth Graph"
-msgstr "Bantgenişliği Grafiği"
+msgstr "Band Grafiği"
msgctxt "MainWindow"
msgid "Message Log"
-msgstr "Kayıtlar"
+msgstr "Günlükler"
msgctxt "MainWindow"
msgid "Network Map"
-msgstr "Ağ Haritası"
+msgstr "Ağ haritası"
msgctxt "MainWindow"
msgid "Control Panel"
-msgstr "Kontrol paneli"
+msgstr "Kontol paneli"
msgctxt "MainWindow"
msgid "Settings"
@@ -1673,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"
@@ -1709,32 +1665,28 @@ msgid "View"
msgstr "Görünüm"
msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr "Yardım"
-
-msgctxt "MainWindow"
msgid "Error starting web browser"
-msgstr "Web tarayıcısı başlatılırken hata oluştu"
+msgstr "Web gezgini başlatırlırken hata oluştu"
msgctxt "MainWindow"
msgid "Vidalia was unable to start the configured web browser"
-msgstr "Vidalia web tarayıcısını başlatamıyor"
+msgstr "Vidalia web gezginini başlatamıyor"
msgctxt "MainWindow"
msgid "Error starting IM client"
-msgstr "IM uygulamasını başlatmada hata oluştu"
+msgstr "Im kullanıcısını başlatamada hata oluştu"
msgctxt "MainWindow"
msgid "Vidalia was unable to start the configured IM client"
-msgstr "Vidalia IM uygulamasını başlatamıyor"
+msgstr "Vidalia IM kullanıcısını başlatamıyor"
msgctxt "MainWindow"
msgid "Error starting proxy server"
-msgstr "Vekil sunucusu başlatmada hata"
+msgstr "Proxy sunucusu başlatmada hata"
msgctxt "MainWindow"
msgid "Vidalia was unable to start the configured proxy server"
-msgstr "Vekil sunucusu başlatılamıyor"
+msgstr "Proxy sunucusu başlatılamıyor"
msgctxt "MainWindow"
msgid "Connecting to a relay directory"
@@ -1758,11 +1710,11 @@ msgstr "Doğrulama sertifikalarını yüklüyor"
msgctxt "MainWindow"
msgid "Requesting relay information"
-msgstr "Ayna bilgisi isteniyor"
+msgstr "Aktarım bilgisi isteniyor"
msgctxt "MainWindow"
msgid "Loading relay information"
-msgstr "Ayna bilgisi yükleniyor"
+msgstr "Aktarım bilgisi yükleniyor"
msgctxt "MainWindow"
msgid "Connecting to the Tor network"
@@ -1777,16 +1729,20 @@ msgid "Connected to the Tor network!"
msgstr "Tor ağına bağlandı!"
msgctxt "MainWindow"
+msgid "Unrecognized startup status"
+msgstr "Tanımlanamayan başlangıç."
+
+msgctxt "MainWindow"
msgid "miscellaneous"
msgstr "Diğer"
msgctxt "MainWindow"
msgid "identity mismatch"
-msgstr "kimlik uyumsuz"
+msgstr "Kimlik uyumsuz"
msgctxt "MainWindow"
msgid "done"
-msgstr "tamam"
+msgstr "Tamam"
msgctxt "MainWindow"
msgid "connection refused"
@@ -1814,27 +1770,23 @@ msgstr "Bilinmeyen"
msgctxt "MainWindow"
msgid "Tor is not running"
-msgstr "Tor çalışmıyor"
+msgstr "Çalışmıyor"
msgctxt "MainWindow"
msgid "Tor is shutting down"
-msgstr "Tor kapatılıyor"
-
-msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr "Tor'u Şimdi Durdur"
+msgstr "Kapatılıyor"
msgctxt "MainWindow"
msgid "Stop Tor"
-msgstr "Tor'u Durdur"
+msgstr "Durdur"
msgctxt "MainWindow"
msgid "Starting the Tor software"
-msgstr "Tor yazılımı başlatılıyor"
+msgstr "Başlatılıyor"
msgctxt "MainWindow"
msgid "Starting Tor"
-msgstr "Tor başlatılıyor"
+msgstr "Başlıyor"
msgctxt "MainWindow"
msgid "Error Starting Tor"
@@ -1856,7 +1808,7 @@ msgstr "Bağlantı hatası"
msgctxt "MainWindow"
msgid "Relaying is Enabled"
-msgstr "Ayna etkin."
+msgstr "Aktarım aktif"
msgctxt "MainWindow"
msgid "Error Shutting Down"
@@ -1907,18 +1859,6 @@ msgid ""
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."
-
-msgctxt "MainWindow"
msgid "Tor Update Available"
msgstr "Tor'un yeni güncelleştirmesi var"
@@ -1944,7 +1884,7 @@ msgstr "Yeni kimlik alırken hata oluştu"
msgctxt "MainWindow"
msgid "Port Forwarding Failed"
-msgstr "Port iletirken hata oluştu"
+msgstr "Port yanıtlarken hata oluştu"
msgctxt "MainWindow"
msgid "Vidalia was unable to configure automatic port forwarding."
@@ -1952,89 +1892,18 @@ msgstr "Vidalia port yanıtlama ayarlarını uygulayamıyor."
msgctxt "MainWindow"
msgid "Vidalia Control Panel"
-msgstr "Vidalia Kontrol Paneli"
+msgstr "Kontrol Paneli"
msgctxt "MainWindow"
msgid "Status"
msgstr "Durum"
msgctxt "MainWindow"
-msgid "Vidalia Shortcuts"
-msgstr "Vidalia Kısayollar"
-
-msgctxt "MainWindow"
-msgid "Setup Relaying"
-msgstr "Ayna Ayarları"
-
-msgctxt "MainWindow"
-msgid "Set up a relay and help the network grow"
-msgstr "Kendi ağınızı kurarak bu hizmetin büyümesine yardımcı olun"
-
-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 "Guncel bantgenişliği kullanımını görüntüle"
-
-msgctxt "MainWindow"
-msgid "View log message history"
-msgstr "Günlük kayıtlarını görüntüle"
-
-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."
@@ -2082,53 +1951,44 @@ 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 "Bu bağlantı üzerinden gönderilen herhangi birşey izlenebilir. Lütfen uygulamanızın ayarlarını kontrol edin ve eğer mümkünse, sadece SSL gibi şifreli protokolleri kullanın."
-
-msgctxt "MainWindow"
-msgid "Bootstrapping torrc from %1 to %2"
-msgstr "Torrc %1 den %2 ye önyükleniyor"
+msgstr ""
msgctxt "MainWindow"
-msgid "(probably Telnet)"
-msgstr "(muhtemelen Telnet)"
+msgid "toolBar"
+msgstr ""
msgctxt "MainWindow"
-msgid "(probably an email client)"
-msgstr "(muhtemelen eposta istemcisi)"
+msgid "Start"
+msgstr ""
msgctxt "MainWindow"
-msgid ""
-"One of your applications %1 appears to be making a potentially unencrypted "
-"and unsafe connection to port %2."
-msgstr "Uygulamalarınızdan biri %1 , %2 portundan olası bir şifrelenmemiş ve güvensiz bir bağlantı yapıyor."
+msgid "Stop"
+msgstr ""
msgctxt "MainWindow"
-msgid "failed (%1)"
-msgstr "Hata(%1)"
+msgid "Restart"
+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 "Reload Tor's config"
+msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Vidalia can't find out how to talk to Tor because it can't access this file: %1\n"
-"\n"
-"Here's the last error message:\n"
-"%2"
-msgstr "Vidalia, Tor ile iletişim kuramadı çünkü %1 dosyasına erişemedi.\n\nSon hata mesajı:\n%2"
+msgid "Actions"
+msgstr ""
msgctxt "MainWindow"
-msgid ""
-"It seems Tor has stopped running since Vidalia started it.\n"
-"\n"
-"See the Advanced Message Log for more information."
-msgstr "Görünüşe göre Tor Vidalia nın başlamasıyla beraber durdu.\n\nDaha fazla bilgi için Gelişmiş Mesaj Kaydı na bakın."
+msgid "Bootstrapping torrc from %1 to %2"
+msgstr ""
msgctxt "MainWindow"
msgid ""
@@ -2144,6 +2004,38 @@ msgid ""
"Please check the message log for recent warning or error messages."
msgstr "Tor beklenmedik şekilde sonlandırıldı.\n\nGünlük kayıtlarından hata sebebini kontrol edebilirsiniz."
+msgctxt "MainWindow"
+msgid ""
+"Vidalia tried to restart Tor, but was not able to. Please check your Task "
+"Manager to ensure there are no other Tor processes running."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "failed (%1)"
+msgstr "Hata(%1)"
+
+msgctxt "MainWindow"
+msgid ", probably Telnet,"
+msgstr ", Telnet,"
+
+msgctxt "MainWindow"
+msgid ", probably an email client,"
+msgstr ", e-posta istemcisi,"
+
+msgctxt "MainWindow"
+msgid ""
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
+msgstr "Bağlantınız sonlandırılıyor."
+
+msgctxt "MainWindow"
+msgid "Error reloading configuration"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to reload Tor's configuration."
+msgstr ""
+
msgctxt "MessageLog"
msgid "Error Setting Filter"
msgstr "Filtreler ayarlanırken hata oluştu"
@@ -2397,22 +2289,14 @@ msgid "Automatically save new log messages to a file"
msgstr "Yeni günlük mesajlarını otomatik kaydet"
msgctxt "MessageLog"
-msgid "Basic"
-msgstr "Temel"
-
-msgctxt "MessageLog"
-msgid "Tor Status"
-msgstr "Tor Durumu"
-
-msgctxt "MessageLog"
-msgid "Advanced"
-msgstr "Gelişmiş"
-
-msgctxt "MessageLog"
msgid "Always Save New Log Messages"
msgstr "Yeni günlük mesajlarını herzaman kaydet"
msgctxt "MessageLog"
+msgid "toolbar"
+msgstr ""
+
+msgctxt "MessageLog"
msgid ""
"Messages that appear when something has \n"
"gone very wrong and Tor cannot proceed."
@@ -2452,10 +2336,6 @@ msgid ""
msgstr "%1 dosyasına yazılamadı\n\n%2."
msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr "Tor Ağ haritası"
-
-msgctxt "NetViewer"
msgid "Refresh"
msgstr "Yenile"
@@ -2555,6 +2435,30 @@ 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ü"
+
+msgctxt "NetworkPage"
+msgid "The specified bridge identifier is not valid."
+msgstr "Belirlediğiniz köprü tanımı geçerli değil."
+
msgctxt "NetworkPage"
msgid "Copy (Ctrl+C)"
msgstr "Kopyala(Ctrl+C)"
@@ -2669,31 +2573,31 @@ msgstr "Yeni köprü bulmanın diğer yöntemlerini görmek için Yardım'a tık
msgctxt "NetworkPage"
msgid "Address:"
-msgstr "Adres:"
+msgstr ""
msgctxt "NetworkPage"
msgid "Type:"
-msgstr "Tür:"
+msgstr ""
msgctxt "NetworkPage"
msgid "You must select the proxy type."
-msgstr "Vekil sunucu türünü seçmelisiniz."
+msgstr ""
msgctxt "NetworkPage"
msgid "SOCKS 4"
-msgstr "SOCKS 4"
+msgstr ""
msgctxt "NetworkPage"
msgid "SOCKS 5"
-msgstr "SOCKS 5"
+msgstr ""
msgctxt "NetworkPage"
-msgid "HTTP / HTTPS"
-msgstr "HTTP / HTTPS"
+msgid "HTTP"
+msgstr ""
msgctxt "NetworkPage"
-msgid "You must specify one or more bridges."
-msgstr "Bir ya da daha fazla köprü belirtmelisiniz."
+msgid "HTTP / HTTPS"
+msgstr ""
msgctxt "Policy"
msgid "accept"
@@ -3109,19 +3013,19 @@ msgstr "<a href=\"bridges.finding\">Nasıl bir köprü bulabilirim?</a>"
msgctxt "ServerPage"
msgid "<a href=\"#bridgeHelp\">What's this?</a>"
-msgstr "<a href=\"#bridgeHelp\">Bu nedir?</a>"
+msgstr ""
msgctxt "ServerPage"
msgid "Automatically distribute my bridge address"
-msgstr "Köprü adresimi otomatik olarak dağıt"
+msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network (exit relay)"
-msgstr "Tor ağının bir parçası(relay) olun. (son sunucu)"
+msgid "Relay traffic inside the Tor network (non-exit relay)"
+msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic inside the Tor network (non-exit relay)"
-msgstr "Tor ağının bir parçası(relay) olun. (ara sunucu)"
+msgid "Relay traffic for the Tor network (exit relay)"
+msgstr ""
msgctxt "ServerPage"
msgid "Mirror the Relay Directory"
@@ -3168,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"
@@ -3217,26 +3117,26 @@ msgstr "Tor tarafından oluşuturuldu"
msgctxt "StatusEventWidget"
msgid "Copy to Clipboard"
-msgstr "Panoya kopyala."
+msgstr ""
msgctxt "StatusEventWidget"
msgid "The Tor Software is Running"
-msgstr "Tor yazılımı çalışıyor."
+msgstr ""
msgctxt "StatusEventWidget"
msgid "You are currently running version \"%1\" of the Tor software."
-msgstr "Şu anda Tor yazılımının \"%1\" versiyonunu kullanmaktasınız."
+msgstr ""
msgctxt "StatusEventWidget"
msgid "The Tor Software is not Running"
-msgstr "Tor yazılımı çalışmıyor."
+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 "Tor yazılımını yeniden başlatmak için Vidalia Kontrol Panelinde \"Tor'u Başlat\" a basın. Tor beklenmeden çıktıysa, karşılaşılan hatalarla ilgili detaylar için yukardan \"Gelişmiş\" tabini seçin."
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
@@ -3244,7 +3144,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 yazılımının önerilmeyen \"%1\" versiyonunu kullanmaktasınız. Lütfen önemli güvenlik ve performans düzeltmeleri içerebilecek en son versiyona yükseltin."
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
@@ -3252,31 +3152,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 "Tor yazılımının mevcut Tor ağıyla çalışmayan \"%1\" versiyonunu kullanmaktasınız. z. Lütfen önemli güvenlik ve performans düzeltmeleri içerebilecek en son versiyona yükseltin."
+msgstr ""
msgctxt "StatusEventWidget"
msgid "Your Tor Software is Out-of-date"
-msgstr "Tor yazılımınızın tarihi geçmiş."
+msgstr ""
msgctxt "StatusEventWidget"
msgid "Connected to the Tor Network"
-msgstr "Tor ağına bağlanıldı."
+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 ağına bağlantıyı başarıyla gerçekleştirdik. Şimdi programlarınızı Internet'i anonim olarak kullanmak uzere ayarlayabilirsiniz."
+msgstr ""
msgctxt "StatusEventWidget"
msgid "Tor Software Error"
-msgstr "Tor yazılım hatası"
+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 programı bir hatayla karşılaştı. Lütfen hata mesajını Tor geliştiricilerine developers at bugs.torproject.org adresinden bildirin. Hata mesajı: \"%1\""
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
@@ -3284,7 +3184,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 bilgisayarınızın saatinin, \"%2\" kaynağına göre karşılaştırıldığında %1 saniye geride olduğunu belirledi. Saatiniz doğru değilse Tor çalışamayacaktır. Lütfen bilgisayarınızın doğru saati gösterdiğinden emin olun."
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
@@ -3292,11 +3192,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 bilgisayarınızın saatinin, \"%2\" kaynağına göre karşılaştırıldığında %1 saniye geride olduğunu belirledi. Saatiniz doğru değilse Tor çalışamayacaktır. Lütfen bilgisayarınızın doğru saati gösterdiğinden emin olun."
+msgstr ""
msgctxt "StatusEventWidget"
msgid "Your Computer's Clock is Potentially Incorrect"
-msgstr "Bilgisayarınızın saati muhtemelen yanlış."
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
@@ -3304,18 +3204,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 "Bilgisayarınızdaki uygulamalardan biri Tor üzerinden %1 portuna şifrelenmemiş bağlantı kurmayı denedi. Tor ağı üzerinden şifrelenmemiş veri göndermek tehlikelidir ve önerilmez. Tor bu bağlantıyı sizin güvenliğiniz için otomatik olarak kesti."
+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 "Bilgisayarınızdaki uygulamalardan biri Tor üzerinden %1 portuna şifrelenmemiş bağlantı kurmayı denedi. Tor ağı üzerinden şifrelenmemiş veri göndermek tehlikelidir ve önerilmez."
+msgstr ""
msgctxt "StatusEventWidget"
msgid "Potentially Dangerous Connection!"
-msgstr "Olası Tehlikeli Bağlantı!"
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
@@ -3323,44 +3223,44 @@ msgid ""
"using a protocol that may leak information about your destination. Please "
"ensure you configure your applications to use only SOCKS4a or SOCKS5 with "
"remote hostname resolution."
-msgstr "Uygulamalarınızdan biri \"%1\"e Tor üzerinden yeriniz hakkında bilgi sızdırabilecek bir bağlantı sağladı. Lütfen uygulamalarınızın sadece SOCKS4a ya da SOCKS5 kullanmak üzere yapılandırıldığından emin olun. "
+msgstr ""
msgctxt "StatusEventWidget"
msgid "Unknown SOCKS Protocol"
-msgstr "Bilinmeyen SOCKS Protokolü"
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
"One of your applications tried to establish a connection through Tor using a"
" protocol that Tor does not understand. Please ensure you configure your "
"applications to use only SOCKS4a or SOCKS5 with remote hostname resolution."
-msgstr "Uygulamalarınızdan biri Tor'un anlamadığı bir protokol kullanarak Tor üzerinden bağlantı kurmaya çalıştı. Lütfen uygulamalarınızın sadece SOCKS4a ya da SOCKS5 kullanmak üzere yapılandırıldığından emin olun."
+msgstr ""
msgctxt "StatusEventWidget"
msgid "Invalid Destination Hostname"
-msgstr "Geçersiz Hedef Makine Ismi"
+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 "Uygulamalarınızdan biri Tor'un geçerli bir sunucu adı olarak tanımadığı \"%1\" sunucusuyla bağlantı kurmaya çalıştı. Lütfen uygulamanızın yapılandırmasını kontrol edin."
+msgstr ""
msgctxt "StatusEventWidget"
msgid "External IP Address Changed"
-msgstr "Harici IP Adresi Değişti"
+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 relayinizin IP adresinin %1%2 olduğunu belirledi. Doğru değilse lütfen relayinizin yapılandırmasındaki 'Adres' alanını ayarlayın."
+msgstr ""
msgctxt "StatusEventWidget"
msgid "DNS Hijacking Detected"
-msgstr "DNS Hijackingi Tespit Edildi"
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
@@ -3378,26 +3278,26 @@ msgstr ""
msgctxt "StatusEventWidget"
msgid "Checking Server Port Reachability"
-msgstr "Sunucu Port Ulaşılabilirliği kontrol ediliyor. "
+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, relayinizin Tor ağından erişilebilirliğini kendisine %1:%2 de bağlanarak kontrol ediyor. Bu test bir kaç dakika alabilir."
+msgstr ""
msgctxt "StatusEventWidget"
msgid "Server Port Reachability Test Successful!"
-msgstr "Sunucu Port Ulaşılabilirlik Testi Başarılı"
+msgstr ""
msgctxt "StatusEventWidget"
msgid "Your relay's server port is reachable from the Tor network!"
-msgstr "Relayinizin sunucu portu Tor ağından erişilebilir!"
+msgstr ""
msgctxt "StatusEventWidget"
msgid "Server Port Reachability Test Failed"
-msgstr "Sunucu Port Ulaşılabilirlik Testi Başarısız"
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
@@ -3409,7 +3309,7 @@ msgstr ""
msgctxt "StatusEventWidget"
msgid "Checking Directory Port Reachability"
-msgstr "Dizin Port Ulaşılabilirliği Kontrol Ediliyor"
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
@@ -3420,15 +3320,15 @@ msgstr ""
msgctxt "StatusEventWidget"
msgid "Directory Port Reachability Test Successful!"
-msgstr "Dizin Port Ulaşılabilirliği Testi Başarılı"
+msgstr ""
msgctxt "StatusEventWidget"
msgid "Your relay's directory port is reachable from the Tor network!"
-msgstr "Relayinizin dizin portu Tor ağından erişilebilir!"
+msgstr ""
msgctxt "StatusEventWidget"
msgid "Directory Port Reachability Test Failed"
-msgstr "Dizin Port Ulaşılabilirliği Testi Başarısız"
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
@@ -3440,7 +3340,7 @@ msgstr ""
msgctxt "StatusEventWidget"
msgid "Relay Descriptor Rejected"
-msgstr "Ayna Açıklaması Reddedildi"
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
@@ -3450,7 +3350,7 @@ msgstr ""
msgctxt "StatusEventWidget"
msgid "Your Relay is Online"
-msgstr "Aynanız Çevrimiçi"
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
@@ -3458,7 +3358,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 "Aynanız çevrimiçi ve diğer Tor kullanıcılarına açık. Birkaç saat içinde diğer kullanıcılar aynanızı öğrendikçe ağ trafiğindeki artışı Genişbant Grafiğinde görebilirsiniz. Tor ağına katkıda bulunduğunuz için teşekkür ederiz!"
+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"
@@ -3496,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]"
@@ -3514,65 +3436,89 @@ msgstr "Kontrol şifresinin hash kodunda hata oluştu."
msgctxt "TorrcDialog"
msgid "Editing torrc"
-msgstr "torrc düzenleniyor"
+msgstr ""
msgctxt "TorrcDialog"
msgid ""
"Save settings. If unchecked it will only apply settings to the current Tor "
"instance."
-msgstr "Ayarları kaydet. Işaretlenmezse sadece şuanki Tor "
+msgstr ""
msgctxt "TorrcDialog"
msgid "Cut"
-msgstr "Kes"
+msgstr ""
msgctxt "TorrcDialog"
msgid "Copy"
-msgstr "Kopyala"
+msgstr ""
msgctxt "TorrcDialog"
msgid "Paste"
-msgstr "Yapıştır"
+msgstr ""
msgctxt "TorrcDialog"
msgid "Undo"
-msgstr "Geri al"
+msgstr ""
msgctxt "TorrcDialog"
msgid "Redo"
-msgstr "Yenile"
+msgstr ""
msgctxt "TorrcDialog"
msgid "Select All"
-msgstr "Hepsini Seç"
+msgstr ""
msgctxt "TorrcDialog"
msgid "Apply all"
-msgstr "Hepsini uygula"
+msgstr ""
msgctxt "TorrcDialog"
msgid "Apply selection only"
-msgstr "Seçimi uygula"
+msgstr ""
msgctxt "TorrcDialog"
msgid "Error connecting to Tor"
-msgstr "Tor'a bağlantı hatası"
+msgstr ""
msgctxt "TorrcDialog"
msgid "Selection is empty. Please select some text, or check \"Apply all\""
-msgstr "Boş seçim. Lütfen biraz metin seçin, ya da \"Tümüne uygula\"yı işaretleyin."
+msgstr ""
msgctxt "TorrcDialog"
msgid "Error at line %1: \"%2\""
-msgstr "Satır %1 de hata: \"%2\""
+msgstr ""
msgctxt "TorrcDialog"
msgid "Error"
-msgstr "Hata"
+msgstr ""
msgctxt "TorrcDialog"
msgid "An error ocurred while opening torrc file"
-msgstr "torrc dosyasını açarken hata oluştu"
+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"
@@ -3702,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"
@@ -3795,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 "Parametre için gereken değer :"
-
-msgctxt "Vidalia"
msgid "Invalid language code specified:"
msgstr "Yanlış dil kodu belirtildi:"
diff --git a/src/vidalia/i18n/po/uk/qt_uk.po b/src/vidalia/i18n/po/uk/qt_uk.po
index 2af877f..d6af17c 100644
--- a/src/vidalia/i18n/po/uk/qt_uk.po
+++ b/src/vidalia/i18n/po/uk/qt_uk.po
@@ -1,16 +1,11 @@
-# Translators:
-# Translators:
-# <demonuk9 at gmail.com>, 2011.
-# <demonuk9 at gmail.com>, 2011.
-# <vadim2007 at ukr.net>, 2012.
-# Дмитро <demonuk9 at gmail.com>, 2012.
+#
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-08-20 03:25+0000\n"
-"PO-Revision-Date: 2012-04-14 16:47+0000\n"
-"Last-Translator: Vadym Stavskyi <vadim2007 at ukr.net>\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"
@@ -22,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 "OK"
+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"
msgid ""
"%1 already exists.\n"
"Do you want to replace it?"
-msgstr "%1 вже існує.\nВи хочете замінити його?"
+msgstr ""
#: qfiledialog.cpp:1690
msgctxt "QFileDialog"
@@ -212,57 +207,57 @@ msgid ""
"%1\n"
"File not found.\n"
"Please verify the correct file name was given."
-msgstr "%1\nФайл не знайдено.\nПеревірте, будь ласка, коректність вводу імені файлу."
+msgstr ""
#: 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"
@@ -270,168 +265,168 @@ msgid ""
"%1\n"
"Directory not found.\n"
"Please verify the correct directory name was given."
-msgstr "%1\nДиректорію не знайдено.\nПеревірте, будь ласка, коректність вводу імені директорії."
+msgstr ""
#: qfiledialog.cpp:2281
msgctxt "QFileDialog"
msgid ""
"'%1' is write protected.\n"
"Do you want to delete it anyway?"
-msgstr "'%1' захищений від запису.\nВсеодно видалити?"
+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 "Нова папка"
+msgstr ""
#: qfiledialog.cpp:917
msgctxt "QFileDialog"
msgid "&Choose"
-msgstr "Вибрати"
+msgstr ""
#: qsidebar.cpp:388
msgctxt "QFileDialog"
msgid "Remove"
-msgstr "Видалити"
+msgstr ""
#: qfiledialog.cpp:886
msgctxt "QFileDialog"
msgid "File &name:"
-msgstr "Ім'я файлу"
+msgstr ""
#: ui_qfiledialog.h:261
msgctxt "QFileDialog"
msgid "Look in:"
-msgstr "Подивитися у:"
+msgstr ""
#: ui_qfiledialog.h:279
msgctxt "QFileDialog"
msgid "Create New Folder"
-msgstr "Створити нову папку"
+msgstr ""
#: qfilesystemmodel.cpp:761
msgctxt "QFileSystemModel"
msgid "Invalid filename"
-msgstr "Неприпустиме ім'я файлу"
+msgstr ""
#: qfilesystemmodel.cpp:763
msgctxt "QFileSystemModel"
msgid ""
"<b>The name \"%1\" can not be used.</b><p>Try using another name, with fewer"
" characters or no punctuations marks."
-msgstr "<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/uk/vidalia_uk.po b/src/vidalia/i18n/po/uk/vidalia_uk.po
index 13f946c..fb8f11b 100644
--- a/src/vidalia/i18n/po/uk/vidalia_uk.po
+++ b/src/vidalia/i18n/po/uk/vidalia_uk.po
@@ -1,3848 +1,2685 @@
-#
-# Translators:
-# <crazysas at gmail.com>, 2012.
-# <demonuk9 at gmail.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: 2012-03-21 17:52+0000\n"
-"PO-Revision-Date: 2012-03-22 08:52+0000\n"
-"Last-Translator: crazysas26810fe5f9b14183 <crazysas at gmail.com>\n"
-"Language-Team: translations at vidalia-project.net\n"
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: translations at vidalia-project.net\n"
+"POT-Creation-Date: 2008-11-24 15:59+0000\n"
+"PO-Revision-Date: 2009-07-09 20:51+0000\n"
+"Last-Translator: Nestor Z. <nestor at linuxmail.org>\n"
+"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: uk\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
-"X-Generator: Vidalia ts2po 0.2\n"
+"X-Generator: Pootle 1.1.0\n"
+#: aboutdialog.ui:16
msgctxt "AboutDialog"
msgid "About Vidalia"
msgstr "Про Vidalia"
+#: aboutdialog.ui:53
msgctxt "AboutDialog"
-msgid "License"
-msgstr "Ліцензія"
+msgid "Vidalia"
+msgstr "Vidalia"
+
+#: aboutdialog.ui:88
+msgctxt "AboutDialog"
+msgid "Qt"
+msgstr "Qt"
+
+#: aboutdialog.ui:69
+msgctxt "AboutDialog"
+msgid "Tor"
+msgstr "Tor"
+
+#: aboutdialog.cpp:53
+msgctxt "AboutDialog"
+msgid "Unavailable"
+msgstr "Недоступний"
+
+#: aboutdialog.cpp:57
+#, fuzzy
+msgctxt "AboutDialog"
+msgid "Not Running"
+msgstr "Не виконується"
+
+#: aboutdialog.ui:81
+msgctxt "AboutDialog"
+msgid "0.2.0"
+msgstr "0.2.0"
+#: aboutdialog.ui:106
msgctxt "AboutDialog"
-msgid "Vidalia 0.2.0"
-msgstr "Vidalia 0.2.0"
+msgid "0.2.0.31-alpha-dev (r123456)"
+msgstr "0.2.0.31-alpha-dev (r123456)"
+#: aboutdialog.ui:131
msgctxt "AboutDialog"
-msgid "Tor 0.2.0.32"
-msgstr "Tor 0.2.0.32"
+msgid "4.4.2"
+msgstr "4.4.2"
+#: aboutdialog.ui:107
msgctxt "AboutDialog"
-msgid "Qt 4.4.2"
-msgstr "Qt 4.4.2"
+msgid "License"
+msgstr "Ліцензія"
+
+#: aboutdialog.ui:163
+msgctxt "AboutDialog"
+msgid "version"
+msgstr "версія"
+#: advancedpage.cpp:109
msgctxt "AdvancedPage"
msgid "'%1' is not a valid IP address."
msgstr "'%1' не є дійсною IP адресою."
+#: advancedpage.cpp:120
+#, fuzzy
msgctxt "AdvancedPage"
-msgid ""
-"You selected 'Password' authentication, but did not specify a password."
-msgstr "Ви вибрали аутентифікацію за паролем, але не вказали його."
+msgid "You selected 'Password' authentication, but did not specify a password."
+msgstr "Ви вибрали 'Password' аутентифікацію, але не вказали пароль."
+#: advancedpage.cpp:223
msgctxt "AdvancedPage"
msgid "Select Tor Configuration File"
msgstr "Оберіть файл конфігурації Tor"
+#: advancedpage.cpp:236
msgctxt "AdvancedPage"
msgid "File Not Found"
msgstr "Файлу не знайдено"
+#: advancedpage.cpp:238
msgctxt "AdvancedPage"
msgid "%1 does not exist. Would you like to create it?"
msgstr "%1 не існує. Бажаєте його створити?"
+#: advancedpage.cpp:249
msgctxt "AdvancedPage"
msgid "Failed to Create File"
msgstr "Не вдалося створити файлу"
+#: advancedpage.cpp:250
msgctxt "AdvancedPage"
msgid "Unable to create %1 [%2]"
msgstr "Неможливо створити %1 [%2]"
+#: advancedpage.cpp:265
msgctxt "AdvancedPage"
msgid "Select a Directory to Use for Tor Data"
msgstr "Оберіть каталог для збереження даних Tor"
+#: advancedpage.cpp:287
msgctxt "AdvancedPage"
msgid "Unable to remove Tor Service"
msgstr "Неможливо видалити сервіс Tor"
+#: advancedpage.cpp:289
+msgctxt "AdvancedPage"
+msgid "Vidalia was unable to remove the Tor service."
+""
+"You may need to remove it manually."
+msgstr ""
+"Vidalia не вдалося видалити сервіс Tor. Можливо, Вам доведеться видалити "
+"його самостійно."
+
+#: advancedpage.cpp:298
msgctxt "AdvancedPage"
msgid "Unable to install Tor Service"
msgstr "Неможливо встановити сервіс Tor"
+#: advancedpage.cpp:299
msgctxt "AdvancedPage"
msgid "Vidalia was unable to install the Tor service."
msgstr "Vidalia не вдалося встановити сервіс Tor"
+#: advancedpage.ui:28
+msgctxt "AdvancedPage"
+msgid "Control Port"
+msgstr "Порт керування"
+
+#: advancedpage.ui:48
msgctxt "AdvancedPage"
msgid "Authentication:"
msgstr "Аутентифікація:"
+#: advancedpage.ui:58
msgctxt "AdvancedPage"
msgid "Address:"
msgstr "Адреса:"
+#: advancedpage.ui:86
msgctxt "AdvancedPage"
msgid "None"
-msgstr "Нічого"
+msgstr ""
+#: advancedpage.ui:91
msgctxt "AdvancedPage"
msgid "Cookie"
msgstr "Куки"
+#: advancedpage.ui:96
msgctxt "AdvancedPage"
msgid "Password"
msgstr "Пароль"
+#: advancedpage.ui:111
msgctxt "AdvancedPage"
msgid "Randomly Generate"
-msgstr "Генерувати випадково"
+msgstr ""
+#: advancedpage.ui:157
msgctxt "AdvancedPage"
msgid ":"
msgstr ":"
+#: advancedpage.ui:219
msgctxt "AdvancedPage"
msgid "Tor Configuration File"
msgstr "Файл налаштувань Tor"
+#: advancedpage.ui:240
msgctxt "AdvancedPage"
msgid "Start the Tor software with the specified configuration file (torrc)"
-msgstr "Запустити програму Tor з вказаним файлом конфігурації (torrc)"
-
-msgctxt "AdvancedPage"
-msgid "Select path to your configuration file"
-msgstr "Оберіть шлях до файлу конфігурації"
-
-msgctxt "AdvancedPage"
-msgid "Browse"
-msgstr "Огляд"
-
-msgctxt "AdvancedPage"
-msgid "Data Directory"
-msgstr "Папка встановлення"
-
-msgctxt "AdvancedPage"
-msgid "Store data for the Tor software in the following directory"
-msgstr "Зберігати дані для програмного забезпечення Tor у цій директорії"
-
-msgctxt "AdvancedPage"
-msgid "Select the directory used to store data for the Tor software"
-msgstr "Оберіть директорію для збереження файлів програмного забезпечення Tor"
-
-msgctxt "AdvancedPage"
-msgid "Tor Control"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "Use TCP connection (ControlPort)"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "Path:"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "Use Unix domain socket (ControlSocket)"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "Edit current torrc"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "NOTE: this will edit the currently loaded torrc"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "ControlSocket path doesn't exist."
msgstr ""
+#: advancedpage.ui:259
msgctxt "AdvancedPage"
-msgid ""
-"The specified Tor configuration file location contains characters that "
-"cannot be represented in your system's current 8-bit character encoding."
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid ""
-"The specified Tor data directory location contains characters that cannot be"
-" represented in your system's current 8-bit character encoding."
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "Warning"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "You changed torrc path, would you like to restart Tor?"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "Tor Configuration File (torrc);;All Files (*)"
+msgid "Select path to your configuration file"
msgstr ""
+#: advancedpage.ui:318
msgctxt "AdvancedPage"
-msgid "Select a file to use for Tor socket path"
+msgid "Browse"
msgstr ""
+#: advancedpage.ui:275
msgctxt "AdvancedPage"
-msgid "Configure ControlPort automatically"
+msgid "Data Directory"
msgstr ""
+#: advancedpage.ui:296
msgctxt "AdvancedPage"
-msgid ""
-"You've checked the autoconfiguration option for the ControlPort, but "
-"provided no Data Directory. Please add one, or uncheck the \"Configure "
-"ControlPort automatically\" option."
+msgid "Store data for the Tor software in the following directory"
msgstr ""
+#: advancedpage.ui:315
msgctxt "AdvancedPage"
-msgid ""
-"Vidalia was unable to remove the Tor service.\n"
-"\n"
-"You may need to remove it manually."
-msgstr "Vidalia не змогла видалити сервіс Tor.\nМожливо, вам доведеться зробити це самостійно."
-
-msgctxt "AppearancePage"
-msgid "Language"
-msgstr "Мова"
-
-msgctxt "AppearancePage"
-msgid "Choose the language used in Vidalia"
-msgstr "Оберіть мову, що буде використовуватись у Vidalia"
-
-msgctxt "AppearancePage"
-msgid "Style"
-msgstr "Стиль"
-
-msgctxt "AppearancePage"
-msgid "Choose Vidalia's interface style"
-msgstr "Оберіть стиль інтерфейсу Vidalia"
-
-msgctxt "AppearancePage"
-msgid "Vidalia was unable to load the selected language translation."
-msgstr "Не вдалося завантажити обрану мову перекладу."
-
-msgctxt "AppearancePage"
-msgid ""
-"System Icon Preferences (changes will take effect when you restart Vidalia)"
-msgstr ""
-
-msgctxt "AppearancePage"
-msgid "Show the Tray Icon and Dock Icon (default)"
-msgstr ""
-
-msgctxt "AppearancePage"
-msgid "Hide the Tray Icon"
+msgid "Select the directory used to store data for the Tor software"
msgstr ""
+#: appearancepage.ui:22
msgctxt "AppearancePage"
-msgid "Hide the Dock Icon"
-msgstr ""
-
-msgctxt "BandwidthGraph"
-msgid "Since:"
-msgstr "З:"
-
-msgctxt "BandwidthGraph"
-msgid "Hide Settings"
-msgstr "Приховати налаштування"
-
-msgctxt "BandwidthGraph"
-msgid "Show Settings"
-msgstr "Показати налаштування"
-
-msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr ""
-
-msgctxt "BandwidthGraph"
-msgid "Reset"
-msgstr "Скинути"
-
-msgctxt "BandwidthGraph"
-msgid "Receive Rate"
-msgstr ""
-
-msgctxt "BandwidthGraph"
-msgid "Send Rate"
-msgstr ""
-
-msgctxt "BandwidthGraph"
-msgid "Always on Top"
-msgstr "Завжди поверх інших вікон"
-
-msgctxt "BandwidthGraph"
-msgid "Style"
-msgstr "Стиль"
-
-msgctxt "BandwidthGraph"
-msgid "Changes the transparency of the Bandwidth Graph"
-msgstr "Зміна прозорості графіку трафіку"
-
-msgctxt "BandwidthGraph"
-msgid "100"
-msgstr "100"
-
-msgctxt "BandwidthGraph"
-msgid "% Opaque"
-msgstr "% Прозорість"
-
-msgctxt "BandwidthGraph"
-msgid "Save"
-msgstr "Зберегти"
-
-msgctxt "BandwidthGraph"
-msgid "Cancel"
-msgstr "Відмова"
-
-msgctxt "BridgeDownloader"
-msgid "Starting HTTPS bridge request..."
-msgstr "Починаємо HTTPS-запит мосту..."
-
-msgctxt "BridgeDownloader"
-msgid "Connecting to %1:%2..."
-msgstr "Під'єднання до %1:%2..."
-
-msgctxt "BridgeDownloader"
-msgid "Sending an HTTPS request for bridges..."
-msgstr "Відправлення HTTPS-запитів до мостів..."
-
-msgctxt "BridgeDownloader"
-msgid "Downloading a list of bridges..."
-msgstr "Завантаження списку мостів..."
-
-msgctxt "BridgeDownloaderProgressDialog"
-msgid "Downloading Bridges"
-msgstr "Завантаження мостів"
-
-msgctxt "BridgeDownloaderProgressDialog"
-msgid "Unable to download bridges: %1"
-msgstr "Не вдається завантажити мости: %1"
-
-msgctxt "BridgeDownloaderProgressDialog"
-msgid "Retrying bridge request..."
-msgstr "Посторний запит мосту..."
-
-msgctxt "BridgeUsageDialog"
-msgid "Country"
-msgstr "Країна"
-
-msgctxt "BridgeUsageDialog"
-msgid "# Clients"
-msgstr "Кількість клієнтів"
-
-msgctxt "BridgeUsageDialog"
-msgid "Clients from the following countries have used your relay since %1"
-msgstr ""
-
-msgctxt "BridgeUsageDialog"
-msgid "Bridge Usage Summary"
-msgstr ""
-
-msgctxt "BridgeUsageDialog"
-msgid "Client Summary"
-msgstr ""
-
-msgctxt "Circuit"
-msgid "New"
-msgstr "Новий"
-
-msgctxt "Circuit"
-msgid "Open"
-msgstr "Відкрити"
-
-msgctxt "Circuit"
-msgid "Building"
-msgstr ""
-
-msgctxt "Circuit"
-msgid "Failed"
-msgstr "Стався збій"
-
-msgctxt "Circuit"
-msgid "Closed"
-msgstr "Закритий"
-
-msgctxt "Circuit"
-msgid "Unknown"
-msgstr "Невідомий"
-
-msgctxt "CircuitItem"
-msgid "<Path Empty>"
-msgstr "Пустий шлях"
-
-msgctxt "CircuitListWidget"
-msgid "Connection"
-msgstr "З'єднання"
-
-msgctxt "CircuitListWidget"
-msgid "Status"
-msgstr "Статус"
-
-msgctxt "CircuitListWidget"
-msgid "Zoom to Circuit"
-msgstr ""
-
-msgctxt "CircuitListWidget"
-msgid "Close Circuit (Del)"
-msgstr ""
-
-msgctxt "CircuitListWidget"
-msgid "Close Stream (Del)"
-msgstr ""
-
-msgctxt "ConfigDialog"
-msgid "General"
-msgstr "Основні"
-
-msgctxt "ConfigDialog"
-msgid "Network"
-msgstr "Мережа"
-
-msgctxt "ConfigDialog"
-msgid "Sharing"
-msgstr ""
-
-msgctxt "ConfigDialog"
-msgid "Services"
-msgstr "Сервіси"
-
-msgctxt "ConfigDialog"
-msgid "Appearance"
-msgstr "Зовнішній вигляд"
-
-msgctxt "ConfigDialog"
-msgid "Advanced"
-msgstr "Розширено"
-
-msgctxt "ConfigDialog"
-msgid "Help"
-msgstr "Допомога"
-
-msgctxt "ConfigDialog"
-msgid "Error Saving Settings"
-msgstr "Помилка збереження налаштувань"
-
-msgctxt "ConfigDialog"
-msgid "Vidalia was unable to save your %1 settings."
-msgstr ""
-
-msgctxt "ConfigDialog"
-msgid "Error Applying Settings"
-msgstr "Помилка застосування налаштувань"
-
-msgctxt "ConfigDialog"
-msgid "Vidalia was unable to apply your %1 settings to Tor."
-msgstr ""
-
-msgctxt "ConfigDialog"
-msgid "Settings"
-msgstr "Налаштування"
-
-msgctxt "ControlConnection"
-msgid "Vidalia was unable to connect to Tor. (%1)"
-msgstr "Vidalia не змогла під'єднатися до Tor. (%1)"
-
-msgctxt "ControlConnection"
-msgid "Control socket is not connected."
-msgstr ""
-
-msgctxt "ControlPasswordInputDialog"
-msgid "Password Required"
-msgstr "Потрібно пароль"
-
-msgctxt "ControlPasswordInputDialog"
-msgid "Remember my password"
-msgstr "Запам'ятати пароль"
-
-msgctxt "ControlPasswordInputDialog"
-msgid ""
-"Vidalia has connected to a running Tor process that requires a password. "
-"Please enter your control password:"
-msgstr "Vidalia під'єдналася до запущеного процесу Tor, який вимагає пароль. Будь ласка, введіть пароль:"
-
-msgctxt "ControlSocket"
-msgid "Control socket is not connected."
-msgstr "Контрольний сокет не під'єднано"
-
-msgctxt "ControlSocket"
-msgid "Error sending control command. [%1]"
-msgstr ""
-
-msgctxt "ControlSocket"
-msgid "Socket disconnected while attempting to read a line of data."
-msgstr ""
-
-msgctxt "ControlSocket"
-msgid "Invalid control reply. [%1]"
-msgstr "Хибна контрольна відповідь. [%1]"
-
-msgctxt "CountryInfo"
-msgid "Afghanistan"
-msgstr "Авганістан"
-
-msgctxt "CountryInfo"
-msgid "Andorra"
-msgstr "Андорра"
-
-msgctxt "CountryInfo"
-msgid "Angola"
-msgstr "Ангола"
-
-msgctxt "CountryInfo"
-msgid "Antigua & Barbuda"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Argentina"
-msgstr "Аргентина"
-
-msgctxt "CountryInfo"
-msgid "Armenia"
-msgstr "Вірменія"
-
-msgctxt "CountryInfo"
-msgid "Australia"
-msgstr "Австралія"
-
-msgctxt "CountryInfo"
-msgid "Azerbaijan"
-msgstr "Азербайджан"
-
-msgctxt "CountryInfo"
-msgid "Bahamas"
-msgstr "Багами"
-
-msgctxt "CountryInfo"
-msgid "Bangladesh"
-msgstr "Бангладеш"
-
-msgctxt "CountryInfo"
-msgid "Barbados"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Belarus"
-msgstr "Білорусь"
-
-msgctxt "CountryInfo"
-msgid "Belgium"
-msgstr "Бельгія"
-
-msgctxt "CountryInfo"
-msgid "Belize"
-msgstr "Беліз"
-
-msgctxt "CountryInfo"
-msgid "Bhutan"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Bolivia"
-msgstr "Болівія"
-
-msgctxt "CountryInfo"
-msgid "Bosnia & Herzegovina"
-msgstr "Боснія і Герцоговина"
-
-msgctxt "CountryInfo"
-msgid "Botswana"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Brazil"
-msgstr "Бразилія"
-
-msgctxt "CountryInfo"
-msgid "Brunei Darussalam"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Bulgaria"
-msgstr "Болгарія"
-
-msgctxt "CountryInfo"
-msgid "Burkina Faso"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Burundi"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Cambodia"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Cameroon"
-msgstr "Камерун"
-
-msgctxt "CountryInfo"
-msgid "Canada"
-msgstr "Канада"
-
-msgctxt "CountryInfo"
-msgid "Cape Verde"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Central African Republic"
-msgstr "Центральна Африканська Республіка"
-
-msgctxt "CountryInfo"
-msgid "Chad"
-msgstr "Чад"
-
-msgctxt "CountryInfo"
-msgid "Chile"
-msgstr "Чилі"
-
-msgctxt "CountryInfo"
-msgid "China"
-msgstr "Китай"
-
-msgctxt "CountryInfo"
-msgid "Colombia"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Comoros"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Congo, The Democratic Republic of the"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Congo"
-msgstr "Конго"
-
-msgctxt "CountryInfo"
-msgid "Costa Rica"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Cote d’Ivoire"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Croatia"
-msgstr "Хорватія"
-
-msgctxt "CountryInfo"
-msgid "Cuba"
-msgstr "Куба"
-
-msgctxt "CountryInfo"
-msgid "Cyprus"
-msgstr "Кіпр"
-
-msgctxt "CountryInfo"
-msgid "Czech Republic"
-msgstr "Чеська Республіка"
-
-msgctxt "CountryInfo"
-msgid "Denmark"
-msgstr "Данія"
-
-msgctxt "CountryInfo"
-msgid "Djibouti"
-msgstr "Джибуті"
-
-msgctxt "CountryInfo"
-msgid "Dominica"
-msgstr "Домініка"
-
-msgctxt "CountryInfo"
-msgid "Dominican Republic"
-msgstr "Домініканська Республіка"
-
-msgctxt "CountryInfo"
-msgid "Ecuador"
-msgstr "Еквадор"
-
-msgctxt "CountryInfo"
-msgid "Egypt"
-msgstr "Єгипет"
-
-msgctxt "CountryInfo"
-msgid "El Salvador"
-msgstr "Сальвадор"
-
-msgctxt "CountryInfo"
-msgid "Equatorial Guinea"
-msgstr "Екваторіальна Гвінея"
-
-msgctxt "CountryInfo"
-msgid "Eritrea"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Estonia"
-msgstr "Естонія"
-
-msgctxt "CountryInfo"
-msgid "France"
-msgstr "Франція"
-
-msgctxt "CountryInfo"
-msgid "Gabon"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Gambia"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Georgia"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Germany"
-msgstr "Німеччина"
-
-msgctxt "CountryInfo"
-msgid "Ghana"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Grenada"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Guatemala"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Guinea"
-msgstr "Гвінея"
-
-msgctxt "CountryInfo"
-msgid "Guinea-Bissau"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Guyana"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Hong Kong"
-msgstr "Гонконг"
-
-msgctxt "CountryInfo"
-msgid "Haiti"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Honduras"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Israel"
-msgstr "Ізраїль"
-
-msgctxt "CountryInfo"
-msgid "Italy"
-msgstr "Італія"
-
-msgctxt "CountryInfo"
-msgid "Jamaica"
-msgstr "Ямайка"
-
-msgctxt "CountryInfo"
-msgid "Japan"
-msgstr "Японія"
-
-msgctxt "CountryInfo"
-msgid "Jordan"
-msgstr "Йорданія"
-
-msgctxt "CountryInfo"
-msgid "Kazakhstan"
-msgstr "Казахстан"
-
-msgctxt "CountryInfo"
-msgid "Kenya"
-msgstr "Кенія"
-
-msgctxt "CountryInfo"
-msgid "Kiribati"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Kuwait"
-msgstr "Кувейт"
-
-msgctxt "CountryInfo"
-msgid "Kyrgyzstan"
-msgstr "Киргизія"
-
-msgctxt "CountryInfo"
-msgid "Laos"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Latvia"
-msgstr "Латвія"
-
-msgctxt "CountryInfo"
-msgid "Lebanon"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Lesotho"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Liberia"
-msgstr "Ліберія"
-
-msgctxt "CountryInfo"
-msgid "Liechtenstein"
-msgstr "Ліхтенштейн"
-
-msgctxt "CountryInfo"
-msgid "Lithuania"
-msgstr "Литва"
-
-msgctxt "CountryInfo"
-msgid "Luxembourg"
-msgstr "Люксембург"
-
-msgctxt "CountryInfo"
-msgid "Macedonia"
-msgstr "Македонія"
-
-msgctxt "CountryInfo"
-msgid "Madagascar"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Malawi"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Malaysia"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Mali"
-msgstr "Малі"
-
-msgctxt "CountryInfo"
-msgid "Malta"
-msgstr "Мальта"
-
-msgctxt "CountryInfo"
-msgid "Marshall Islands"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Mauritania"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Mauritius"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Micronesia"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Moldova"
-msgstr "Молдова"
-
-msgctxt "CountryInfo"
-msgid "Monaco"
-msgstr "Монако"
-
-msgctxt "CountryInfo"
-msgid "Mongolia"
-msgstr "Монголія"
-
-msgctxt "CountryInfo"
-msgid "Montenegro"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Morocco"
-msgstr "Марокко"
-
-msgctxt "CountryInfo"
-msgid "Mozambique"
-msgstr "Мозамбік"
-
-msgctxt "CountryInfo"
-msgid "Namibia"
-msgstr "Намібія"
-
-msgctxt "CountryInfo"
-msgid "Nauru"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Nepal"
-msgstr "Непал"
-
-msgctxt "CountryInfo"
-msgid "Netherlands"
-msgstr "Нідерланди"
-
-msgctxt "CountryInfo"
-msgid "New Zealand"
-msgstr "Нова Зеландія"
-
-msgctxt "CountryInfo"
-msgid "Nicaragua"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Niger"
-msgstr "Нігер"
-
-msgctxt "CountryInfo"
-msgid "Nigeria"
-msgstr "Нігерія"
-
-msgctxt "CountryInfo"
-msgid "Norway"
-msgstr "Норвегія"
-
-msgctxt "CountryInfo"
-msgid "Oman"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Pakistan"
-msgstr "Пакистан"
-
-msgctxt "CountryInfo"
-msgid "Palau"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Palestine"
-msgstr "Палестина"
-
-msgctxt "CountryInfo"
-msgid "Panama"
-msgstr "Панама"
-
-msgctxt "CountryInfo"
-msgid "Papua New Guinea"
-msgstr "Папуа Нова Гвінея"
-
-msgctxt "CountryInfo"
-msgid "Paraguay"
-msgstr "Парагвай"
-
-msgctxt "CountryInfo"
-msgid "Peru"
-msgstr "Перу"
-
-msgctxt "CountryInfo"
-msgid "Philippines"
-msgstr "Філіппіни"
-
-msgctxt "CountryInfo"
-msgid "Poland"
-msgstr "Польща"
-
-msgctxt "CountryInfo"
-msgid "Portugal"
-msgstr "Португалія"
-
-msgctxt "CountryInfo"
-msgid "Qatar"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Romania"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Russia"
-msgstr "Росія"
-
-msgctxt "CountryInfo"
-msgid "Rwanda"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Saint Kitts & Nevis"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Saint Lucia"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Saint Vincent & the Grenadines"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Samoa"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "San Marino"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Sao Tome & Principe"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Saudi Arabia"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Senegal"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Serbia"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Seychelles"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Sierra Leone"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Singapore"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Slovakia"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Slovenia"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Solomon Islands"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Somalia"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "South Africa"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Spain"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Sri Lanka"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Sudan"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Suriname"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Swaziland"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Sweden"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Switzerland"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Syria"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Tajikistan"
-msgstr ""
-
-msgctxt "CountryInfo"
-msgid "Tanzania"
+msgid "Language"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Thailand"
+#: appearancepage.ui:37
+msgctxt "AppearancePage"
+msgid "Choose the language used in Vidalia"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Timor-Leste (East Timor)"
+#: appearancepage.ui:75
+msgctxt "AppearancePage"
+msgid "Style"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Togo"
+#: appearancepage.ui:103
+msgctxt "AppearancePage"
+msgid "Choose Vidalia's interface style"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Tonga"
+#: appearancepage.cpp:67
+msgctxt "AppearancePage"
+msgid "Vidalia was unable to load the selected language translation."
msgstr ""
-msgctxt "CountryInfo"
-msgid "Trinidad & Tobago"
+#: bwgraph.cpp:166
+msgctxt "BandwidthGraph"
+msgid "Since:"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Tunisia"
+#: bwgraph.cpp:232
+msgctxt "BandwidthGraph"
+msgid "Hide Settings"
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"
+#: bwgraph.ui:40
+msgctxt "BandwidthGraph"
+msgid "Show Settings"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Uzbekistan"
+#: bwgraph.ui:16
+msgctxt "BandwidthGraph"
+msgid "Tor Bandwidth Usage"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Vanuatu"
+#: bwgraph.ui:63
+msgctxt "BandwidthGraph"
+msgid "Reset"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Vatican"
+#: bwgraph.ui:151
+msgctxt "BandwidthGraph"
+msgid "Receive Rate"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Venezuela"
+#: bwgraph.ui:170
+msgctxt "BandwidthGraph"
+msgid "Send Rate"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Vietnam"
-msgstr ""
+#: bwgraph.ui:183
+msgctxt "BandwidthGraph"
+msgid "Always on Top"
+msgstr "Завжди поверх інших вікон"
-msgctxt "CountryInfo"
-msgid "Western Sahara"
-msgstr ""
+#: bwgraph.ui:234
+msgctxt "BandwidthGraph"
+msgid "Style"
+msgstr "Стиль"
-msgctxt "CountryInfo"
-msgid "Yemen"
+#: bwgraph.ui:284
+msgctxt "BandwidthGraph"
+msgid "Changes the transparency of the Bandwidth Graph"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Zambia"
+#: bwgraph.ui:368
+msgctxt "BandwidthGraph"
+msgid "100"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Zimbabwe"
-msgstr ""
+#: bwgraph.ui:383
+msgctxt "BandwidthGraph"
+msgid "% Opaque"
+msgstr "% Прозорість"
-msgctxt "CountryInfo"
-msgid "Zaire"
-msgstr ""
+#: bwgraph.ui:443
+msgctxt "BandwidthGraph"
+msgid "Save"
+msgstr "Зберегти"
-msgctxt "CountryInfo"
-msgid "Albania"
-msgstr ""
+#: bwgraph.ui:450
+msgctxt "BandwidthGraph"
+msgid "Cancel"
+msgstr "Відмова"
-msgctxt "CountryInfo"
-msgid "Algeria"
-msgstr ""
+#: circuit.cpp:112
+msgctxt "Circuit"
+msgid "New"
+msgstr "Новий"
-msgctxt "CountryInfo"
-msgid "Austria"
-msgstr ""
+#: circuit.cpp:113
+msgctxt "Circuit"
+msgid "Open"
+msgstr "Відкрити"
-msgctxt "CountryInfo"
-msgid "Bahrain"
+#: circuit.cpp:114
+msgctxt "Circuit"
+msgid "Building"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Benin"
+#: circuit.cpp:115
+msgctxt "Circuit"
+msgid "Failed"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Ethiopia"
+#: circuit.cpp:116
+msgctxt "Circuit"
+msgid "Closed"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Fiji"
+#: circuit.cpp:117
+msgctxt "Circuit"
+msgid "Unknown"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Finland"
+#: circuititem.cpp:39
+msgctxt "CircuitItem"
+msgid "<Path Empty>"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Greece"
+#: circuitlistwidget.cpp:55
+msgctxt "CircuitListWidget"
+msgid "Connection"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Guam"
+#: circuitlistwidget.cpp:55
+msgctxt "CircuitListWidget"
+msgid "Status"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Hungary"
+#: circuitlistwidget.cpp:87
+msgctxt "CircuitListWidget"
+msgid "Zoom to Circuit"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Iceland"
+#: circuitlistwidget.cpp:89
+msgctxt "CircuitListWidget"
+msgid "Close Circuit (Del)"
msgstr ""
-msgctxt "CountryInfo"
-msgid "India"
+#: circuitlistwidget.cpp:110
+msgctxt "CircuitListWidget"
+msgid "Close Stream (Del)"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Indonesia"
+#: configdialog.cpp:77
+msgctxt "ConfigDialog"
+msgid "General"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Iran"
-msgstr ""
+#: configdialog.cpp:81
+msgctxt "ConfigDialog"
+msgid "Network"
+msgstr "Мережа"
-msgctxt "CountryInfo"
-msgid "Iraq"
+#: configdialog.cpp:85
+msgctxt "ConfigDialog"
+msgid "Sharing"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Ireland"
+#: configdialog.cpp:89
+msgctxt "ConfigDialog"
+msgid "Services"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Korea, North"
+#: configdialog.cpp:93
+msgctxt "ConfigDialog"
+msgid "Appearance"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Korea, South"
+#: configdialog.cpp:97
+msgctxt "ConfigDialog"
+msgid "Advanced"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Libya"
+#: configdialog.cpp:111
+msgctxt "ConfigDialog"
+msgid "Help"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Maldives"
+#: configdialog.cpp:196
+msgctxt "ConfigDialog"
+msgid "Error Saving Settings"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Mexico"
+#: configdialog.cpp:198
+msgctxt "ConfigDialog"
+msgid "Vidalia was unable to save your %1 settings."
msgstr ""
-msgctxt "CountryInfo"
-msgid "Myanmar"
+#: configdialog.cpp:225
+msgctxt "ConfigDialog"
+msgid "Error Applying Settings"
msgstr ""
-msgctxt "CountryInfo"
-msgid "Taiwan"
+#: configdialog.cpp:227
+msgctxt "ConfigDialog"
+msgid "Vidalia was unable to apply your %1 settings to Tor."
msgstr ""
-msgctxt "CrashReportDialog"
-msgid "Submit a Crash Report"
+#: configdialog.ui:16
+msgctxt "ConfigDialog"
+msgid "Settings"
msgstr ""
-msgctxt "CrashReportDialog"
-msgid "Vidalia encountered an error and needed to close"
+#: controlconnection.cpp:134
+msgctxt "ControlConnection"
+msgid "Vidalia was unable to connect to Tor. (%1)"
msgstr ""
-msgctxt "CrashReportDialog"
-msgid "Restart Vidalia"
+#: controlconnection.cpp:331
+msgctxt "ControlConnection"
+msgid "Control socket is not connected."
msgstr ""
-msgctxt "CrashReportDialog"
-msgid "Don't Restart"
+#: controlpasswordinputdialog.ui:28
+msgctxt "ControlPasswordInputDialog"
+msgid "Password Required"
msgstr ""
-msgctxt "CrashReportDialog"
-msgid "Unable to restart Vidalia"
+#: controlpasswordinputdialog.ui:80
+msgctxt "ControlPasswordInputDialog"
+msgid "Vidalia has connected to a running Tor process that requires a password. Please enter your control password: "
msgstr ""
-msgctxt "CrashReportDialog"
-msgid ""
-"We were unable to automatically restart Vidalia. Please restart Vidalia "
-"manually."
+#: controlpasswordinputdialog.ui:99
+msgctxt "ControlPasswordInputDialog"
+msgid "Remember my password"
msgstr ""
-msgctxt "CrashReportDialog"
-msgid "Please fill a ticket in:"
+#: controlsocket.cpp:70
+msgctxt "ControlSocket"
+msgid "Control socket is not connected."
msgstr ""
-msgctxt "CrashReportDialog"
-msgid ""
-"<a "
-"href=\"https://trac.torproject.org/projects/tor/newticket\">https://trac.torproject.org/projects/tor/newticket</a>"
+#: controlsocket.cpp:80
+msgctxt "ControlSocket"
+msgid "Error sending control command. [%1]"
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."
+#: controlsocket.cpp:117
+msgctxt "ControlSocket"
+msgid "Socket disconnected while attempting to read a line of data."
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:"
+#: controlsocket.cpp:156
+msgctxt "ControlSocket"
+msgid "Invalid control reply. [%1]"
msgstr ""
+#: generalpage.cpp:62
msgctxt "GeneralPage"
msgid "Executables (*.exe)"
-msgstr "Додатки (*.exe)"
+msgstr ""
+#: generalpage.cpp:75
msgctxt "GeneralPage"
msgid "Select Path to Tor"
-msgstr "Виберіть шлях до Tor"
+msgstr ""
+#: generalpage.cpp:85
msgctxt "GeneralPage"
msgid "Select Proxy Executable"
msgstr ""
+#: generalpage.cpp:98
msgctxt "GeneralPage"
msgid "You must specify the name of your Tor executable."
msgstr ""
+#: generalpage.cpp:106
+msgctxt "GeneralPage"
+msgid "The proxy arguments specified are not properly formatted."
+msgstr ""
+
+#: generalpage.ui:28
msgctxt "GeneralPage"
msgid "Start Vidalia when my system starts"
msgstr ""
+#: generalpage.ui:121
msgctxt "GeneralPage"
msgid "Browse"
-msgstr "Огялд"
+msgstr ""
+#: generalpage.ui:57
msgctxt "GeneralPage"
msgid "Start the Tor software when Vidalia starts"
msgstr ""
+#: generalpage.ui:51
msgctxt "GeneralPage"
msgid "Tor"
-msgstr "Tor"
+msgstr ""
+#: generalpage.ui:93
msgctxt "GeneralPage"
msgid "Proxy Application (optional)"
msgstr ""
+#: generalpage.ui:99
msgctxt "GeneralPage"
msgid "Start a proxy application when Tor starts"
msgstr ""
+#: generalpage.ui:135
msgctxt "GeneralPage"
msgid "Proxy Application Arguments:"
msgstr ""
-msgctxt "GeneralPage"
-msgid "Software Updates"
-msgstr ""
-
-msgctxt "GeneralPage"
-msgid "Check for new software updates automatically"
+#: graphframe.cpp:238
+msgctxt "GraphFrame"
+msgid "Recv: "
msgstr ""
-msgctxt "GeneralPage"
-msgid "Check Now"
+#: graphframe.cpp:298
+msgctxt "GraphFrame"
+msgid "%1 KB/s"
msgstr ""
+#: graphframe.cpp:247
msgctxt "GraphFrame"
-msgid "%1 KB/s"
+msgid "Sent: "
msgstr ""
+#: graphframe.cpp:259
msgctxt "GraphFrame"
msgid "%1 KB"
msgstr ""
+#: graphframe.cpp:262
msgctxt "GraphFrame"
msgid "%1 MB"
msgstr ""
+#: graphframe.cpp:265
msgctxt "GraphFrame"
msgid "%1 GB"
msgstr ""
-msgctxt "GraphFrame"
-msgid "Recv:"
-msgstr ""
-
-msgctxt "GraphFrame"
-msgid "Sent:"
+#: helpbrowser.cpp:135
+msgctxt "HelpBrowser"
+msgid "Error Loading Help Contents: "
msgstr ""
+#: helpbrowser.cpp:147
msgctxt "HelpBrowser"
msgid "Supplied XML file is not a valid Contents document."
msgstr ""
+#: helpbrowser.cpp:396
msgctxt "HelpBrowser"
msgid "Search reached end of document"
msgstr ""
+#: helpbrowser.cpp:398
msgctxt "HelpBrowser"
msgid "Search reached start of document"
msgstr ""
+#: helpbrowser.cpp:400
msgctxt "HelpBrowser"
msgid "Text not found in document"
msgstr ""
+#: helpbrowser.cpp:445
msgctxt "HelpBrowser"
msgid "Found %1 results"
msgstr ""
+#: helpbrowser.ui:33
msgctxt "HelpBrowser"
msgid "Vidalia Help"
msgstr ""
+#: helpbrowser.ui:484
msgctxt "HelpBrowser"
msgid "Back"
msgstr ""
+#: helpbrowser.ui:487
msgctxt "HelpBrowser"
msgid "Move to previous page (Backspace)"
msgstr ""
+#: helpbrowser.ui:490
msgctxt "HelpBrowser"
msgid "Backspace"
msgstr ""
+#: helpbrowser.ui:498
msgctxt "HelpBrowser"
msgid "Forward"
msgstr ""
+#: helpbrowser.ui:501
msgctxt "HelpBrowser"
msgid "Move to next page (Shift+Backspace)"
msgstr ""
+#: helpbrowser.ui:504
msgctxt "HelpBrowser"
msgid "Shift+Backspace"
msgstr ""
+#: helpbrowser.ui:512
msgctxt "HelpBrowser"
msgid "Home"
msgstr ""
+#: helpbrowser.ui:515
msgctxt "HelpBrowser"
msgid "Move to the Home page (Ctrl+H)"
msgstr ""
+#: helpbrowser.ui:518
msgctxt "HelpBrowser"
msgid "Ctrl+H"
msgstr ""
+#: helpbrowser.ui:535
msgctxt "HelpBrowser"
msgid "Find"
msgstr ""
+#: helpbrowser.ui:538
msgctxt "HelpBrowser"
msgid "Search for a word or phrase on current page (Ctrl+F)"
msgstr ""
+#: helpbrowser.ui:541
msgctxt "HelpBrowser"
msgid "Ctrl+F"
msgstr ""
+#: helpbrowser.ui:549
msgctxt "HelpBrowser"
msgid "Close"
msgstr ""
+#: helpbrowser.ui:552
msgctxt "HelpBrowser"
msgid "Close Vidalia Help"
msgstr ""
+#: helpbrowser.ui:555
msgctxt "HelpBrowser"
msgid "Esc"
msgstr ""
+#: helpbrowser.ui:152
msgctxt "HelpBrowser"
msgid "Find:"
msgstr ""
+#: helpbrowser.ui:174
msgctxt "HelpBrowser"
msgid "Find Previous"
msgstr ""
+#: helpbrowser.ui:187
msgctxt "HelpBrowser"
msgid "Find Next"
msgstr ""
+#: helpbrowser.ui:221
msgctxt "HelpBrowser"
msgid "Case sensitive"
msgstr ""
+#: helpbrowser.ui:231
msgctxt "HelpBrowser"
msgid "Whole words only"
msgstr ""
+#: helpbrowser.ui:305
msgctxt "HelpBrowser"
msgid "Help Topics"
msgstr ""
+#: helpbrowser.ui:260
msgctxt "HelpBrowser"
msgid "Contents"
msgstr ""
+#: helpbrowser.ui:350
msgctxt "HelpBrowser"
msgid "Search"
msgstr ""
+#: helpbrowser.ui:362
msgctxt "HelpBrowser"
msgid "Searching for:"
msgstr ""
+#: helpbrowser.ui:405
msgctxt "HelpBrowser"
msgid "Found Documents"
msgstr ""
-msgctxt "HelpBrowser"
-msgid "Error Loading Help Contents:"
+#: helptextbrowser.cpp:54
+msgctxt "HelpTextBrowser"
+msgid "Error opening help file: "
msgstr ""
+#: helptextbrowser.cpp:72
msgctxt "HelpTextBrowser"
msgid "Opening External Link"
msgstr ""
+#: helptextbrowser.cpp:76
msgctxt "HelpTextBrowser"
-msgid ""
-"Vidalia can open the link you selected in your default Web browser. If your "
-"browser is not currently configured to use Tor then the request will not be "
-"anonymous."
+msgid "Vidalia can open the link you selected in your default Web browser. If your browser is not currently configured to use Tor then the request will not be anonymous."
msgstr ""
+#: helptextbrowser.cpp:78
msgctxt "HelpTextBrowser"
msgid "Do you want Vidalia to open the link in your Web browser?"
msgstr ""
+#: helptextbrowser.cpp:88
msgctxt "HelpTextBrowser"
msgid "Unable to Open Link"
msgstr ""
+#: helptextbrowser.cpp:90
msgctxt "HelpTextBrowser"
-msgid ""
-"Vidalia was unable to open the selected link in your Web browser. You can "
-"still copy the URL and paste it into your browser."
-msgstr ""
-
-msgctxt "HelpTextBrowser"
-msgid "Error opening help file:"
+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 ""
+#: licensedialog.ui:43
msgctxt "LicenseDialog"
msgid "License"
msgstr "Ліцензія"
+#: licensedialog.ui:76
msgctxt "LicenseDialog"
msgid "Credits"
msgstr ""
+#: logevent.cpp:57
msgctxt "LogEvent"
msgid "Debug"
msgstr ""
+#: logevent.cpp:58
msgctxt "LogEvent"
msgid "Info"
msgstr ""
+#: logevent.cpp:59
msgctxt "LogEvent"
msgid "Notice"
msgstr ""
+#: logevent.cpp:60
msgctxt "LogEvent"
msgid "Warning"
msgstr ""
+#: logevent.cpp:61
msgctxt "LogEvent"
msgid "Error"
msgstr ""
+#: logevent.cpp:62
msgctxt "LogEvent"
msgid "Unknown"
msgstr ""
-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 ""
-
+#: mainwindow.ui:233
msgctxt "MainWindow"
msgid "Start Tor"
msgstr ""
+#: mainwindow.ui:443
msgctxt "MainWindow"
msgid "Exit"
msgstr ""
+#: mainwindow.ui:304
msgctxt "MainWindow"
msgid "Bandwidth Graph"
msgstr ""
+#: mainwindow.ui:317
msgctxt "MainWindow"
msgid "Message Log"
msgstr ""
+#: mainwindow.cpp:348
msgctxt "MainWindow"
msgid "Network Map"
msgstr ""
+#: mainwindow.cpp:354
msgctxt "MainWindow"
msgid "Control Panel"
msgstr ""
+#: mainwindow.ui:380
msgctxt "MainWindow"
msgid "Settings"
msgstr ""
+#: mainwindow.ui:430
msgctxt "MainWindow"
msgid "About"
msgstr ""
+#: mainwindow.ui:367
msgctxt "MainWindow"
msgid "Help"
msgstr ""
+#: mainwindow.cpp:1391
msgctxt "MainWindow"
msgid "New Identity"
msgstr ""
+#: mainwindow.cpp:437
msgctxt "MainWindow"
msgid "Ctrl+T"
msgstr ""
+#: mainwindow.cpp:438
msgctxt "MainWindow"
msgid "Ctrl+B"
msgstr ""
+#: mainwindow.cpp:439
msgctxt "MainWindow"
msgid "Ctrl+L"
msgstr ""
+#: mainwindow.cpp:440
msgctxt "MainWindow"
msgid "Ctrl+N"
msgstr ""
+#: mainwindow.cpp:441
msgctxt "MainWindow"
msgid "Ctrl+?"
msgstr ""
+#: mainwindow.cpp:442
msgctxt "MainWindow"
msgid "Ctrl+I"
msgstr ""
+#: mainwindow.cpp:443
msgctxt "MainWindow"
msgid "Ctrl+P"
msgstr ""
+#: mainwindow.cpp:463
msgctxt "MainWindow"
msgid "Tor"
msgstr "Tor"
+#: mainwindow.cpp:468
msgctxt "MainWindow"
msgid "View"
msgstr ""
+#: mainwindow.cpp:476
msgctxt "MainWindow"
msgid "Vidalia Help"
msgstr ""
+#: mainwindow.cpp:527
msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
+#: mainwindow.cpp:528
msgctxt "MainWindow"
msgid "Vidalia was unable to start the configured web browser"
msgstr ""
+#: mainwindow.cpp:540
msgctxt "MainWindow"
msgid "Error starting IM client"
msgstr ""
+#: mainwindow.cpp:541
msgctxt "MainWindow"
msgid "Vidalia was unable to start the configured IM client"
msgstr ""
+#: mainwindow.cpp:562
msgctxt "MainWindow"
msgid "Error starting proxy server"
msgstr ""
+#: mainwindow.cpp:563
msgctxt "MainWindow"
msgid "Vidalia was unable to start the configured proxy server"
msgstr ""
+#: mainwindow.cpp:579
msgctxt "MainWindow"
msgid "Connecting to a relay directory"
msgstr ""
+#: mainwindow.cpp:583
msgctxt "MainWindow"
msgid "Establishing an encrypted directory connection"
msgstr ""
+#: mainwindow.cpp:586
msgctxt "MainWindow"
msgid "Retrieving network status"
msgstr ""
+#: mainwindow.cpp:589
msgctxt "MainWindow"
msgid "Loading network status"
msgstr ""
+#: mainwindow.cpp:592
msgctxt "MainWindow"
msgid "Loading authority certificates"
msgstr ""
+#: mainwindow.cpp:595
msgctxt "MainWindow"
msgid "Requesting relay information"
msgstr ""
+#: mainwindow.cpp:598
msgctxt "MainWindow"
msgid "Loading relay information"
msgstr ""
+#: mainwindow.cpp:1132
msgctxt "MainWindow"
msgid "Connecting to the Tor network"
msgstr ""
+#: mainwindow.cpp:605
msgctxt "MainWindow"
msgid "Establishing a Tor circuit"
msgstr ""
+#: mainwindow.cpp:1297
msgctxt "MainWindow"
msgid "Connected to the Tor network!"
msgstr ""
+#: mainwindow.cpp:612
+msgctxt "MainWindow"
+msgid "Unrecognized startup status"
+msgstr ""
+
+#: mainwindow.cpp:619
msgctxt "MainWindow"
msgid "miscellaneous"
msgstr ""
+#: mainwindow.cpp:622
msgctxt "MainWindow"
msgid "identity mismatch"
msgstr ""
+#: mainwindow.cpp:625
msgctxt "MainWindow"
msgid "done"
msgstr ""
+#: mainwindow.cpp:628
msgctxt "MainWindow"
msgid "connection refused"
msgstr ""
+#: mainwindow.cpp:631
msgctxt "MainWindow"
msgid "connection timeout"
msgstr ""
+#: mainwindow.cpp:634
msgctxt "MainWindow"
msgid "read/write error"
msgstr ""
+#: mainwindow.cpp:637
msgctxt "MainWindow"
msgid "no route to host"
msgstr ""
+#: mainwindow.cpp:640
msgctxt "MainWindow"
msgid "insufficient resources"
msgstr ""
+#: mainwindow.cpp:643
msgctxt "MainWindow"
msgid "unknown"
msgstr ""
+#: mainwindow.cpp:645
+msgctxt "MainWindow"
+msgid " failed (%1)"
+msgstr ""
+
+#: mainwindow.ui:168
msgctxt "MainWindow"
msgid "Tor is not running"
msgstr ""
+#: mainwindow.cpp:686
+msgctxt "MainWindow"
+msgid "Your relay is shutting down."
+"Click 'Stop' again to stop your relay now."
+msgstr ""
+
+#: mainwindow.cpp:688
msgctxt "MainWindow"
msgid "Tor is shutting down"
msgstr ""
+#: mainwindow.cpp:693
msgctxt "MainWindow"
msgid "Stop Tor Now"
msgstr ""
+#: mainwindow.cpp:695
msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
+#: mainwindow.cpp:711
msgctxt "MainWindow"
msgid "Starting the Tor software"
msgstr ""
+#: mainwindow.ui:75
msgctxt "MainWindow"
msgid "Starting Tor"
msgstr ""
+#: mainwindow.cpp:859
msgctxt "MainWindow"
msgid "Error Starting Tor"
msgstr ""
+#: mainwindow.cpp:862
msgctxt "MainWindow"
-msgid ""
-"Vidalia was unable to start Tor. Check your settings to ensure the correct "
-"name and location of your Tor executable is specified."
+msgid "Vidalia was unable to start Tor. Check your settings to ensure the correct name and location of your Tor executable is specified."
msgstr ""
+#: mainwindow.cpp:896
msgctxt "MainWindow"
msgid "Connecting to Tor"
msgstr ""
+#: mainwindow.cpp:906
msgctxt "MainWindow"
msgid "Connection Error"
msgstr ""
+#: mainwindow.cpp:938
msgctxt "MainWindow"
msgid "Relaying is Enabled"
msgstr ""
+#: mainwindow.cpp:943
+msgctxt "MainWindow"
+msgid "You are currently running a relay. Terminating your relay will interrupt any open connections from clients."
+""
+"Would you like to shutdown gracefully and give clients time to find a new relay?"
+msgstr ""
+
+#: mainwindow.cpp:965
msgctxt "MainWindow"
msgid "Error Shutting Down"
msgstr ""
+#: mainwindow.cpp:966
msgctxt "MainWindow"
msgid "Vidalia was unable to stop the Tor software."
msgstr ""
+#: mainwindow.cpp:997
msgctxt "MainWindow"
msgid "Unexpected Error"
msgstr ""
+#: mainwindow.cpp:1001
+msgctxt "MainWindow"
+msgid "Vidalia detected that the Tor software exited unexpectedly."
+""
+"Please check the message log for recent warning or error messages."
+msgstr ""
+
+#: mainwindow.cpp:1055
msgctxt "MainWindow"
msgid "Authenticating to Tor"
msgstr ""
+#: mainwindow.cpp:1075
msgctxt "MainWindow"
msgid "Cookie Authentication Required"
msgstr ""
+#: mainwindow.cpp:1078
msgctxt "MainWindow"
-msgid ""
-"The Tor software requires Vidalia to send the contents of an authentication "
-"cookie, but Vidalia was unable to find one."
+msgid "The Tor software requires Vidalia to send the contents of an authentication cookie, but Vidalia was unable to find one."
msgstr ""
+#: mainwindow.cpp:1080
msgctxt "MainWindow"
msgid "Would you like to browse for the file 'control_auth_cookie' yourself?"
msgstr ""
+#: mainwindow.cpp:1087
msgctxt "MainWindow"
msgid "Data Directory"
msgstr ""
+#: mainwindow.cpp:1089
msgctxt "MainWindow"
msgid "Control Cookie (control_auth_cookie)"
msgstr ""
+#: mainwindow.cpp:1141
msgctxt "MainWindow"
msgid "Error Registering for Events"
msgstr ""
+#: mainwindow.cpp:1143
msgctxt "MainWindow"
-msgid ""
-"Vidalia was unable to register for some events. Many of Vidalia's features "
-"may be unavailable."
+msgid "Vidalia was unable to register for some events. Many of Vidalia's features may be unavailable."
msgstr ""
+#: mainwindow.cpp:1222
msgctxt "MainWindow"
msgid "Authentication Error"
msgstr ""
+#: mainwindow.cpp:1224
msgctxt "MainWindow"
msgid "Vidalia was unable to authenticate to the Tor software. (%1)"
msgstr ""
+#: mainwindow.cpp:1226
msgctxt "MainWindow"
msgid "Please check your control port authentication settings."
msgstr ""
+#: mainwindow.cpp:1330
msgctxt "MainWindow"
msgid "Tor Update Available"
msgstr ""
+#: mainwindow.cpp:1333
msgctxt "MainWindow"
-msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended. Please visit the Tor website to download the latest version."
+msgid "The currently installed version of Tor is out of date or no longer recommended. Please visit the Tor website to download the latest version."
msgstr ""
+#: mainwindow.cpp:1333
msgctxt "MainWindow"
msgid "Tor website: %1"
msgstr ""
+#: mainwindow.cpp:1394
msgctxt "MainWindow"
-msgid ""
-"All subsequent connections will appear to be different than your old "
-"connections."
+msgid "All subsequent connections will appear to be different than your old connections."
msgstr ""
+#: mainwindow.cpp:1409
msgctxt "MainWindow"
msgid "Failed to Create New Identity"
msgstr ""
+#: mainwindow.cpp:1458
msgctxt "MainWindow"
msgid "Port Forwarding Failed"
msgstr ""
+#: mainwindow.cpp:1459
msgctxt "MainWindow"
msgid "Vidalia was unable to configure automatic port forwarding."
msgstr ""
+#: mainwindow.ui:19
msgctxt "MainWindow"
msgid "Vidalia Control Panel"
msgstr ""
+#: mainwindow.ui:49
msgctxt "MainWindow"
msgid "Status"
msgstr ""
+#: mainwindow.ui:218
msgctxt "MainWindow"
msgid "Vidalia Shortcuts"
msgstr ""
+#: mainwindow.ui:243
msgctxt "MainWindow"
msgid "Setup Relaying"
msgstr ""
+#: mainwindow.ui:246
msgctxt "MainWindow"
msgid "Set up a relay and help the network grow"
msgstr ""
+#: mainwindow.ui:256
msgctxt "MainWindow"
msgid "View the Network"
msgstr ""
+#: mainwindow.ui:259
msgctxt "MainWindow"
msgid "View a map of the Tor network"
msgstr ""
+#: mainwindow.ui:272
msgctxt "MainWindow"
msgid "Use a New Identity"
msgstr ""
+#: mainwindow.ui:275
msgctxt "MainWindow"
msgid "Make subsequent connections appear new"
msgstr ""
+#: mainwindow.ui:307
msgctxt "MainWindow"
msgid "View recent bandwidth usage"
msgstr ""
+#: mainwindow.ui:320
msgctxt "MainWindow"
msgid "View log message history"
msgstr ""
+#: mainwindow.ui:370
msgctxt "MainWindow"
msgid "View help documentation"
msgstr ""
+#: mainwindow.ui:383
msgctxt "MainWindow"
msgid "Configure Vidalia"
msgstr ""
+#: mainwindow.ui:433
msgctxt "MainWindow"
msgid "View version and license information"
msgstr ""
+#: mainwindow.ui:446
msgctxt "MainWindow"
msgid "Exit Vidalia"
msgstr ""
+#: mainwindow.ui:498
msgctxt "MainWindow"
msgid "Show this window on startup"
msgstr ""
+#: mainwindow.ui:517
msgctxt "MainWindow"
msgid "Hide"
msgstr ""
+#: mainwindow.ui:520
msgctxt "MainWindow"
msgid "Hide this window"
msgstr ""
+#: mainwindow.cpp:1210
msgctxt "MainWindow"
-msgid "Password Reset Failed"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid ""
-"Vidalia tried to reset Tor's control password, but was not able to restart "
-"the Tor software. Please check your Task Manager to ensure there are no "
-"other Tor processes running."
-msgstr ""
-
-msgctxt "MainWindow"
-msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended."
-msgstr ""
-
-msgctxt "MainWindow"
-msgid ""
-"Would you like to check if a newer package is available for installation?"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Potentially Unsafe Connection"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid ""
-"Tor has automatically closed your connection in order to protect your "
-"anonymity."
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Update Failed"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Your software is up to date"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid ""
-"There are no new Tor software packages available for your computer at this "
-"time."
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Installation Failed"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Vidalia was unable to install your software updates."
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "The following error occurred:"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid ""
-"Anything sent over this connection could be monitored. Please check your "
-"application's configuration and use only encrypted protocols, such as SSL, "
-"if possible."
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Bootstrapping torrc from %1 to %2"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "(probably Telnet)"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "(probably an email client)"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid ""
-"One of your applications %1 appears to be making a potentially unencrypted "
-"and unsafe connection to port %2."
+msgid "Password Reset Failed"
msgstr ""
+#: mainwindow.cpp:1213
msgctxt "MainWindow"
-msgid "failed (%1)"
+msgid "Vidalia tried to reset Tor's control 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 ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+#: messagelog.cpp:126
+msgctxt "MessageLog"
+msgid "Messages that appear when something has "
+"gone very wrong and Tor cannot proceed."
msgstr ""
-msgctxt "MainWindow"
-msgid ""
-"Vidalia can't find out how to talk to Tor because it can't access this file: %1\n"
-"\n"
-"Here's the last error message:\n"
-"%2"
+#: messagelog.cpp:128
+msgctxt "MessageLog"
+msgid "Messages that only appear when "
+"something has gone wrong with Tor."
msgstr ""
-msgctxt "MainWindow"
-msgid ""
-"It seems Tor has stopped running since Vidalia started it.\n"
-"\n"
-"See the Advanced Message Log for more information."
+#: 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 ""
-"You are currently running a relay. Terminating your relay 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:134
+msgctxt "MessageLog"
+msgid "Messages that appear frequently "
+"during normal Tor operation."
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:136
+msgctxt "MessageLog"
+msgid "Hyper-verbose messages primarily of "
+"interest to Tor developers."
msgstr ""
+#: messagelog.cpp:189
msgctxt "MessageLog"
msgid "Error Setting Filter"
msgstr ""
+#: messagelog.cpp:190
msgctxt "MessageLog"
msgid "Vidalia was unable to register for Tor's log events."
msgstr ""
+#: messagelog.cpp:205
msgctxt "MessageLog"
msgid "Error Opening Log File"
msgstr ""
+#: messagelog.cpp:206
msgctxt "MessageLog"
msgid "Vidalia was unable to open the specified log file."
msgstr ""
+#: messagelog.cpp:227
msgctxt "MessageLog"
msgid "Log Filename Required"
msgstr ""
+#: messagelog.cpp:229
msgctxt "MessageLog"
msgid "You must enter a filename to be able to save log messages to a file."
msgstr ""
+#: messagelog.cpp:280
msgctxt "MessageLog"
msgid "Select Log File"
msgstr ""
+#: messagelog.cpp:297
msgctxt "MessageLog"
msgid "Save Log Messages"
msgstr ""
+#: messagelog.cpp:300
msgctxt "MessageLog"
msgid "Text Files (*.txt)"
msgstr ""
+#: messagelog.cpp:309
msgctxt "MessageLog"
msgid "Vidalia"
msgstr "Vidalia"
+#: messagelog.cpp:310
+msgctxt "MessageLog"
+msgid "Cannot write file %1"
+""
+"%2."
+msgstr ""
+
+#: messagelog.cpp:360
msgctxt "MessageLog"
msgid "Find in Message Log"
msgstr ""
+#: messagelog.cpp:361
msgctxt "MessageLog"
msgid "Find:"
msgstr ""
+#: messagelog.cpp:367
msgctxt "MessageLog"
msgid "Not Found"
msgstr ""
+#: messagelog.cpp:368
msgctxt "MessageLog"
msgid "Search found 0 matches."
msgstr ""
+#: messagelog.ui:19
msgctxt "MessageLog"
msgid "Message Log"
msgstr ""
+#: messagelog.ui:452
msgctxt "MessageLog"
msgid "Message Filters..."
msgstr ""
+#: messagelog.ui:455
msgctxt "MessageLog"
msgid "Set message filters"
msgstr ""
+#: messagelog.ui:463
msgctxt "MessageLog"
msgid "History Size..."
msgstr ""
+#: messagelog.ui:466
msgctxt "MessageLog"
msgid "Set maximum number of messages to display"
msgstr ""
+#: messagelog.ui:477
msgctxt "MessageLog"
msgid "Clear"
msgstr ""
+#: messagelog.ui:480
msgctxt "MessageLog"
msgid "Clear all messages from the Message Log (Ctrl+E)"
msgstr ""
+#: messagelog.ui:483
msgctxt "MessageLog"
msgid "Ctrl+E"
msgstr ""
+#: messagelog.ui:497
msgctxt "MessageLog"
msgid "Copy"
msgstr ""
+#: messagelog.ui:500
msgctxt "MessageLog"
msgid "Copy the selected messages to the clipboard (Ctrl+C)"
msgstr ""
+#: messagelog.ui:503
msgctxt "MessageLog"
msgid "Ctrl+C"
msgstr ""
+#: messagelog.ui:514
msgctxt "MessageLog"
msgid "Select All"
msgstr ""
+#: messagelog.ui:517
msgctxt "MessageLog"
msgid "Select all messages (Ctrl+A)"
msgstr ""
+#: messagelog.ui:520
msgctxt "MessageLog"
msgid "Ctrl+A"
msgstr ""
+#: messagelog.ui:528
msgctxt "MessageLog"
msgid "Save All"
msgstr ""
+#: messagelog.ui:531
msgctxt "MessageLog"
msgid "Save all messages to a file"
msgstr ""
+#: messagelog.ui:539
msgctxt "MessageLog"
msgid "Save Selected"
msgstr ""
+#: messagelog.ui:542
msgctxt "MessageLog"
msgid "Save selected messages to a file"
msgstr ""
+#: messagelog.ui:553
msgctxt "MessageLog"
msgid "Settings"
msgstr ""
+#: messagelog.ui:556
msgctxt "MessageLog"
msgid "Adjust Message Log Settings"
msgstr ""
+#: messagelog.ui:559
msgctxt "MessageLog"
msgid "Ctrl+T"
msgstr ""
+#: messagelog.ui:567
msgctxt "MessageLog"
msgid "Help"
msgstr ""
+#: messagelog.ui:570
msgctxt "MessageLog"
msgid "Show the help browser"
msgstr ""
+#: messagelog.ui:573
msgctxt "MessageLog"
msgid "F1"
msgstr ""
+#: messagelog.ui:581
msgctxt "MessageLog"
msgid "Close"
msgstr ""
+#: messagelog.ui:584
msgctxt "MessageLog"
msgid "Close the Message Log"
msgstr ""
+#: messagelog.ui:587
msgctxt "MessageLog"
msgid "Esc"
msgstr ""
+#: messagelog.ui:598
msgctxt "MessageLog"
msgid "Find"
msgstr ""
+#: messagelog.ui:601
msgctxt "MessageLog"
msgid "Find all messages containing the search text (Ctrl+F)"
msgstr ""
+#: messagelog.ui:604
msgctxt "MessageLog"
msgid "Ctrl+F"
msgstr ""
+#: messagelog.ui:66
msgctxt "MessageLog"
msgid "Time"
msgstr ""
+#: messagelog.ui:71
msgctxt "MessageLog"
msgid "Type"
msgstr ""
+#: messagelog.ui:76
msgctxt "MessageLog"
msgid "Message"
msgstr ""
+#: messagelog.ui:160
msgctxt "MessageLog"
msgid "Saves the current Message Log settings"
msgstr ""
+#: messagelog.ui:163
msgctxt "MessageLog"
msgid "Save Settings"
msgstr ""
+#: messagelog.ui:179
msgctxt "MessageLog"
msgid "Cancels changes made to settings"
msgstr ""
+#: messagelog.ui:182
msgctxt "MessageLog"
msgid "Cancel"
msgstr ""
+#: messagelog.ui:196
msgctxt "MessageLog"
msgid "Message Filter"
msgstr ""
+#: messagelog.ui:217
msgctxt "MessageLog"
msgid "Error"
msgstr ""
+#: messagelog.ui:233
msgctxt "MessageLog"
msgid "Warning"
msgstr ""
+#: messagelog.ui:249
msgctxt "MessageLog"
msgid "Notice"
msgstr ""
+#: messagelog.ui:265
msgctxt "MessageLog"
msgid "Info"
msgstr ""
+#: messagelog.ui:281
msgctxt "MessageLog"
msgid "Debug"
msgstr ""
+#: messagelog.ui:297
msgctxt "MessageLog"
msgid "Message Log History"
msgstr ""
+#: messagelog.ui:318
msgctxt "MessageLog"
msgid "Number of messages to display in the message log window"
msgstr ""
+#: messagelog.ui:337
msgctxt "MessageLog"
msgid "messages"
msgstr ""
-msgctxt "MessageLog"
-msgid "Browse"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Enable automatically saving all new log messages to a file"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Automatically save new log messages to a file"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Basic"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Tor Status"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Advanced"
-msgstr ""
-
+#: messagelog.ui:356
msgctxt "MessageLog"
msgid "Always Save New Log Messages"
msgstr ""
+#: messagelog.ui:371
msgctxt "MessageLog"
-msgid ""
-"Messages that appear when something has \n"
-"gone very wrong and Tor cannot proceed."
-msgstr ""
-
-msgctxt "MessageLog"
-msgid ""
-"Messages that only appear when \n"
-"something has gone wrong with Tor."
-msgstr ""
-
-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 ""
-
-msgctxt "MessageLog"
-msgid ""
-"Messages that appear frequently \n"
-"during normal Tor operation."
+msgid "Browse"
msgstr ""
+#: messagelog.ui:394
msgctxt "MessageLog"
-msgid ""
-"Hyper-verbose messages primarily of \n"
-"interest to Tor developers."
+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 ""
+#: netviewer.ui:24
msgctxt "NetViewer"
msgid "Tor Network Map"
msgstr ""
+#: netviewer.ui:239
msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
+#: netviewer.ui:245
msgctxt "NetViewer"
msgid "Refresh the list of Tor relays and connections"
msgstr ""
+#: netviewer.ui:248
msgctxt "NetViewer"
msgid "Ctrl+R"
msgstr ""
+#: netviewer.ui:256
msgctxt "NetViewer"
msgid "Help"
msgstr ""
+#: netviewer.ui:259
msgctxt "NetViewer"
msgid "Show the network map help"
msgstr ""
+#: netviewer.ui:262
msgctxt "NetViewer"
msgid "Show network map help"
msgstr ""
+#: netviewer.ui:265
msgctxt "NetViewer"
msgid "F1"
msgstr ""
+#: netviewer.ui:273
msgctxt "NetViewer"
msgid "Close"
msgstr ""
+#: netviewer.ui:279
msgctxt "NetViewer"
msgid "Close the network map"
msgstr ""
+#: netviewer.ui:282
msgctxt "NetViewer"
msgid "Esc"
msgstr ""
+#: netviewer.ui:290
msgctxt "NetViewer"
msgid "Zoom In"
msgstr ""
+#: netviewer.ui:296
msgctxt "NetViewer"
msgid "Zoom in on the network map"
msgstr ""
+#: netviewer.ui:299
msgctxt "NetViewer"
msgid "+"
msgstr ""
+#: netviewer.ui:307
msgctxt "NetViewer"
msgid "Zoom Out"
msgstr ""
+#: netviewer.ui:313
msgctxt "NetViewer"
msgid "Zoom out on the network map"
msgstr ""
+#: netviewer.ui:316
msgctxt "NetViewer"
msgid "-"
msgstr ""
+#: netviewer.ui:324
msgctxt "NetViewer"
msgid "Zoom To Fit"
msgstr ""
+#: netviewer.ui:330
msgctxt "NetViewer"
msgid "Zooms to fit all currently displayed circuits"
msgstr ""
+#: netviewer.ui:333
msgctxt "NetViewer"
msgid "Ctrl+Z"
msgstr ""
-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"
+#: networkpage.cpp:193
+msgctxt "NetworkPage"
+msgid "Invalid Bridge"
msgstr ""
-msgctxt "NetViewer"
-msgid "Ctrl+F"
+#: networkpage.cpp:194
+msgctxt "NetworkPage"
+msgid "The specified bridge identifier is not valid."
msgstr ""
+#: networkpage.cpp:241
msgctxt "NetworkPage"
msgid "Copy (Ctrl+C)"
msgstr ""
+#: networkpage.cpp:272
msgctxt "NetworkPage"
-msgid ""
-"You must specify both an IP address or hostname and a port number to "
-"configure Tor to use a proxy to access the Internet."
+msgid "You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet."
msgstr ""
+#: networkpage.cpp:278
msgctxt "NetworkPage"
-msgid ""
-"You must specify one or more ports to which your firewall allows you to "
-"connect."
+msgid "You must specify one or more ports to which your firewall allows you to connect."
msgstr ""
+#: networkpage.cpp:314
msgctxt "NetworkPage"
msgid "'%1' is not a valid port number."
msgstr ""
+#: networkpage.ui:25
msgctxt "NetworkPage"
msgid "Check if your local network requires a proxy to access the Internet"
msgstr ""
+#: networkpage.ui:28
msgctxt "NetworkPage"
msgid "I use a proxy to access the Internet"
msgstr ""
+#: networkpage.ui:58
msgctxt "NetworkPage"
msgid "Proxy Settings"
msgstr ""
+#: networkpage.ui:70
+msgctxt "NetworkPage"
+msgid "HTTP Proxy:"
+msgstr ""
+
+#: networkpage.ui:80
msgctxt "NetworkPage"
msgid "Username:"
msgstr ""
+#: networkpage.ui:90
+msgctxt "NetworkPage"
+msgid "Use this proxy for HTTPS also"
+msgstr ""
+
+#: networkpage.ui:108
msgctxt "NetworkPage"
msgid "Password:"
msgstr ""
+#: networkpage.ui:135
msgctxt "NetworkPage"
msgid "Port:"
msgstr ""
+#: networkpage.ui:176
msgctxt "NetworkPage"
msgid "Check to only connect to relays using ports allowed by your firewall"
msgstr ""
+#: networkpage.ui:179
msgctxt "NetworkPage"
msgid "My firewall only lets me connect to certain ports"
msgstr ""
+#: networkpage.ui:203
msgctxt "NetworkPage"
msgid "Firewall Settings"
msgstr ""
+#: networkpage.ui:215
msgctxt "NetworkPage"
msgid "Allowed Ports:"
msgstr ""
+#: networkpage.ui:225
msgctxt "NetworkPage"
msgid "80, 443"
msgstr ""
+#: networkpage.ui:235
msgctxt "NetworkPage"
-msgid ""
-"Check to encrypt directory requests and, optionally, use bridge relays to "
-"access the Tor network"
+msgid "Check to encrypt directory requests and, optionally, use bridge relays to access the Tor network"
msgstr ""
+#: networkpage.ui:238
msgctxt "NetworkPage"
msgid "My ISP blocks connections to the Tor network"
msgstr ""
+#: networkpage.ui:262
msgctxt "NetworkPage"
msgid "Bridge Settings"
msgstr ""
+#: networkpage.ui:274
msgctxt "NetworkPage"
-msgid "Add a Bridge:"
-msgstr ""
-
-msgctxt "NetworkPage"
-msgid "Remove the selected bridges from the list"
-msgstr ""
-
-msgctxt "NetworkPage"
-msgid "Copy the selected bridges to the clipboard"
-msgstr ""
-
-msgctxt "NetworkPage"
-msgid "Find Bridges Now"
-msgstr ""
-
-msgctxt "NetworkPage"
-msgid "<a href=\"bridges.finding\">How else can I find bridges?</a>"
-msgstr ""
-
-msgctxt "NetworkPage"
-msgid "<a href=\"bridges.finding\">How can I find bridges?</a>"
-msgstr ""
-
-msgctxt "NetworkPage"
-msgid ""
-"No new bridges are currently available. You can either wait a while and try "
-"again, or try another method of finding new bridges."
-msgstr ""
-
-msgctxt "NetworkPage"
-msgid "Click Help to see other methods of finding new bridges."
-msgstr ""
-
-msgctxt "NetworkPage"
-msgid "Address:"
-msgstr ""
-
-msgctxt "NetworkPage"
-msgid "Type:"
-msgstr ""
-
-msgctxt "NetworkPage"
-msgid "You must select the proxy type."
+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"
+msgid "Add a Bridge:"
msgstr ""
+#: networkpage.ui:318
msgctxt "NetworkPage"
-msgid "SOCKS 5"
+msgid "<a href=\"bridges.finding\">How do I find a bridge?</a>"
msgstr ""
+#: networkpage.ui:383
msgctxt "NetworkPage"
-msgid "HTTP / HTTPS"
+msgid "Remove the selected bridges from the list"
msgstr ""
+#: networkpage.ui:399
msgctxt "NetworkPage"
-msgid "You must specify one or more bridges."
+msgid "Copy the selected bridges to the clipboard"
msgstr ""
+#: policy.cpp:167
msgctxt "Policy"
msgid "accept"
msgstr ""
+#: policy.cpp:167
msgctxt "Policy"
msgid "reject"
msgstr ""
+#: routerdescriptor.cpp:76
msgctxt "RouterDescriptor"
msgid "Online"
msgstr ""
+#: routerdescriptor.cpp:78
msgctxt "RouterDescriptor"
msgid "Hibernating"
msgstr ""
+#: routerdescriptor.cpp:80
msgctxt "RouterDescriptor"
msgid "Offline"
msgstr ""
+#: routerdescriptorview.cpp:139
msgctxt "RouterDescriptorView"
msgid "Location:"
msgstr ""
+#: routerdescriptorview.cpp:143
msgctxt "RouterDescriptorView"
msgid "IP Address:"
msgstr ""
+#: routerdescriptorview.cpp:144
msgctxt "RouterDescriptorView"
msgid "Platform:"
msgstr ""
+#: routerdescriptorview.cpp:148
msgctxt "RouterDescriptorView"
msgid "Bandwidth:"
msgstr ""
+#: routerdescriptorview.cpp:150
msgctxt "RouterDescriptorView"
msgid "Uptime:"
msgstr ""
+#: routerdescriptorview.cpp:156
msgctxt "RouterDescriptorView"
msgid "Last Updated:"
msgstr ""
+#: routerdescriptorview.cpp:100
msgctxt "RouterDescriptorView"
-msgid "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 ""
-
-msgctxt "RouterInfoDialog"
-msgid "Summary"
-msgstr ""
-
-msgctxt "RouterInfoDialog"
-msgid "Name:"
-msgstr ""
-
-msgctxt "RouterInfoDialog"
-msgid "Status:"
+msgid "%1 days "
msgstr ""
-msgctxt "RouterInfoDialog"
-msgid "Location:"
-msgstr ""
-
-msgctxt "RouterInfoDialog"
-msgid "IP Address:"
-msgstr ""
-
-msgctxt "RouterInfoDialog"
-msgid "Platform:"
-msgstr ""
-
-msgctxt "RouterInfoDialog"
-msgid "Bandwidth:"
-msgstr ""
-
-msgctxt "RouterInfoDialog"
-msgid "Uptime:"
+#: routerdescriptorview.cpp:103
+msgctxt "RouterDescriptorView"
+msgid "%1 hours "
msgstr ""
-msgctxt "RouterInfoDialog"
-msgid "Contact:"
+#: routerdescriptorview.cpp:106
+msgctxt "RouterDescriptorView"
+msgid "%1 mins "
msgstr ""
-msgctxt "RouterInfoDialog"
-msgid "Last Updated:"
+#: routerdescriptorview.cpp:109
+msgctxt "RouterDescriptorView"
+msgid "%1 secs"
msgstr ""
-msgctxt "RouterInfoDialog"
-msgid "Descriptor"
+#: routerdescriptorview.cpp:48
+msgctxt "RouterDescriptorView"
+msgid "Copy"
msgstr ""
+#: routerlistitem.cpp:67
msgctxt "RouterListItem"
msgid "Offline"
msgstr ""
+#: routerlistitem.cpp:71
msgctxt "RouterListItem"
msgid "Hibernating"
msgstr ""
+#: routerlistitem.cpp:83
msgctxt "RouterListItem"
msgid "%1 KB/s"
msgstr ""
+#: routerlistwidget.cpp:49
msgctxt "RouterListWidget"
msgid "Relay"
msgstr ""
+#: routerlistwidget.cpp:74
msgctxt "RouterListWidget"
msgid "Zoom to Relay"
msgstr ""
+#: routerlistwidget.cpp:220
msgctxt "RouterListWidget"
msgid "%1 relays online"
msgstr ""
+#: routerlistwidget.cpp:67
msgctxt "RouterListWidget"
msgid "Copy"
msgstr ""
+#: routerlistwidget.cpp:68
msgctxt "RouterListWidget"
msgid "Nickname"
msgstr ""
+#: routerlistwidget.cpp:71
msgctxt "RouterListWidget"
msgid "Fingerprint"
msgstr ""
+#: serverpage.cpp:140
msgctxt "ServerPage"
msgid "Bridge Support Unavailable"
msgstr ""
+#: serverpage.cpp:143
msgctxt "ServerPage"
-msgid ""
-"You have configured Tor to act as a bridge relay for censored users, but "
-"your version of Tor does not support bridges."
+msgid "You have configured Tor to act as a bridge relay for censored users, but your version of Tor does not support bridges."
msgstr ""
+#: serverpage.cpp:145
msgctxt "ServerPage"
-msgid ""
-"Please upgrade your Tor software or configure Tor to act as a normal Tor "
-"relay."
+msgid "Please upgrade your Tor software or configure Tor to act as a normal Tor relay."
msgstr ""
+#: serverpage.cpp:199
msgctxt "ServerPage"
msgid "Your bridge relay is not running."
msgstr ""
+#: serverpage.cpp:263
msgctxt "ServerPage"
msgid "You must specify at least a relay nickname and port."
msgstr ""
+#: serverpage.ui:25
msgctxt "ServerPage"
msgid "Run as a client only"
msgstr ""
+#: serverpage.ui:32
+msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network"
+msgstr ""
+
+#: serverpage.ui:39
+msgctxt "ServerPage"
+msgid "Help censored users reach the Tor network (Tor 0.2.0.8-alpha or newer)"
+msgstr ""
+
+#: serverpage.ui:91
msgctxt "ServerPage"
msgid "Relay Port:"
msgstr ""
+#: serverpage.ui:110
msgctxt "ServerPage"
msgid "Enable to mirror the relay directory"
msgstr ""
+#: serverpage.ui:113
+msgctxt "ServerPage"
+msgid "Mirror the Relay Directory "
+msgstr ""
+
+#: serverpage.ui:139
msgctxt "ServerPage"
msgid "Attempt to automatically configure port forwarding"
msgstr ""
+#: serverpage.ui:154
msgctxt "ServerPage"
msgid "Test"
msgstr ""
+#: serverpage.ui:164
msgctxt "ServerPage"
msgid "Show help topic on port forwarding"
msgstr ""
+#: serverpage.ui:204
+msgctxt "ServerPage"
+msgid "Email address at which you may be reached if there is a"
+"problem with your relay. You might also include your PGP or GPG fingerprint."
+msgstr ""
+
+#: serverpage.ui:234
msgctxt "ServerPage"
msgid "Directory Port:"
msgstr ""
+#: serverpage.ui:267
msgctxt "ServerPage"
msgid "Directory Port Number"
msgstr ""
+#: serverpage.ui:279
msgctxt "ServerPage"
msgid "Contact Info:"
msgstr ""
+#: serverpage.ui:337
msgctxt "ServerPage"
msgid "Name of your relay"
msgstr ""
+#: serverpage.ui:370
msgctxt "ServerPage"
msgid "Port on which users and other relays can communicate with your relay"
msgstr ""
+#: serverpage.ui:380
msgctxt "ServerPage"
msgid "Nickname:"
msgstr ""
+#: serverpage.ui:76
msgctxt "ServerPage"
msgid "Basic Settings"
msgstr ""
+#: serverpage.ui:435
msgctxt "ServerPage"
-msgid ""
-"For Internet connections with fast download speed but slow upload, please "
-"list your upload speed here."
+msgid "For Internet connections with fast download speed but slow upload, please list your upload speed here."
msgstr ""
+#: serverpage.ui:466
msgctxt "ServerPage"
msgid "Cable/DSL 256 Kbps"
msgstr ""
+#: serverpage.ui:471
msgctxt "ServerPage"
msgid "Cable/DSL 512 Kbps"
msgstr ""
+#: serverpage.ui:476
msgctxt "ServerPage"
msgid "Cable/DSL 768 Kbps"
msgstr ""
+#: serverpage.ui:481
msgctxt "ServerPage"
msgid "T1/Cable/DSL 1.5 Mbps"
msgstr ""
+#: serverpage.ui:486
msgctxt "ServerPage"
msgid "> 1.5 Mbps"
msgstr ""
+#: serverpage.ui:491
msgctxt "ServerPage"
msgid "Custom"
msgstr ""
+#: serverpage.ui:456
msgctxt "ServerPage"
-msgid "Select the entry that most closely resembles your Internet connection"
-msgstr ""
-
-msgctxt "ServerPage"
-msgid "Show help topic on bandwidth rate limits"
-msgstr ""
-
-msgctxt "ServerPage"
-msgid "Average Rate"
-msgstr ""
-
-msgctxt "ServerPage"
-msgid "Long-term average bandwidth limit"
-msgstr ""
-
-msgctxt "ServerPage"
-msgid "KB/s"
-msgstr ""
-
-msgctxt "ServerPage"
-msgid "Maximum Rate"
-msgstr ""
-
-msgctxt "ServerPage"
-msgid "Peak bandwidth rate limit"
-msgstr ""
-
-msgctxt "ServerPage"
-msgid ""
-"Your maximum bandwidth rate must be greater than or equal to your average "
-"bandwidth rate. Both values must be at least 20 KB/s."
-msgstr ""
-
-msgctxt "ServerPage"
-msgid "Bandwidth Limits"
-msgstr ""
-
-msgctxt "ServerPage"
-msgid "Ports 6660 - 6669 and 6697"
-msgstr ""
-
-msgctxt "ServerPage"
-msgid "Internet Relay Chat (IRC)"
-msgstr ""
-
-msgctxt "ServerPage"
-msgid "Ports 110, 143, 993 and 995"
-msgstr ""
-
-msgctxt "ServerPage"
-msgid "Retrieve Mail (POP, IMAP)"
-msgstr ""
-
-msgctxt "ServerPage"
-msgid "Ports unspecified by other checkboxes"
-msgstr ""
-
-msgctxt "ServerPage"
-msgid "Misc Other Services"
-msgstr ""
-
-msgctxt "ServerPage"
-msgid "Ports 706, 1863, 5050, 5190, 5222, 5223, 8300 and 8888"
+msgid "Select the entry that most closely resembles your Internet connection"
msgstr ""
+#: serverpage.ui:502
msgctxt "ServerPage"
-msgid "Instant Messaging (IM)"
+msgid "Show help topic on bandwidth rate limits"
msgstr ""
+#: serverpage.ui:591
msgctxt "ServerPage"
-msgid "Port 443"
+msgid "Average Rate"
msgstr ""
+#: serverpage.ui:620
msgctxt "ServerPage"
-msgid "Secure Websites (SSL)"
+msgid "Long-term average bandwidth limit"
msgstr ""
+#: serverpage.ui:708
msgctxt "ServerPage"
-msgid "Port 80"
+msgid "KB/s"
msgstr ""
+#: serverpage.ui:666
msgctxt "ServerPage"
-msgid "Websites"
+msgid "Maximum Rate"
msgstr ""
+#: serverpage.ui:695
msgctxt "ServerPage"
-msgid "Show help topic on exit policies"
+msgid "Peak bandwidth rate limit"
msgstr ""
+#: serverpage.ui:737
msgctxt "ServerPage"
-msgid ""
-"What Internet resources should users be able to access from your relay?"
+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 ""
-"Tor will still block some outgoing mail and file sharing applications by "
-"default to reduce spam and other abuse."
+msgid "Bandwidth Limits"
msgstr ""
+#: serverpage.ui:802
msgctxt "ServerPage"
-msgid "Exit Policies"
+msgid "Ports 6660 - 6669 and 6697"
msgstr ""
+#: serverpage.ui:805
msgctxt "ServerPage"
-msgid "Let others access your bridge by giving them this line:"
+msgid "Internet Relay Chat (IRC)"
msgstr ""
+#: serverpage.ui:815
msgctxt "ServerPage"
-msgid ""
-"This is the identity of your bridge relay that you can give to other people"
+msgid "Ports 110, 143, 993 and 995"
msgstr ""
+#: serverpage.ui:818
msgctxt "ServerPage"
-msgid "Copy your bridge relay's identity to the clipboard"
+msgid "Retrieve Mail (POP, IMAP)"
msgstr ""
+#: serverpage.ui:828
msgctxt "ServerPage"
-msgid "No Recent Usage"
+msgid "Ports unspecified by other checkboxes"
msgstr ""
+#: serverpage.ui:831
msgctxt "ServerPage"
-msgid "No clients have used your relay recently."
+msgid "Misc Other Services"
msgstr ""
+#: serverpage.ui:841
msgctxt "ServerPage"
-msgid ""
-"Leave your relay running so clients have a better chance of finding and "
-"using it."
+msgid "Ports 706, 1863, 5050, 5190, 5222, 5223, 8300 and 8888"
msgstr ""
+#: serverpage.ui:844
msgctxt "ServerPage"
-msgid "Bridge History"
+msgid "Instant Messaging (IM)"
msgstr ""
+#: serverpage.ui:854
msgctxt "ServerPage"
-msgid "Vidalia was unable to retrieve your bridge's usage history."
+msgid "Port 443"
msgstr ""
+#: serverpage.ui:857
msgctxt "ServerPage"
-msgid ""
-"Tor returned an improperly formatted response when Vidalia requested your "
-"bridge's usage history."
+msgid "Secure Websites (SSL)"
msgstr ""
+#: serverpage.ui:867
msgctxt "ServerPage"
-msgid "The returned response was: %1"
+msgid "Port 80"
msgstr ""
+#: serverpage.ui:870
msgctxt "ServerPage"
-msgid "Help censored users reach the Tor network"
+msgid "Websites"
msgstr ""
+#: serverpage.ui:896
msgctxt "ServerPage"
-msgid "<a href=\"#bridgeUsage\">Who has used my bridge?</a>"
+msgid "Show help topic on exit policies"
msgstr ""
+#: serverpage.ui:969
msgctxt "ServerPage"
-msgid "<a href=\"#bridgeHelp\">What's this?</a>"
+msgid "What Internet resources should users be able to access from your relay?"
msgstr ""
+#: serverpage.ui:979
msgctxt "ServerPage"
-msgid "Automatically distribute my bridge address"
+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 "Relay traffic for the Tor network (exit relay)"
+msgid "Exit Policies"
msgstr ""
+#: serverpage.ui:1015
msgctxt "ServerPage"
-msgid "Relay traffic inside the Tor network (non-exit relay)"
+msgid "Let others access your bridge by giving them this line:"
msgstr ""
+#: serverpage.ui:1039
msgctxt "ServerPage"
-msgid "Mirror the Relay Directory"
+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 ""
+#: servicepage.cpp:116
msgctxt "ServicePage"
msgid "Error while trying to unpublish all services"
msgstr ""
+#: servicepage.cpp:123
msgctxt "ServicePage"
-msgid ""
-"Please configure at least a service directory and a virtual port for each "
-"service you want to save. Remove the other ones."
+msgid "Please configure at least a service directory and a virtual port for each service you want to save. Remove the other ones."
msgstr ""
+#: servicepage.cpp:597
msgctxt "ServicePage"
msgid "Error"
msgstr ""
+#: servicepage.cpp:452
msgctxt "ServicePage"
msgid "Please select a Service."
msgstr ""
+#: servicepage.cpp:458
msgctxt "ServicePage"
msgid "Select Service Directory"
msgstr ""
+#: servicepage.cpp:547
msgctxt "ServicePage"
msgid "Virtual Port may only contain valid port numbers [1..65535]."
msgstr ""
+#: servicepage.cpp:578
msgctxt "ServicePage"
msgid "Target may only contain address:port, address, or port."
msgstr ""
+#: servicepage.cpp:598
msgctxt "ServicePage"
msgid "Directory already in use by another service."
msgstr ""
+#: servicepage.ui:19
msgctxt "ServicePage"
msgid "Form"
msgstr ""
+#: servicepage.ui:31
msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
+#: servicepage.ui:56
msgctxt "ServicePage"
msgid "Onion Address"
msgstr ""
+#: servicepage.ui:61
msgctxt "ServicePage"
msgid "Virtual Port"
msgstr ""
+#: servicepage.ui:66
msgctxt "ServicePage"
msgid "Target"
msgstr ""
+#: servicepage.ui:71
msgctxt "ServicePage"
msgid "Directory Path"
msgstr ""
+#: servicepage.ui:76
msgctxt "ServicePage"
msgid "Enabled"
msgstr ""
+#: servicepage.ui:84
msgctxt "ServicePage"
msgid "Add new service to list"
msgstr ""
+#: servicepage.ui:97
msgctxt "ServicePage"
msgid "Remove selected service from list"
msgstr ""
+#: servicepage.ui:110
msgctxt "ServicePage"
msgid "Copy onion address of selected service to clipboard"
msgstr ""
+#: servicepage.ui:123
msgctxt "ServicePage"
msgid "Browse in local file system and choose directory for selected service"
msgstr ""
+#: servicepage.cpp:384
msgctxt "ServicePage"
msgid "Created by Tor"
msgstr ""
-msgctxt "StatusEventWidget"
-msgid "Copy to Clipboard"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "The Tor Software is Running"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "You are currently running version \"%1\" of the Tor software."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "The Tor Software is not Running"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Click \"Start Tor\" in the Vidalia Control Panel to restart the Tor "
-"software. If Tor exited unexpectedly, select the \"Advanced\" tab above for "
-"details about any errors encountered."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"You are currently running version \"%1\" of the Tor software, which is no "
-"longer recommended. Please upgrade to the most recent version of the "
-"software, which may contain important security, reliability and performance "
-"fixes."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"You are currently running version \"%1\" of the Tor software, which may no "
-"longer work with the current Tor network. Please upgrade to the most recent "
-"version of the software, which may contain important security, reliability "
-"and performance fixes."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Your Tor Software is Out-of-date"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Connected to the Tor Network"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"We were able to successfully establish a connection to the Tor network. You "
-"can now configure your applications to use the Internet anonymously."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Tor Software Error"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"The Tor software encountered an internal bug. Please report the following "
-"error message to the Tor developers at bugs.torproject.org: \"%1\""
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Tor has determined that your computer's clock may be set to %1 seconds in "
-"the past compared to the source \"%2\". If your clock is not correct, Tor "
-"will not be able to function. Please verify your computer displays the "
-"correct time."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Tor has determined that your computer's clock may be set to %1 seconds in "
-"the future compared to the source \"%2\". If your clock is not correct, Tor "
-"will not be able to function. Please verify your computer displays the "
-"correct time."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Your Computer's Clock is Potentially Incorrect"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"One of the applications on your computer may have attempted to make an "
-"unencrypted connection through Tor to port %1. Sending unencrypted "
-"information over the Tor network is dangerous and not recommended. For your "
-"protection, Tor has automatically closed this connection."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"One of the applications on your computer may have attempted to make an "
-"unencrypted connection through Tor to port %1. Sending unencrypted "
-"information over the Tor network is dangerous and not recommended."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Potentially Dangerous Connection!"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"One of your applications established a connection through Tor to \"%1\" "
-"using a protocol that may leak information about your destination. Please "
-"ensure you configure your applications to use only SOCKS4a or SOCKS5 with "
-"remote hostname resolution."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Unknown SOCKS Protocol"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"One of your applications tried to establish a connection through Tor using a"
-" protocol that Tor does not understand. Please ensure you configure your "
-"applications to use only SOCKS4a or SOCKS5 with remote hostname resolution."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Invalid Destination Hostname"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"One of your applications tried to establish a connection through Tor to "
-"\"%1\", which Tor does not recognize as a valid hostname. Please check your "
-"application's configuration."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "External IP Address Changed"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Tor has determined your relay's public IP address is currently %1%2. If that"
-" is not correct, please consider setting the 'Address' option in your "
-"relay's configuration."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "DNS Hijacking Detected"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Tor detected that your DNS provider is providing false responses for domains"
-" that do not exist. Some ISPs and other DNS providers, such as OpenDNS, are "
-"known to do this in order to display their own search or advertising pages."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Tor detected that your DNS provider is providing false responses for well "
-"known domains. Since clients rely on Tor network relays to provide accurate "
-"DNS repsonses, your relay will not be configured as an exit relay."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Checking Server Port Reachability"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Tor is trying to determine if your relay's server port is reachable from the"
-" Tor network by connecting to itself at %1:%2. This test could take several "
-"minutes."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Server Port Reachability Test Successful!"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Your relay's server port is reachable from the Tor network!"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Server Port Reachability Test Failed"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Your relay's server port is not reachable by other Tor clients. This can "
-"happen if you are behind a router or firewall that requires you to set up "
-"port forwarding. If %1:%2 is not your correct IP address and server port, "
-"please check your relay's configuration."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Checking Directory Port Reachability"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Tor is trying to determine if your relay's directory port is reachable from "
-"the Tor network by connecting to itself at %1:%2. This test could take "
-"several minutes."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Directory Port Reachability Test Successful!"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Your relay's directory port is reachable from the Tor network!"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Directory Port Reachability Test Failed"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Your relay's directory port is not reachable by other Tor clients. This can "
-"happen if you are behind a router or firewall that requires you to set up "
-"port forwarding. If %1:%2 is not your correct IP address and directory port,"
-" please check your relay's configuration."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Relay Descriptor Rejected"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Your relay's descriptor, which enables clients to connect to your relay, was"
-" rejected by the directory server at %1:%2. The reason given was: %3"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Your Relay is Online"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Your relay is now online and available for Tor clients to use. You should "
-"see an increase in network traffic shown by the Bandwidth Graph within a few"
-" hours as more clients learn about your relay. Thank you for contributing to"
-" the Tor network!"
-msgstr ""
-
+#: stream.cpp:131
msgctxt "Stream"
msgid "New"
msgstr "Новий"
+#: stream.cpp:133
msgctxt "Stream"
msgid "Resolving"
msgstr ""
+#: stream.cpp:134
msgctxt "Stream"
msgid "Connecting"
msgstr ""
+#: stream.cpp:135
msgctxt "Stream"
msgid "Open"
msgstr "Відкрити"
+#: stream.cpp:136
msgctxt "Stream"
msgid "Failed"
msgstr ""
+#: stream.cpp:137
msgctxt "Stream"
msgid "Closed"
msgstr ""
+#: stream.cpp:138
msgctxt "Stream"
msgid "Retrying"
msgstr ""
+#: stream.cpp:139
msgctxt "Stream"
msgid "Remapped"
msgstr ""
+#: stream.cpp:140
msgctxt "Stream"
msgid "Unknown"
msgstr ""
+#: torprocess.cpp:107
msgctxt "TorProcess"
msgid "Process %1 failed to stop. [%2]"
msgstr ""
+#: torservice.cpp:143
msgctxt "TorService"
msgid "The Tor service is not installed."
msgstr ""
+#: torservice.cpp:161
msgctxt "TorService"
msgid "Unable to start the Tor service."
msgstr ""
+#: torsettings.cpp:103
msgctxt "TorSettings"
msgid "Failed to hash the control password."
msgstr ""
-msgctxt "TorrcDialog"
-msgid "Editing torrc"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid ""
-"Save settings. If unchecked it will only apply settings to the current Tor "
-"instance."
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Cut"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Copy"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Paste"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Undo"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Redo"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Select All"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Apply all"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Apply selection only"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Error connecting to Tor"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Selection is empty. Please select some text, or check \"Apply all\""
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Error at line %1: \"%2\""
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Error"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "An error ocurred while opening torrc file"
-msgstr ""
-
+#: upnpcontrol.cpp:139
msgctxt "UPNPControl"
msgid "Success"
msgstr ""
+#: upnpcontrol.cpp:141
msgctxt "UPNPControl"
msgid "No UPnP-enabled devices found"
msgstr ""
+#: upnpcontrol.cpp:143
msgctxt "UPNPControl"
msgid "No valid UPnP-enabled Internet gateway devices found"
msgstr ""
+#: upnpcontrol.cpp:145
msgctxt "UPNPControl"
msgid "WSAStartup failed"
msgstr ""
+#: upnpcontrol.cpp:147
msgctxt "UPNPControl"
msgid "Failed to add a port mapping"
msgstr ""
+#: upnpcontrol.cpp:149
msgctxt "UPNPControl"
msgid "Failed to retrieve a port mapping"
msgstr ""
+#: upnpcontrol.cpp:151
msgctxt "UPNPControl"
msgid "Failed to remove a port mapping"
msgstr ""
+#: upnpcontrol.cpp:153
msgctxt "UPNPControl"
msgid "Unknown error"
msgstr ""
+#: upnptestdialog.cpp:112
msgctxt "UPNPTestDialog"
msgid "Discovering UPnP-enabled devices"
msgstr ""
+#: upnptestdialog.cpp:117
msgctxt "UPNPTestDialog"
msgid "Updating directory port mapping"
msgstr ""
+#: upnptestdialog.cpp:122
msgctxt "UPNPTestDialog"
msgid "Updating relay port mapping"
msgstr ""
+#: upnptestdialog.cpp:127
msgctxt "UPNPTestDialog"
msgid "Test completed successfully!"
msgstr ""
+#: upnptestdialog.ui:13
msgctxt "UPNPTestDialog"
msgid "Testing UPnP Support"
msgstr ""
+#: upnptestdialog.ui:92
msgctxt "UPNPTestDialog"
msgid "Testing Universal Plug & Play Support"
msgstr ""
-msgctxt "UpdateProcess"
-msgid ""
-"Vidalia was unable to check for available software updates because it could "
-"not find '%1'."
-msgstr ""
-
-msgctxt "UpdateProcess"
-msgid ""
-"Vidalia was unable to check for available software updates because Tor's "
-"update process exited unexpectedly."
-msgstr ""
-
-msgctxt "UpdateProgressDialog"
-msgid "Checking for available updates..."
-msgstr ""
-
-msgctxt "UpdateProgressDialog"
-msgid "Hide"
-msgstr ""
-
-msgctxt "UpdateProgressDialog"
-msgid "Downloading updates..."
-msgstr ""
-
-msgctxt "UpdateProgressDialog"
-msgid "Installing updated software..."
-msgstr ""
-
-msgctxt "UpdateProgressDialog"
-msgid "Done! Your software is now up to date."
-msgstr ""
-
-msgctxt "UpdateProgressDialog"
-msgid "OK"
-msgstr ""
-
-msgctxt "UpdateProgressDialog"
-msgid "Software Updates"
-msgstr ""
-
-msgctxt "UpdateProgressDialog"
-msgid "Checking for updates..."
-msgstr ""
-
-msgctxt "UpdateProgressDialog"
-msgid "Cancel"
-msgstr ""
-
-msgctxt "UpdatesAvailableDialog"
-msgid "Software Updates Available"
-msgstr ""
-
-msgctxt "UpdatesAvailableDialog"
-msgid "Remind Me Later"
-msgstr ""
-
-msgctxt "UpdatesAvailableDialog"
-msgid "Install"
-msgstr ""
-
-msgctxt "UpdatesAvailableDialog"
-msgid "The following updated software packages are ready for installation:"
-msgstr ""
-
-msgctxt "UpdatesAvailableDialog"
-msgid "Package"
-msgstr ""
-
-msgctxt "UpdatesAvailableDialog"
-msgid "Version"
-msgstr ""
-
+#: vmessagebox.cpp:77
msgctxt "VMessageBox"
msgid "OK"
msgstr ""
+#: vmessagebox.cpp:78
msgctxt "VMessageBox"
msgid "Cancel"
msgstr "Відмова"
+#: vmessagebox.cpp:79
msgctxt "VMessageBox"
msgid "Yes"
msgstr ""
+#: vmessagebox.cpp:80
msgctxt "VMessageBox"
msgid "No"
msgstr ""
+#: vmessagebox.cpp:81
msgctxt "VMessageBox"
msgid "Help"
msgstr ""
+#: vmessagebox.cpp:82
msgctxt "VMessageBox"
msgid "Retry"
msgstr ""
+#: vmessagebox.cpp:83
msgctxt "VMessageBox"
msgid "Show Log"
msgstr ""
+#: vmessagebox.cpp:84
msgctxt "VMessageBox"
msgid "Show Settings"
msgstr ""
+#: vmessagebox.cpp:85
msgctxt "VMessageBox"
msgid "Continue"
msgstr ""
+#: vmessagebox.cpp:86
msgctxt "VMessageBox"
msgid "Quit"
msgstr ""
+#: vmessagebox.cpp:87
msgctxt "VMessageBox"
msgid "Browse"
msgstr ""
+#: main.cpp:75
msgctxt "Vidalia"
msgid "Invalid Argument"
msgstr ""
+#: main.cpp:89
msgctxt "Vidalia"
msgid "Vidalia is already running"
msgstr ""
+#: main.cpp:95
+msgctxt "Vidalia"
+msgid "Another Vidalia process is possibly already running. If there really is not another Vidalia process running, you can choose to continue anyway."
+""
+"Would you like to continue starting Vidalia?"
+msgstr ""
+
+#: vidalia.cpp:169
msgctxt "Vidalia"
msgid "Displays this usage message and exits."
msgstr ""
+#: vidalia.cpp:171
msgctxt "Vidalia"
msgid "Resets ALL stored Vidalia settings."
msgstr ""
+#: vidalia.cpp:173
msgctxt "Vidalia"
msgid "Sets the directory Vidalia uses for data files."
msgstr ""
+#: vidalia.cpp:175
msgctxt "Vidalia"
msgid "Sets the name and location of Vidalia's pidfile."
msgstr ""
+#: vidalia.cpp:177
msgctxt "Vidalia"
msgid "Sets the name and location of Vidalia's logfile."
msgstr ""
+#: vidalia.cpp:180
msgctxt "Vidalia"
msgid "Sets the verbosity of Vidalia's logging."
msgstr ""
+#: vidalia.cpp:183
msgctxt "Vidalia"
msgid "Sets Vidalia's interface style."
msgstr ""
+#: vidalia.cpp:186
msgctxt "Vidalia"
msgid "Sets Vidalia's language."
msgstr ""
+#: vidalia.cpp:190
msgctxt "Vidalia"
msgid "Vidalia Usage Information"
msgstr ""
+#: vidalia.cpp:238
msgctxt "Vidalia"
-msgid "Unable to open log file '%1': %2"
-msgstr ""
-
-msgctxt "Vidalia"
-msgid "Value required for parameter :"
+msgid "Invalid language code specified: "
msgstr ""
+#: vidalia.cpp:245
msgctxt "Vidalia"
-msgid "Invalid language code specified:"
+msgid "Invalid GUI style specified: "
msgstr ""
+#: vidalia.cpp:251
msgctxt "Vidalia"
-msgid "Invalid GUI style specified:"
+msgid "Invalid log level specified: "
msgstr ""
+#: vidalia.cpp:257
msgctxt "Vidalia"
-msgid "Invalid log level specified:"
-msgstr ""
-
-msgctxt "Vidalia"
-msgid ""
-"Another Vidalia process is possibly already running. If there really is not another Vidalia process running, you can choose to continue anyway.\n"
-"\n"
-"Would you like to continue starting Vidalia?"
-msgstr ""
-
-msgctxt "stringutil.h"
-msgid "%1 secs"
-msgstr ""
-
-msgctxt "stringutil.h"
-msgid "%1 B/s"
-msgstr ""
-
-msgctxt "stringutil.h"
-msgid "%1 KB/s"
-msgstr ""
-
-msgctxt "stringutil.h"
-msgid "%1 MB/s"
-msgstr ""
-
-msgctxt "stringutil.h"
-msgid "%1 GB/s"
-msgstr ""
-
-msgctxt "stringutil.h"
-msgid "%1 days"
-msgstr ""
-
-msgctxt "stringutil.h"
-msgid "%1 hours"
-msgstr ""
-
-msgctxt "stringutil.h"
-msgid "%1 mins"
+msgid "Unable to open log file '%1': %2"
msgstr ""
diff --git a/src/vidalia/i18n/po/ur/qt_ur.po b/src/vidalia/i18n/po/ur/qt_ur.po
index 37486cb..f36d98e 100644
--- a/src/vidalia/i18n/po/ur/qt_ur.po
+++ b/src/vidalia/i18n/po/ur/qt_ur.po
@@ -1,11 +1,10 @@
#
-# Translators:
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-08-20 03:25+0000\n"
-"PO-Revision-Date: 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"
@@ -431,5 +430,3 @@ msgstr ""
msgctxt "QFileSystemModel"
msgid "%1 bytes"
msgstr ""
-
-
diff --git a/src/vidalia/i18n/po/ur/vidalia_ur.po b/src/vidalia/i18n/po/ur/vidalia_ur.po
index 7ae0e45..219c3e1 100644
--- a/src/vidalia/i18n/po/ur/vidalia_ur.po
+++ b/src/vidalia/i18n/po/ur/vidalia_ur.po
@@ -1,11 +1,10 @@
#
-# Translators:
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-09-07 14:40+0000\n"
-"PO-Revision-Date: 2010-12-05 20:03+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"
@@ -193,10 +192,6 @@ 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"
@@ -236,10 +231,6 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr ""
-
-msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -279,6 +270,10 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr ""
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -432,17 +427,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"
@@ -1266,44 +1270,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"
@@ -1331,10 +1342,6 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr ""
-
-msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1362,6 +1369,10 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr ""
+
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1644,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 ""
@@ -1680,10 +1663,6 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1796,10 +1775,6 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1882,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 ""
@@ -1934,82 +1897,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 ""
@@ -2057,19 +1949,39 @@ 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)"
+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"
@@ -2091,17 +2003,35 @@ msgid ""
msgstr ""
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"
@@ -2357,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"
@@ -2412,10 +2334,6 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2515,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 ""
@@ -2840,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 ""
@@ -3088,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 ""
@@ -3132,10 +3070,6 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
-msgid "Form"
-msgstr ""
-
-msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3424,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 ""
@@ -3460,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 ""
@@ -3538,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 ""
@@ -3666,6 +3646,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 ""
@@ -3759,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 ""
@@ -3812,5 +3796,3 @@ msgstr ""
msgctxt "stringutil.h"
msgid "%1 mins"
msgstr ""
-
-
diff --git a/src/vidalia/i18n/po/ve/qt_ve.po b/src/vidalia/i18n/po/ve/qt_ve.po
index c9b23af..50cdcbb 100644
--- a/src/vidalia/i18n/po/ve/qt_ve.po
+++ b/src/vidalia/i18n/po/ve/qt_ve.po
@@ -1,11 +1,10 @@
#
-# Translators:
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-08-20 03:25+0000\n"
-"PO-Revision-Date: 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"
@@ -431,5 +430,3 @@ msgstr ""
msgctxt "QFileSystemModel"
msgid "%1 bytes"
msgstr ""
-
-
diff --git a/src/vidalia/i18n/po/ve/vidalia_ve.po b/src/vidalia/i18n/po/ve/vidalia_ve.po
index 5f4d7a6..a3e9723 100644
--- a/src/vidalia/i18n/po/ve/vidalia_ve.po
+++ b/src/vidalia/i18n/po/ve/vidalia_ve.po
@@ -1,11 +1,10 @@
#
-# Translators:
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-09-07 14:40+0000\n"
-"PO-Revision-Date: 2010-12-05 20:03+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"
@@ -193,10 +192,6 @@ 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"
@@ -236,10 +231,6 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr ""
-
-msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -279,6 +270,10 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr ""
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -432,17 +427,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"
@@ -1266,44 +1270,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"
@@ -1331,10 +1342,6 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr ""
-
-msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1362,6 +1369,10 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr ""
+
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1644,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 ""
@@ -1680,10 +1663,6 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1796,10 +1775,6 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1882,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 ""
@@ -1934,82 +1897,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 ""
@@ -2057,19 +1949,39 @@ 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)"
+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"
@@ -2091,17 +2003,35 @@ msgid ""
msgstr ""
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"
@@ -2357,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"
@@ -2412,10 +2334,6 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2515,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 ""
@@ -2840,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 ""
@@ -3088,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 ""
@@ -3132,10 +3070,6 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
-msgid "Form"
-msgstr ""
-
-msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3424,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 ""
@@ -3460,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 ""
@@ -3538,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 ""
@@ -3666,6 +3646,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 ""
@@ -3759,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 ""
@@ -3812,5 +3796,3 @@ msgstr ""
msgctxt "stringutil.h"
msgid "%1 mins"
msgstr ""
-
-
diff --git a/src/vidalia/i18n/po/vi/qt_vi.po b/src/vidalia/i18n/po/vi/qt_vi.po
index 0e29a97..678ff54 100644
--- a/src/vidalia/i18n/po/vi/qt_vi.po
+++ b/src/vidalia/i18n/po/vi/qt_vi.po
@@ -1,11 +1,10 @@
#
-# Translators:
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-08-20 03:25+0000\n"
-"PO-Revision-Date: 2010-12-05 19:59+0000\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"
@@ -431,5 +430,3 @@ msgstr ""
msgctxt "QFileSystemModel"
msgid "%1 bytes"
msgstr ""
-
-
diff --git a/src/vidalia/i18n/po/vi/vidalia_vi.po b/src/vidalia/i18n/po/vi/vidalia_vi.po
index 76a7276..a56b42a 100755
--- a/src/vidalia/i18n/po/vi/vidalia_vi.po
+++ b/src/vidalia/i18n/po/vi/vidalia_vi.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: 2012-03-21 17:52+0000\n"
-"PO-Revision-Date: 2012-03-22 08:52+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,17 +194,6 @@ msgid "Select a file to use for Tor socket path"
msgstr ""
msgctxt "AdvancedPage"
-msgid "Configure ControlPort automatically"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid ""
-"You've checked the autoconfiguration option for the ControlPort, but "
-"provided no Data Directory. Please add one, or uncheck the \"Configure "
-"ControlPort automatically\" option."
-msgstr ""
-
-msgctxt "AdvancedPage"
msgid ""
"Vidalia was unable to remove the Tor service.\n"
"\n"
@@ -231,23 +220,6 @@ msgctxt "AppearancePage"
msgid "Vidalia was unable to load the selected language translation."
msgstr "Vidalia không thể nạp phiên dịch ngôn ngữ đã được chọn."
-msgctxt "AppearancePage"
-msgid ""
-"System Icon Preferences (changes will take effect when you restart Vidalia)"
-msgstr ""
-
-msgctxt "AppearancePage"
-msgid "Show the Tray Icon and Dock Icon (default)"
-msgstr ""
-
-msgctxt "AppearancePage"
-msgid "Hide the Tray Icon"
-msgstr ""
-
-msgctxt "AppearancePage"
-msgid "Hide the Dock Icon"
-msgstr ""
-
msgctxt "BandwidthGraph"
msgid "Since:"
msgstr "Kể từ:"
@@ -261,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"
@@ -304,6 +272,10 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr "Thôi"
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr ""
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -457,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"
@@ -1291,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"
@@ -1356,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"
@@ -1387,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"
@@ -1669,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"
@@ -1705,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"
@@ -1773,6 +1729,10 @@ msgid "Connected to the Tor network!"
msgstr "Kết nối với mạng Tor!"
msgctxt "MainWindow"
+msgid "Unrecognized startup status"
+msgstr "Tình trạng khởi động không được công nhận"
+
+msgctxt "MainWindow"
msgid "miscellaneous"
msgstr "hỗn hợp"
@@ -1817,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"
@@ -1903,18 +1859,6 @@ msgid ""
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."
-
-msgctxt "MainWindow"
msgid "Tor Update Available"
msgstr "Có sẵn Cập nhật Tor "
@@ -1955,82 +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 ""
@@ -2078,66 +1951,89 @@ 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 "Bootstrapping torrc from %1 to %2"
+msgid "toolBar"
msgstr ""
msgctxt "MainWindow"
-msgid "(probably Telnet)"
+msgid "Start"
msgstr ""
msgctxt "MainWindow"
-msgid "(probably an email client)"
+msgid "Stop"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"One of your applications %1 appears to be making a potentially unencrypted "
-"and unsafe connection to port %2."
+msgid "Restart"
msgstr ""
msgctxt "MainWindow"
-msgid "failed (%1)"
+msgid "Reload Tor's config"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+msgid "Actions"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Bootstrapping torrc from %1 to %2"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia can't find out how to talk to Tor because it can't access this file: %1\n"
+"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
"\n"
-"Here's the last error message:\n"
-"%2"
+"Would you like to shutdown gracefully and give clients time to find a new relay?"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"It seems Tor has stopped running since Vidalia started it.\n"
+"Vidalia detected that the Tor software exited unexpectedly.\n"
"\n"
-"See the Advanced Message Log for more information."
+"Please check the message log for recent warning or error messages."
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?"
+"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 ""
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 "Error reloading configuration"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to reload Tor's configuration."
msgstr ""
msgctxt "MessageLog"
@@ -2393,22 +2289,14 @@ 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 ""
+msgid "Always Save New Log Messages"
+msgstr "Luôn luôn Đăng Lưu Thông điệp mới"
msgctxt "MessageLog"
-msgid "Tor Status"
+msgid "toolbar"
msgstr ""
msgctxt "MessageLog"
-msgid "Advanced"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
-msgstr "Luôn luôn Đăng Lưu Thông điệp mới"
-
-msgctxt "MessageLog"
msgid ""
"Messages that appear when something has \n"
"gone very wrong and Tor cannot proceed."
@@ -2448,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"
@@ -2551,6 +2435,30 @@ 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ệ"
+
+msgctxt "NetworkPage"
+msgid "The specified bridge identifier is not valid."
+msgstr "Su*. định danh cây cầu được chỉ định là không hợp lệ."
+
msgctxt "NetworkPage"
msgid "Copy (Ctrl+C)"
msgstr "Sao chép (Ctrl+C)"
@@ -2684,11 +2592,11 @@ msgid "SOCKS 5"
msgstr ""
msgctxt "NetworkPage"
-msgid "HTTP / HTTPS"
+msgid "HTTP"
msgstr ""
msgctxt "NetworkPage"
-msgid "You must specify one or more bridges."
+msgid "HTTP / HTTPS"
msgstr ""
msgctxt "Policy"
@@ -3112,11 +3020,11 @@ msgid "Automatically distribute my bridge address"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network (exit relay)"
+msgid "Relay traffic inside the Tor network (non-exit relay)"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic inside the Tor network (non-exit relay)"
+msgid "Relay traffic for the Tor network (exit relay)"
msgstr ""
msgctxt "ServerPage"
@@ -3164,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"
@@ -3456,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"
@@ -3492,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]"
@@ -3570,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"
@@ -3698,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 "OK"
@@ -3791,10 +3749,6 @@ msgid "Unable to open log file '%1': %2"
msgstr "Không thể mở hồ sơ đăng nhập '%1':% 2"
msgctxt "Vidalia"
-msgid "Value required for parameter :"
-msgstr ""
-
-msgctxt "Vidalia"
msgid "Invalid language code specified:"
msgstr ""
diff --git a/src/vidalia/i18n/po/wa/qt_wa.po b/src/vidalia/i18n/po/wa/qt_wa.po
index 8257c11..a1a50ff 100644
--- a/src/vidalia/i18n/po/wa/qt_wa.po
+++ b/src/vidalia/i18n/po/wa/qt_wa.po
@@ -1,11 +1,10 @@
#
-# Translators:
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-08-20 03:25+0000\n"
-"PO-Revision-Date: 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"
@@ -431,5 +430,3 @@ msgstr ""
msgctxt "QFileSystemModel"
msgid "%1 bytes"
msgstr ""
-
-
diff --git a/src/vidalia/i18n/po/wa/vidalia_wa.po b/src/vidalia/i18n/po/wa/vidalia_wa.po
index 1036dbb..22b0f4e 100644
--- a/src/vidalia/i18n/po/wa/vidalia_wa.po
+++ b/src/vidalia/i18n/po/wa/vidalia_wa.po
@@ -1,18 +1,15 @@
-#
-# Translators:
+#, fuzzy
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: 2010-12-05 20:03+0000\n"
-"Last-Translator: \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: 2009-05-19 23:56+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
+"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: wa\n"
-"Plural-Forms: nplurals=2; plural=(n > 1)\n"
"X-Generator: Vidalia ts2po 0.2\n"
msgctxt "AboutDialog"
@@ -35,13 +32,28 @@ msgctxt "AboutDialog"
msgid "Qt 4.4.2"
msgstr ""
+msgctxt "AboutDialog"
+msgid "Vidalia"
+msgstr ""
+
+msgctxt "AboutDialog"
+msgid "Tor"
+msgstr ""
+
+msgctxt "AboutDialog"
+msgid "Qt"
+msgstr ""
+
+msgctxt "AboutDialog"
+msgid "version"
+msgstr ""
+
msgctxt "AdvancedPage"
msgid "'%1' is not a valid IP address."
msgstr ""
msgctxt "AdvancedPage"
-msgid ""
-"You selected 'Password' authentication, but did not specify a password."
+msgid "You selected 'Password' authentication, but did not specify a password."
msgstr ""
msgctxt "AdvancedPage"
@@ -81,6 +93,10 @@ msgid "Vidalia was unable to install the Tor service."
msgstr ""
msgctxt "AdvancedPage"
+msgid "Control Port"
+msgstr ""
+
+msgctxt "AdvancedPage"
msgid "Authentication:"
msgstr ""
@@ -137,68 +153,7 @@ msgid "Select the directory used to store data for the Tor software"
msgstr ""
msgctxt "AdvancedPage"
-msgid "Tor Control"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "Use TCP connection (ControlPort)"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "Path:"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "Use Unix domain socket (ControlSocket)"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "Edit current torrc"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "NOTE: this will edit the currently loaded torrc"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "ControlSocket path doesn't exist."
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid ""
-"The specified Tor configuration file location contains characters that "
-"cannot be represented in your system's current 8-bit character encoding."
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid ""
-"The specified Tor data directory location contains characters that cannot be"
-" represented in your system's current 8-bit character encoding."
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "Warning"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "You changed torrc path, would you like to restart Tor?"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "Tor Configuration File (torrc);;All Files (*)"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "Select a file to use for Tor socket path"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "Configure ControlPort automatically"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid ""
-"Vidalia was unable to remove the Tor service.\n"
+msgid "Vidalia was unable to remove the Tor service.\n"
"\n"
"You may need to remove it manually."
msgstr ""
@@ -440,9 +395,7 @@ msgid "Remember my password"
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid ""
-"Vidalia has connected to a running Tor process that requires a password. "
-"Please enter your control password:"
+msgid "Vidalia has connected to a running Tor process that requires a password. Please enter your control password:"
msgstr ""
msgctxt "ControlSocket"
@@ -1158,10 +1111,6 @@ msgid "Zimbabwe"
msgstr ""
msgctxt "CountryInfo"
-msgid "Zaire"
-msgstr ""
-
-msgctxt "CountryInfo"
msgid "Albania"
msgstr ""
@@ -1257,55 +1206,6 @@ msgctxt "CountryInfo"
msgid "Taiwan"
msgstr ""
-msgctxt "CrashReportDialog"
-msgid "Submit a Crash Report"
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid "Vidalia encountered an error and needed to close"
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid "Restart Vidalia"
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid "Don't Restart"
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid "Unable to restart Vidalia"
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid ""
-"We were unable to automatically restart Vidalia. Please restart Vidalia "
-"manually."
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid "Please fill a ticket in:"
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid ""
-"<a "
-"href=\"https://trac.torproject.org/projects/tor/newticket\">https://trac.torproject.org/projects/tor/newticket</a>"
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid ""
-"A crash report has been created that you can send to the Vidalia developers "
-"to help identify and fix the problem. The submitted report does not contain "
-"any personally identifying information."
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid ""
-"with a description of what you were doing before the application crashed, "
-"along with the following files corresponding to the crash report:"
-msgstr ""
-
msgctxt "GeneralPage"
msgid "Executables (*.exe)"
msgstr ""
@@ -1323,6 +1223,10 @@ msgid "You must specify the name of your Tor executable."
msgstr ""
msgctxt "GeneralPage"
+msgid "The proxy arguments specified are not properly formatted."
+msgstr ""
+
+msgctxt "GeneralPage"
msgid "Start Vidalia when my system starts"
msgstr ""
@@ -1519,10 +1423,7 @@ msgid "Opening External Link"
msgstr ""
msgctxt "HelpTextBrowser"
-msgid ""
-"Vidalia can open the link you selected in your default Web browser. If your "
-"browser is not currently configured to use Tor then the request will not be "
-"anonymous."
+msgid "Vidalia can open the link you selected in your default Web browser. If your browser is not currently configured to use Tor then the request will not be anonymous."
msgstr ""
msgctxt "HelpTextBrowser"
@@ -1534,9 +1435,7 @@ msgid "Unable to Open Link"
msgstr ""
msgctxt "HelpTextBrowser"
-msgid ""
-"Vidalia was unable to open the selected link in your Web browser. You can "
-"still copy the URL and paste it into your browser."
+msgid "Vidalia was unable to open the selected link in your Web browser. You can still copy the URL and paste it into your browser."
msgstr ""
msgctxt "HelpTextBrowser"
@@ -1579,30 +1478,6 @@ msgctxt "LogEvent"
msgid "Unknown"
msgstr ""
-msgctxt "LogTreeItem"
-msgid "Debug"
-msgstr ""
-
-msgctxt "LogTreeItem"
-msgid "Info"
-msgstr ""
-
-msgctxt "LogTreeItem"
-msgid "Notice"
-msgstr ""
-
-msgctxt "LogTreeItem"
-msgid "Warning"
-msgstr ""
-
-msgctxt "LogTreeItem"
-msgid "Error"
-msgstr ""
-
-msgctxt "LogTreeItem"
-msgid "Unknown"
-msgstr ""
-
msgctxt "MainWindow"
msgid "Start Tor"
msgstr ""
@@ -1816,9 +1691,7 @@ msgid "Error Starting Tor"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Vidalia was unable to start Tor. Check your settings to ensure the correct "
-"name and location of your Tor executable is specified."
+msgid "Vidalia was unable to start Tor. Check your settings to ensure the correct name and location of your Tor executable is specified."
msgstr ""
msgctxt "MainWindow"
@@ -1854,9 +1727,7 @@ msgid "Cookie Authentication Required"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"The Tor software requires Vidalia to send the contents of an authentication "
-"cookie, but Vidalia was unable to find one."
+msgid "The Tor software requires Vidalia to send the contents of an authentication cookie, but Vidalia was unable to find one."
msgstr ""
msgctxt "MainWindow"
@@ -1876,9 +1747,7 @@ msgid "Error Registering for Events"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Vidalia was unable to register for some events. Many of Vidalia's features "
-"may be unavailable."
+msgid "Vidalia was unable to register for some events. Many of Vidalia's features may be unavailable."
msgstr ""
msgctxt "MainWindow"
@@ -1898,9 +1767,7 @@ msgid "Tor Update Available"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended. Please visit the Tor website to download the latest version."
+msgid "The currently installed version of Tor is out of date or no longer recommended. Please visit the Tor website to download the latest version."
msgstr ""
msgctxt "MainWindow"
@@ -1908,9 +1775,7 @@ msgid "Tor website: %1"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"All subsequent connections will appear to be different than your old "
-"connections."
+msgid "All subsequent connections will appear to be different than your old connections."
msgstr ""
msgctxt "MainWindow"
@@ -2002,21 +1867,15 @@ msgid "Password Reset Failed"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Vidalia tried to reset Tor's control password, but was not able to restart "
-"the Tor software. Please check your Task Manager to ensure there are no "
-"other Tor processes running."
+msgid "Vidalia tried to reset Tor's control password, but was not able to restart the Tor software. Please check your Task Manager to ensure there are no other Tor processes running."
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended."
+msgid "The currently installed version of Tor is out of date or no longer recommended."
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Would you like to check if a newer package is available for installation?"
+msgid "Would you like to check if a newer package is available for installation?"
msgstr ""
msgctxt "MainWindow"
@@ -2024,9 +1883,11 @@ msgid "Potentially Unsafe Connection"
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 ""
msgctxt "MainWindow"
@@ -2038,9 +1899,7 @@ msgid "Your software is up to date"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"There are no new Tor software packages available for your computer at this "
-"time."
+msgid "There are no new Tor software packages available for your computer at this time."
msgstr ""
msgctxt "MainWindow"
@@ -2056,52 +1915,52 @@ msgid "The following error occurred:"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Anything sent over this connection could be monitored. Please check your "
-"application's configuration and use only encrypted protocols, such as SSL, "
-"if possible."
-msgstr ""
-
-msgctxt "MainWindow"
msgid "failed (%1)"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
+msgid "Your relay is shutting down.\n"
"Click 'Stop' again to stop your relay now."
msgstr ""
msgctxt "MainWindow"
-msgid "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 ""
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 ""
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 ""
+
+msgctxt "MainWindow"
+msgid "File"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "About Vidalia"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Home"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Check For Updates"
msgstr ""
msgctxt "MessageLog"
@@ -2345,68 +2204,50 @@ 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"
+msgid "Always Save New Log Messages"
msgstr ""
msgctxt "MessageLog"
-msgid "Tor Status"
+msgid "Browse"
msgstr ""
msgctxt "MessageLog"
-msgid "Advanced"
+msgid "Enable automatically saving all new log messages to a file"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
+msgid "Automatically save new log messages to a file"
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 ""
msgctxt "MessageLog"
-msgid ""
-"Messages that only appear when \n"
+msgid "Messages that only appear when \n"
"something has gone wrong with Tor."
msgstr ""
msgctxt "MessageLog"
-msgid ""
-"Messages that appear infrequently \n"
+msgid "Messages that appear infrequently \n"
"during normal Tor operation and are \n"
"not considered errors, but you may \n"
"care about."
msgstr ""
msgctxt "MessageLog"
-msgid ""
-"Messages that appear frequently \n"
+msgid "Messages that appear frequently \n"
"during normal Tor operation."
msgstr ""
msgctxt "MessageLog"
-msgid ""
-"Hyper-verbose messages primarily of \n"
+msgid "Hyper-verbose messages primarily of \n"
"interest to Tor developers."
msgstr ""
msgctxt "MessageLog"
-msgid ""
-"Cannot write file %1\n"
+msgid "Cannot write file %1\n"
"\n"
"%2."
msgstr ""
@@ -2528,15 +2369,11 @@ msgid "Copy (Ctrl+C)"
msgstr ""
msgctxt "NetworkPage"
-msgid ""
-"You must specify both an IP address or hostname and a port number to "
-"configure Tor to use a proxy to access the Internet."
+msgid "You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet."
msgstr ""
msgctxt "NetworkPage"
-msgid ""
-"You must specify one or more ports to which your firewall allows you to "
-"connect."
+msgid "You must specify one or more ports to which your firewall allows you to connect."
msgstr ""
msgctxt "NetworkPage"
@@ -2556,10 +2393,18 @@ msgid "Proxy Settings"
msgstr ""
msgctxt "NetworkPage"
+msgid "HTTP Proxy:"
+msgstr ""
+
+msgctxt "NetworkPage"
msgid "Username:"
msgstr ""
msgctxt "NetworkPage"
+msgid "Use this proxy for HTTPS also"
+msgstr ""
+
+msgctxt "NetworkPage"
msgid "Password:"
msgstr ""
@@ -2588,9 +2433,7 @@ msgid "80, 443"
msgstr ""
msgctxt "NetworkPage"
-msgid ""
-"Check to encrypt directory requests and, optionally, use bridge relays to "
-"access the Tor network"
+msgid "Check to encrypt directory requests and, optionally, use bridge relays to access the Tor network"
msgstr ""
msgctxt "NetworkPage"
@@ -2602,10 +2445,18 @@ msgid "Bridge Settings"
msgstr ""
msgctxt "NetworkPage"
+msgid "The Tor software you are currently running does not support bridges. <br>Directory connections will still be encrypted."
+msgstr ""
+
+msgctxt "NetworkPage"
msgid "Add a Bridge:"
msgstr ""
msgctxt "NetworkPage"
+msgid "<a href=\"bridges.finding\">How do I find a bridge?</a>"
+msgstr ""
+
+msgctxt "NetworkPage"
msgid "Remove the selected bridges from the list"
msgstr ""
@@ -2626,43 +2477,13 @@ msgid "<a href=\"bridges.finding\">How can I find bridges?</a>"
msgstr ""
msgctxt "NetworkPage"
-msgid ""
-"No new bridges are currently available. You can either wait a while and try "
-"again, or try another method of finding new bridges."
+msgid "No new bridges are currently available. You can either wait a while and try again, or try another method of finding new bridges."
msgstr ""
msgctxt "NetworkPage"
msgid "Click Help to see other methods of finding new bridges."
msgstr ""
-msgctxt "NetworkPage"
-msgid "Address:"
-msgstr ""
-
-msgctxt "NetworkPage"
-msgid "Type:"
-msgstr ""
-
-msgctxt "NetworkPage"
-msgid "You must select the proxy type."
-msgstr ""
-
-msgctxt "NetworkPage"
-msgid "SOCKS 4"
-msgstr ""
-
-msgctxt "NetworkPage"
-msgid "SOCKS 5"
-msgstr ""
-
-msgctxt "NetworkPage"
-msgid "HTTP"
-msgstr ""
-
-msgctxt "NetworkPage"
-msgid "HTTP / HTTPS"
-msgstr ""
-
msgctxt "Policy"
msgid "accept"
msgstr ""
@@ -2816,15 +2637,11 @@ msgid "Bridge Support Unavailable"
msgstr ""
msgctxt "ServerPage"
-msgid ""
-"You have configured Tor to act as a bridge relay for censored users, but "
-"your version of Tor does not support bridges."
+msgid "You have configured Tor to act as a bridge relay for censored users, but your version of Tor does not support bridges."
msgstr ""
msgctxt "ServerPage"
-msgid ""
-"Please upgrade your Tor software or configure Tor to act as a normal Tor "
-"relay."
+msgid "Please upgrade your Tor software or configure Tor to act as a normal Tor relay."
msgstr ""
msgctxt "ServerPage"
@@ -2892,9 +2709,7 @@ msgid "Basic Settings"
msgstr ""
msgctxt "ServerPage"
-msgid ""
-"For Internet connections with fast download speed but slow upload, please "
-"list your upload speed here."
+msgid "For Internet connections with fast download speed but slow upload, please list your upload speed here."
msgstr ""
msgctxt "ServerPage"
@@ -2950,9 +2765,7 @@ msgid "Peak bandwidth rate limit"
msgstr ""
msgctxt "ServerPage"
-msgid ""
-"Your maximum bandwidth rate must be greater than or equal to your average "
-"bandwidth rate. Both values must be at least 20 KB/s."
+msgid "Your maximum bandwidth rate must be greater than or equal to your average bandwidth rate. Both values must be at least 20 KB/s."
msgstr ""
msgctxt "ServerPage"
@@ -3012,14 +2825,11 @@ msgid "Show help topic on exit policies"
msgstr ""
msgctxt "ServerPage"
-msgid ""
-"What Internet resources should users be able to access from your relay?"
+msgid "What Internet resources should users be able to access from your relay?"
msgstr ""
msgctxt "ServerPage"
-msgid ""
-"Tor will still block some outgoing mail and file sharing applications by "
-"default to reduce spam and other abuse."
+msgid "Tor will still block some outgoing mail and file sharing applications by default to reduce spam and other abuse."
msgstr ""
msgctxt "ServerPage"
@@ -3031,8 +2841,7 @@ msgid "Let others access your bridge by giving them this line:"
msgstr ""
msgctxt "ServerPage"
-msgid ""
-"This is the identity of your bridge relay that you can give to other people"
+msgid "This is the identity of your bridge relay that you can give to other people"
msgstr ""
msgctxt "ServerPage"
@@ -3048,9 +2857,7 @@ msgid "No clients have used your relay recently."
msgstr ""
msgctxt "ServerPage"
-msgid ""
-"Leave your relay running so clients have a better chance of finding and "
-"using it."
+msgid "Leave your relay running so clients have a better chance of finding and using it."
msgstr ""
msgctxt "ServerPage"
@@ -3062,9 +2869,7 @@ msgid "Vidalia was unable to retrieve your bridge's usage history."
msgstr ""
msgctxt "ServerPage"
-msgid ""
-"Tor returned an improperly formatted response when Vidalia requested your "
-"bridge's usage history."
+msgid "Tor returned an improperly formatted response when Vidalia requested your bridge's usage history."
msgstr ""
msgctxt "ServerPage"
@@ -3080,20 +2885,11 @@ msgid "<a href=\"#bridgeUsage\">Who has used my bridge?</a>"
msgstr ""
msgctxt "ServerPage"
-msgid "<a href=\"#bridgeHelp\">What's this?</a>"
-msgstr ""
-
-msgctxt "ServerPage"
-msgid "Automatically distribute my bridge address"
-msgstr ""
-
-msgctxt "ServerPage"
msgid "Mirror the Relay Directory"
msgstr ""
msgctxt "ServerPage"
-msgid ""
-"Email address at which you may be reached if there is a\n"
+msgid "Email address at which you may be reached if there is a\n"
"problem with your relay. You might also include your PGP or GPG fingerprint."
msgstr ""
@@ -3102,9 +2898,7 @@ msgid "Error while trying to unpublish all services"
msgstr ""
msgctxt "ServicePage"
-msgid ""
-"Please configure at least a service directory and a virtual port for each "
-"service you want to save. Remove the other ones."
+msgid "Please configure at least a service directory and a virtual port for each service you want to save. Remove the other ones."
msgstr ""
msgctxt "ServicePage"
@@ -3179,251 +2973,6 @@ msgctxt "ServicePage"
msgid "Created by Tor"
msgstr ""
-msgctxt "StatusEventWidget"
-msgid "Copy to Clipboard"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "The Tor Software is Running"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "You are currently running version \"%1\" of the Tor software."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "The Tor Software is not Running"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Click \"Start Tor\" in the Vidalia Control Panel to restart the Tor "
-"software. If Tor exited unexpectedly, select the \"Advanced\" tab above for "
-"details about any errors encountered."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"You are currently running version \"%1\" of the Tor software, which is no "
-"longer recommended. Please upgrade to the most recent version of the "
-"software, which may contain important security, reliability and performance "
-"fixes."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"You are currently running version \"%1\" of the Tor software, which may no "
-"longer work with the current Tor network. Please upgrade to the most recent "
-"version of the software, which may contain important security, reliability "
-"and performance fixes."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Your Tor Software is Out-of-date"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Connected to the Tor Network"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"We were able to successfully establish a connection to the Tor network. You "
-"can now configure your applications to use the Internet anonymously."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Tor Software Error"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"The Tor software encountered an internal bug. Please report the following "
-"error message to the Tor developers at bugs.torproject.org: \"%1\""
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Tor has determined that your computer's clock may be set to %1 seconds in "
-"the past compared to the source \"%2\". If your clock is not correct, Tor "
-"will not be able to function. Please verify your computer displays the "
-"correct time."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Tor has determined that your computer's clock may be set to %1 seconds in "
-"the future compared to the source \"%2\". If your clock is not correct, Tor "
-"will not be able to function. Please verify your computer displays the "
-"correct time."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Your Computer's Clock is Potentially Incorrect"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"One of the applications on your computer may have attempted to make an "
-"unencrypted connection through Tor to port %1. Sending unencrypted "
-"information over the Tor network is dangerous and not recommended. For your "
-"protection, Tor has automatically closed this connection."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"One of the applications on your computer may have attempted to make an "
-"unencrypted connection through Tor to port %1. Sending unencrypted "
-"information over the Tor network is dangerous and not recommended."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Potentially Dangerous Connection!"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"One of your applications established a connection through Tor to \"%1\" "
-"using a protocol that may leak information about your destination. Please "
-"ensure you configure your applications to use only SOCKS4a or SOCKS5 with "
-"remote hostname resolution."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Unknown SOCKS Protocol"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"One of your applications tried to establish a connection through Tor using a"
-" protocol that Tor does not understand. Please ensure you configure your "
-"applications to use only SOCKS4a or SOCKS5 with remote hostname resolution."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Invalid Destination Hostname"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"One of your applications tried to establish a connection through Tor to "
-"\"%1\", which Tor does not recognize as a valid hostname. Please check your "
-"application's configuration."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "External IP Address Changed"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Tor has determined your relay's public IP address is currently %1%2. If that"
-" is not correct, please consider setting the 'Address' option in your "
-"relay's configuration."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "DNS Hijacking Detected"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Tor detected that your DNS provider is providing false responses for domains"
-" that do not exist. Some ISPs and other DNS providers, such as OpenDNS, are "
-"known to do this in order to display their own search or advertising pages."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Tor detected that your DNS provider is providing false responses for well "
-"known domains. Since clients rely on Tor network relays to provide accurate "
-"DNS repsonses, your relay will not be configured as an exit relay."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Checking Server Port Reachability"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Tor is trying to determine if your relay's server port is reachable from the"
-" Tor network by connecting to itself at %1:%2. This test could take several "
-"minutes."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Server Port Reachability Test Successful!"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Your relay's server port is reachable from the Tor network!"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Server Port Reachability Test Failed"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Your relay's server port is not reachable by other Tor clients. This can "
-"happen if you are behind a router or firewall that requires you to set up "
-"port forwarding. If %1:%2 is not your correct IP address and server port, "
-"please check your relay's configuration."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Checking Directory Port Reachability"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Tor is trying to determine if your relay's directory port is reachable from "
-"the Tor network by connecting to itself at %1:%2. This test could take "
-"several minutes."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Directory Port Reachability Test Successful!"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Your relay's directory port is reachable from the Tor network!"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Directory Port Reachability Test Failed"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Your relay's directory port is not reachable by other Tor clients. This can "
-"happen if you are behind a router or firewall that requires you to set up "
-"port forwarding. If %1:%2 is not your correct IP address and directory port,"
-" please check your relay's configuration."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Relay Descriptor Rejected"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Your relay's descriptor, which enables clients to connect to your relay, was"
-" rejected by the directory server at %1:%2. The reason given was: %3"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Your Relay is Online"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Your relay is now online and available for Tor clients to use. You should "
-"see an increase in network traffic shown by the Bandwidth Graph within a few"
-" hours as more clients learn about your relay. Thank you for contributing to"
-" the Tor network!"
-msgstr ""
-
msgctxt "Stream"
msgid "New"
msgstr ""
@@ -3476,68 +3025,6 @@ msgctxt "TorSettings"
msgid "Failed to hash the control password."
msgstr ""
-msgctxt "TorrcDialog"
-msgid "Editing torrc"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid ""
-"Save settings. If unchecked it will only apply settings to the current Tor "
-"instance."
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Cut"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Copy"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Paste"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Undo"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Redo"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Select All"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Apply all"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Apply selection only"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Error connecting to Tor"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Selection is empty. Please select some text, or check \"Apply all\""
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Error at line %1: \"%2\""
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Error"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "An error ocurred while opening torrc file"
-msgstr ""
-
msgctxt "UPNPControl"
msgid "Success"
msgstr ""
@@ -3595,15 +3082,11 @@ msgid "Testing Universal Plug & Play Support"
msgstr ""
msgctxt "UpdateProcess"
-msgid ""
-"Vidalia was unable to check for available software updates because it could "
-"not find '%1'."
+msgid "Vidalia was unable to check for available software updates because it could not find '%1'."
msgstr ""
msgctxt "UpdateProcess"
-msgid ""
-"Vidalia was unable to check for available software updates because Tor's "
-"update process exited unexpectedly."
+msgid "Vidalia was unable to check for available software updates because Tor's update process exited unexpectedly."
msgstr ""
msgctxt "UpdateProgressDialog"
@@ -3759,10 +3242,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 ""
@@ -3775,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 ""
@@ -3812,5 +3290,3 @@ msgstr ""
msgctxt "stringutil.h"
msgid "%1 mins"
msgstr ""
-
-
diff --git a/src/vidalia/i18n/po/wo/qt_wo.po b/src/vidalia/i18n/po/wo/qt_wo.po
index 88893b5..59d4df4 100644
--- a/src/vidalia/i18n/po/wo/qt_wo.po
+++ b/src/vidalia/i18n/po/wo/qt_wo.po
@@ -1,11 +1,10 @@
#
-# Translators:
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-08-20 03:25+0000\n"
-"PO-Revision-Date: 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"
@@ -431,5 +430,3 @@ msgstr ""
msgctxt "QFileSystemModel"
msgid "%1 bytes"
msgstr ""
-
-
diff --git a/src/vidalia/i18n/po/wo/vidalia_wo.po b/src/vidalia/i18n/po/wo/vidalia_wo.po
index 5118413..22b0f4e 100644
--- a/src/vidalia/i18n/po/wo/vidalia_wo.po
+++ b/src/vidalia/i18n/po/wo/vidalia_wo.po
@@ -1,18 +1,15 @@
-#
-# Translators:
+#, fuzzy
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: 2010-12-05 20:03+0000\n"
-"Last-Translator: \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: 2009-05-19 23:56+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
+"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: wo\n"
-"Plural-Forms: nplurals=1; plural=0\n"
"X-Generator: Vidalia ts2po 0.2\n"
msgctxt "AboutDialog"
@@ -35,13 +32,28 @@ msgctxt "AboutDialog"
msgid "Qt 4.4.2"
msgstr ""
+msgctxt "AboutDialog"
+msgid "Vidalia"
+msgstr ""
+
+msgctxt "AboutDialog"
+msgid "Tor"
+msgstr ""
+
+msgctxt "AboutDialog"
+msgid "Qt"
+msgstr ""
+
+msgctxt "AboutDialog"
+msgid "version"
+msgstr ""
+
msgctxt "AdvancedPage"
msgid "'%1' is not a valid IP address."
msgstr ""
msgctxt "AdvancedPage"
-msgid ""
-"You selected 'Password' authentication, but did not specify a password."
+msgid "You selected 'Password' authentication, but did not specify a password."
msgstr ""
msgctxt "AdvancedPage"
@@ -81,6 +93,10 @@ msgid "Vidalia was unable to install the Tor service."
msgstr ""
msgctxt "AdvancedPage"
+msgid "Control Port"
+msgstr ""
+
+msgctxt "AdvancedPage"
msgid "Authentication:"
msgstr ""
@@ -137,68 +153,7 @@ msgid "Select the directory used to store data for the Tor software"
msgstr ""
msgctxt "AdvancedPage"
-msgid "Tor Control"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "Use TCP connection (ControlPort)"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "Path:"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "Use Unix domain socket (ControlSocket)"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "Edit current torrc"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "NOTE: this will edit the currently loaded torrc"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "ControlSocket path doesn't exist."
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid ""
-"The specified Tor configuration file location contains characters that "
-"cannot be represented in your system's current 8-bit character encoding."
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid ""
-"The specified Tor data directory location contains characters that cannot be"
-" represented in your system's current 8-bit character encoding."
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "Warning"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "You changed torrc path, would you like to restart Tor?"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "Tor Configuration File (torrc);;All Files (*)"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "Select a file to use for Tor socket path"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "Configure ControlPort automatically"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid ""
-"Vidalia was unable to remove the Tor service.\n"
+msgid "Vidalia was unable to remove the Tor service.\n"
"\n"
"You may need to remove it manually."
msgstr ""
@@ -440,9 +395,7 @@ msgid "Remember my password"
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid ""
-"Vidalia has connected to a running Tor process that requires a password. "
-"Please enter your control password:"
+msgid "Vidalia has connected to a running Tor process that requires a password. Please enter your control password:"
msgstr ""
msgctxt "ControlSocket"
@@ -1158,10 +1111,6 @@ msgid "Zimbabwe"
msgstr ""
msgctxt "CountryInfo"
-msgid "Zaire"
-msgstr ""
-
-msgctxt "CountryInfo"
msgid "Albania"
msgstr ""
@@ -1257,55 +1206,6 @@ msgctxt "CountryInfo"
msgid "Taiwan"
msgstr ""
-msgctxt "CrashReportDialog"
-msgid "Submit a Crash Report"
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid "Vidalia encountered an error and needed to close"
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid "Restart Vidalia"
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid "Don't Restart"
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid "Unable to restart Vidalia"
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid ""
-"We were unable to automatically restart Vidalia. Please restart Vidalia "
-"manually."
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid "Please fill a ticket in:"
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid ""
-"<a "
-"href=\"https://trac.torproject.org/projects/tor/newticket\">https://trac.torproject.org/projects/tor/newticket</a>"
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid ""
-"A crash report has been created that you can send to the Vidalia developers "
-"to help identify and fix the problem. The submitted report does not contain "
-"any personally identifying information."
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid ""
-"with a description of what you were doing before the application crashed, "
-"along with the following files corresponding to the crash report:"
-msgstr ""
-
msgctxt "GeneralPage"
msgid "Executables (*.exe)"
msgstr ""
@@ -1323,6 +1223,10 @@ msgid "You must specify the name of your Tor executable."
msgstr ""
msgctxt "GeneralPage"
+msgid "The proxy arguments specified are not properly formatted."
+msgstr ""
+
+msgctxt "GeneralPage"
msgid "Start Vidalia when my system starts"
msgstr ""
@@ -1519,10 +1423,7 @@ msgid "Opening External Link"
msgstr ""
msgctxt "HelpTextBrowser"
-msgid ""
-"Vidalia can open the link you selected in your default Web browser. If your "
-"browser is not currently configured to use Tor then the request will not be "
-"anonymous."
+msgid "Vidalia can open the link you selected in your default Web browser. If your browser is not currently configured to use Tor then the request will not be anonymous."
msgstr ""
msgctxt "HelpTextBrowser"
@@ -1534,9 +1435,7 @@ msgid "Unable to Open Link"
msgstr ""
msgctxt "HelpTextBrowser"
-msgid ""
-"Vidalia was unable to open the selected link in your Web browser. You can "
-"still copy the URL and paste it into your browser."
+msgid "Vidalia was unable to open the selected link in your Web browser. You can still copy the URL and paste it into your browser."
msgstr ""
msgctxt "HelpTextBrowser"
@@ -1579,30 +1478,6 @@ msgctxt "LogEvent"
msgid "Unknown"
msgstr ""
-msgctxt "LogTreeItem"
-msgid "Debug"
-msgstr ""
-
-msgctxt "LogTreeItem"
-msgid "Info"
-msgstr ""
-
-msgctxt "LogTreeItem"
-msgid "Notice"
-msgstr ""
-
-msgctxt "LogTreeItem"
-msgid "Warning"
-msgstr ""
-
-msgctxt "LogTreeItem"
-msgid "Error"
-msgstr ""
-
-msgctxt "LogTreeItem"
-msgid "Unknown"
-msgstr ""
-
msgctxt "MainWindow"
msgid "Start Tor"
msgstr ""
@@ -1816,9 +1691,7 @@ msgid "Error Starting Tor"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Vidalia was unable to start Tor. Check your settings to ensure the correct "
-"name and location of your Tor executable is specified."
+msgid "Vidalia was unable to start Tor. Check your settings to ensure the correct name and location of your Tor executable is specified."
msgstr ""
msgctxt "MainWindow"
@@ -1854,9 +1727,7 @@ msgid "Cookie Authentication Required"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"The Tor software requires Vidalia to send the contents of an authentication "
-"cookie, but Vidalia was unable to find one."
+msgid "The Tor software requires Vidalia to send the contents of an authentication cookie, but Vidalia was unable to find one."
msgstr ""
msgctxt "MainWindow"
@@ -1876,9 +1747,7 @@ msgid "Error Registering for Events"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Vidalia was unable to register for some events. Many of Vidalia's features "
-"may be unavailable."
+msgid "Vidalia was unable to register for some events. Many of Vidalia's features may be unavailable."
msgstr ""
msgctxt "MainWindow"
@@ -1898,9 +1767,7 @@ msgid "Tor Update Available"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended. Please visit the Tor website to download the latest version."
+msgid "The currently installed version of Tor is out of date or no longer recommended. Please visit the Tor website to download the latest version."
msgstr ""
msgctxt "MainWindow"
@@ -1908,9 +1775,7 @@ msgid "Tor website: %1"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"All subsequent connections will appear to be different than your old "
-"connections."
+msgid "All subsequent connections will appear to be different than your old connections."
msgstr ""
msgctxt "MainWindow"
@@ -2002,21 +1867,15 @@ msgid "Password Reset Failed"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Vidalia tried to reset Tor's control password, but was not able to restart "
-"the Tor software. Please check your Task Manager to ensure there are no "
-"other Tor processes running."
+msgid "Vidalia tried to reset Tor's control password, but was not able to restart the Tor software. Please check your Task Manager to ensure there are no other Tor processes running."
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended."
+msgid "The currently installed version of Tor is out of date or no longer recommended."
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Would you like to check if a newer package is available for installation?"
+msgid "Would you like to check if a newer package is available for installation?"
msgstr ""
msgctxt "MainWindow"
@@ -2024,9 +1883,11 @@ msgid "Potentially Unsafe Connection"
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 ""
msgctxt "MainWindow"
@@ -2038,9 +1899,7 @@ msgid "Your software is up to date"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"There are no new Tor software packages available for your computer at this "
-"time."
+msgid "There are no new Tor software packages available for your computer at this time."
msgstr ""
msgctxt "MainWindow"
@@ -2056,52 +1915,52 @@ msgid "The following error occurred:"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Anything sent over this connection could be monitored. Please check your "
-"application's configuration and use only encrypted protocols, such as SSL, "
-"if possible."
-msgstr ""
-
-msgctxt "MainWindow"
msgid "failed (%1)"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
+msgid "Your relay is shutting down.\n"
"Click 'Stop' again to stop your relay now."
msgstr ""
msgctxt "MainWindow"
-msgid "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 ""
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 ""
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 ""
+
+msgctxt "MainWindow"
+msgid "File"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "About Vidalia"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Home"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Check For Updates"
msgstr ""
msgctxt "MessageLog"
@@ -2345,68 +2204,50 @@ 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"
+msgid "Always Save New Log Messages"
msgstr ""
msgctxt "MessageLog"
-msgid "Tor Status"
+msgid "Browse"
msgstr ""
msgctxt "MessageLog"
-msgid "Advanced"
+msgid "Enable automatically saving all new log messages to a file"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
+msgid "Automatically save new log messages to a file"
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 ""
msgctxt "MessageLog"
-msgid ""
-"Messages that only appear when \n"
+msgid "Messages that only appear when \n"
"something has gone wrong with Tor."
msgstr ""
msgctxt "MessageLog"
-msgid ""
-"Messages that appear infrequently \n"
+msgid "Messages that appear infrequently \n"
"during normal Tor operation and are \n"
"not considered errors, but you may \n"
"care about."
msgstr ""
msgctxt "MessageLog"
-msgid ""
-"Messages that appear frequently \n"
+msgid "Messages that appear frequently \n"
"during normal Tor operation."
msgstr ""
msgctxt "MessageLog"
-msgid ""
-"Hyper-verbose messages primarily of \n"
+msgid "Hyper-verbose messages primarily of \n"
"interest to Tor developers."
msgstr ""
msgctxt "MessageLog"
-msgid ""
-"Cannot write file %1\n"
+msgid "Cannot write file %1\n"
"\n"
"%2."
msgstr ""
@@ -2528,15 +2369,11 @@ msgid "Copy (Ctrl+C)"
msgstr ""
msgctxt "NetworkPage"
-msgid ""
-"You must specify both an IP address or hostname and a port number to "
-"configure Tor to use a proxy to access the Internet."
+msgid "You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet."
msgstr ""
msgctxt "NetworkPage"
-msgid ""
-"You must specify one or more ports to which your firewall allows you to "
-"connect."
+msgid "You must specify one or more ports to which your firewall allows you to connect."
msgstr ""
msgctxt "NetworkPage"
@@ -2556,10 +2393,18 @@ msgid "Proxy Settings"
msgstr ""
msgctxt "NetworkPage"
+msgid "HTTP Proxy:"
+msgstr ""
+
+msgctxt "NetworkPage"
msgid "Username:"
msgstr ""
msgctxt "NetworkPage"
+msgid "Use this proxy for HTTPS also"
+msgstr ""
+
+msgctxt "NetworkPage"
msgid "Password:"
msgstr ""
@@ -2588,9 +2433,7 @@ msgid "80, 443"
msgstr ""
msgctxt "NetworkPage"
-msgid ""
-"Check to encrypt directory requests and, optionally, use bridge relays to "
-"access the Tor network"
+msgid "Check to encrypt directory requests and, optionally, use bridge relays to access the Tor network"
msgstr ""
msgctxt "NetworkPage"
@@ -2602,10 +2445,18 @@ msgid "Bridge Settings"
msgstr ""
msgctxt "NetworkPage"
+msgid "The Tor software you are currently running does not support bridges. <br>Directory connections will still be encrypted."
+msgstr ""
+
+msgctxt "NetworkPage"
msgid "Add a Bridge:"
msgstr ""
msgctxt "NetworkPage"
+msgid "<a href=\"bridges.finding\">How do I find a bridge?</a>"
+msgstr ""
+
+msgctxt "NetworkPage"
msgid "Remove the selected bridges from the list"
msgstr ""
@@ -2626,43 +2477,13 @@ msgid "<a href=\"bridges.finding\">How can I find bridges?</a>"
msgstr ""
msgctxt "NetworkPage"
-msgid ""
-"No new bridges are currently available. You can either wait a while and try "
-"again, or try another method of finding new bridges."
+msgid "No new bridges are currently available. You can either wait a while and try again, or try another method of finding new bridges."
msgstr ""
msgctxt "NetworkPage"
msgid "Click Help to see other methods of finding new bridges."
msgstr ""
-msgctxt "NetworkPage"
-msgid "Address:"
-msgstr ""
-
-msgctxt "NetworkPage"
-msgid "Type:"
-msgstr ""
-
-msgctxt "NetworkPage"
-msgid "You must select the proxy type."
-msgstr ""
-
-msgctxt "NetworkPage"
-msgid "SOCKS 4"
-msgstr ""
-
-msgctxt "NetworkPage"
-msgid "SOCKS 5"
-msgstr ""
-
-msgctxt "NetworkPage"
-msgid "HTTP"
-msgstr ""
-
-msgctxt "NetworkPage"
-msgid "HTTP / HTTPS"
-msgstr ""
-
msgctxt "Policy"
msgid "accept"
msgstr ""
@@ -2816,15 +2637,11 @@ msgid "Bridge Support Unavailable"
msgstr ""
msgctxt "ServerPage"
-msgid ""
-"You have configured Tor to act as a bridge relay for censored users, but "
-"your version of Tor does not support bridges."
+msgid "You have configured Tor to act as a bridge relay for censored users, but your version of Tor does not support bridges."
msgstr ""
msgctxt "ServerPage"
-msgid ""
-"Please upgrade your Tor software or configure Tor to act as a normal Tor "
-"relay."
+msgid "Please upgrade your Tor software or configure Tor to act as a normal Tor relay."
msgstr ""
msgctxt "ServerPage"
@@ -2892,9 +2709,7 @@ msgid "Basic Settings"
msgstr ""
msgctxt "ServerPage"
-msgid ""
-"For Internet connections with fast download speed but slow upload, please "
-"list your upload speed here."
+msgid "For Internet connections with fast download speed but slow upload, please list your upload speed here."
msgstr ""
msgctxt "ServerPage"
@@ -2950,9 +2765,7 @@ msgid "Peak bandwidth rate limit"
msgstr ""
msgctxt "ServerPage"
-msgid ""
-"Your maximum bandwidth rate must be greater than or equal to your average "
-"bandwidth rate. Both values must be at least 20 KB/s."
+msgid "Your maximum bandwidth rate must be greater than or equal to your average bandwidth rate. Both values must be at least 20 KB/s."
msgstr ""
msgctxt "ServerPage"
@@ -3012,14 +2825,11 @@ msgid "Show help topic on exit policies"
msgstr ""
msgctxt "ServerPage"
-msgid ""
-"What Internet resources should users be able to access from your relay?"
+msgid "What Internet resources should users be able to access from your relay?"
msgstr ""
msgctxt "ServerPage"
-msgid ""
-"Tor will still block some outgoing mail and file sharing applications by "
-"default to reduce spam and other abuse."
+msgid "Tor will still block some outgoing mail and file sharing applications by default to reduce spam and other abuse."
msgstr ""
msgctxt "ServerPage"
@@ -3031,8 +2841,7 @@ msgid "Let others access your bridge by giving them this line:"
msgstr ""
msgctxt "ServerPage"
-msgid ""
-"This is the identity of your bridge relay that you can give to other people"
+msgid "This is the identity of your bridge relay that you can give to other people"
msgstr ""
msgctxt "ServerPage"
@@ -3048,9 +2857,7 @@ msgid "No clients have used your relay recently."
msgstr ""
msgctxt "ServerPage"
-msgid ""
-"Leave your relay running so clients have a better chance of finding and "
-"using it."
+msgid "Leave your relay running so clients have a better chance of finding and using it."
msgstr ""
msgctxt "ServerPage"
@@ -3062,9 +2869,7 @@ msgid "Vidalia was unable to retrieve your bridge's usage history."
msgstr ""
msgctxt "ServerPage"
-msgid ""
-"Tor returned an improperly formatted response when Vidalia requested your "
-"bridge's usage history."
+msgid "Tor returned an improperly formatted response when Vidalia requested your bridge's usage history."
msgstr ""
msgctxt "ServerPage"
@@ -3080,20 +2885,11 @@ msgid "<a href=\"#bridgeUsage\">Who has used my bridge?</a>"
msgstr ""
msgctxt "ServerPage"
-msgid "<a href=\"#bridgeHelp\">What's this?</a>"
-msgstr ""
-
-msgctxt "ServerPage"
-msgid "Automatically distribute my bridge address"
-msgstr ""
-
-msgctxt "ServerPage"
msgid "Mirror the Relay Directory"
msgstr ""
msgctxt "ServerPage"
-msgid ""
-"Email address at which you may be reached if there is a\n"
+msgid "Email address at which you may be reached if there is a\n"
"problem with your relay. You might also include your PGP or GPG fingerprint."
msgstr ""
@@ -3102,9 +2898,7 @@ msgid "Error while trying to unpublish all services"
msgstr ""
msgctxt "ServicePage"
-msgid ""
-"Please configure at least a service directory and a virtual port for each "
-"service you want to save. Remove the other ones."
+msgid "Please configure at least a service directory and a virtual port for each service you want to save. Remove the other ones."
msgstr ""
msgctxt "ServicePage"
@@ -3179,251 +2973,6 @@ msgctxt "ServicePage"
msgid "Created by Tor"
msgstr ""
-msgctxt "StatusEventWidget"
-msgid "Copy to Clipboard"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "The Tor Software is Running"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "You are currently running version \"%1\" of the Tor software."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "The Tor Software is not Running"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Click \"Start Tor\" in the Vidalia Control Panel to restart the Tor "
-"software. If Tor exited unexpectedly, select the \"Advanced\" tab above for "
-"details about any errors encountered."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"You are currently running version \"%1\" of the Tor software, which is no "
-"longer recommended. Please upgrade to the most recent version of the "
-"software, which may contain important security, reliability and performance "
-"fixes."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"You are currently running version \"%1\" of the Tor software, which may no "
-"longer work with the current Tor network. Please upgrade to the most recent "
-"version of the software, which may contain important security, reliability "
-"and performance fixes."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Your Tor Software is Out-of-date"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Connected to the Tor Network"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"We were able to successfully establish a connection to the Tor network. You "
-"can now configure your applications to use the Internet anonymously."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Tor Software Error"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"The Tor software encountered an internal bug. Please report the following "
-"error message to the Tor developers at bugs.torproject.org: \"%1\""
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Tor has determined that your computer's clock may be set to %1 seconds in "
-"the past compared to the source \"%2\". If your clock is not correct, Tor "
-"will not be able to function. Please verify your computer displays the "
-"correct time."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Tor has determined that your computer's clock may be set to %1 seconds in "
-"the future compared to the source \"%2\". If your clock is not correct, Tor "
-"will not be able to function. Please verify your computer displays the "
-"correct time."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Your Computer's Clock is Potentially Incorrect"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"One of the applications on your computer may have attempted to make an "
-"unencrypted connection through Tor to port %1. Sending unencrypted "
-"information over the Tor network is dangerous and not recommended. For your "
-"protection, Tor has automatically closed this connection."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"One of the applications on your computer may have attempted to make an "
-"unencrypted connection through Tor to port %1. Sending unencrypted "
-"information over the Tor network is dangerous and not recommended."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Potentially Dangerous Connection!"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"One of your applications established a connection through Tor to \"%1\" "
-"using a protocol that may leak information about your destination. Please "
-"ensure you configure your applications to use only SOCKS4a or SOCKS5 with "
-"remote hostname resolution."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Unknown SOCKS Protocol"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"One of your applications tried to establish a connection through Tor using a"
-" protocol that Tor does not understand. Please ensure you configure your "
-"applications to use only SOCKS4a or SOCKS5 with remote hostname resolution."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Invalid Destination Hostname"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"One of your applications tried to establish a connection through Tor to "
-"\"%1\", which Tor does not recognize as a valid hostname. Please check your "
-"application's configuration."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "External IP Address Changed"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Tor has determined your relay's public IP address is currently %1%2. If that"
-" is not correct, please consider setting the 'Address' option in your "
-"relay's configuration."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "DNS Hijacking Detected"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Tor detected that your DNS provider is providing false responses for domains"
-" that do not exist. Some ISPs and other DNS providers, such as OpenDNS, are "
-"known to do this in order to display their own search or advertising pages."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Tor detected that your DNS provider is providing false responses for well "
-"known domains. Since clients rely on Tor network relays to provide accurate "
-"DNS repsonses, your relay will not be configured as an exit relay."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Checking Server Port Reachability"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Tor is trying to determine if your relay's server port is reachable from the"
-" Tor network by connecting to itself at %1:%2. This test could take several "
-"minutes."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Server Port Reachability Test Successful!"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Your relay's server port is reachable from the Tor network!"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Server Port Reachability Test Failed"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Your relay's server port is not reachable by other Tor clients. This can "
-"happen if you are behind a router or firewall that requires you to set up "
-"port forwarding. If %1:%2 is not your correct IP address and server port, "
-"please check your relay's configuration."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Checking Directory Port Reachability"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Tor is trying to determine if your relay's directory port is reachable from "
-"the Tor network by connecting to itself at %1:%2. This test could take "
-"several minutes."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Directory Port Reachability Test Successful!"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Your relay's directory port is reachable from the Tor network!"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Directory Port Reachability Test Failed"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Your relay's directory port is not reachable by other Tor clients. This can "
-"happen if you are behind a router or firewall that requires you to set up "
-"port forwarding. If %1:%2 is not your correct IP address and directory port,"
-" please check your relay's configuration."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Relay Descriptor Rejected"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Your relay's descriptor, which enables clients to connect to your relay, was"
-" rejected by the directory server at %1:%2. The reason given was: %3"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Your Relay is Online"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Your relay is now online and available for Tor clients to use. You should "
-"see an increase in network traffic shown by the Bandwidth Graph within a few"
-" hours as more clients learn about your relay. Thank you for contributing to"
-" the Tor network!"
-msgstr ""
-
msgctxt "Stream"
msgid "New"
msgstr ""
@@ -3476,68 +3025,6 @@ msgctxt "TorSettings"
msgid "Failed to hash the control password."
msgstr ""
-msgctxt "TorrcDialog"
-msgid "Editing torrc"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid ""
-"Save settings. If unchecked it will only apply settings to the current Tor "
-"instance."
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Cut"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Copy"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Paste"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Undo"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Redo"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Select All"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Apply all"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Apply selection only"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Error connecting to Tor"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Selection is empty. Please select some text, or check \"Apply all\""
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Error at line %1: \"%2\""
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Error"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "An error ocurred while opening torrc file"
-msgstr ""
-
msgctxt "UPNPControl"
msgid "Success"
msgstr ""
@@ -3595,15 +3082,11 @@ msgid "Testing Universal Plug & Play Support"
msgstr ""
msgctxt "UpdateProcess"
-msgid ""
-"Vidalia was unable to check for available software updates because it could "
-"not find '%1'."
+msgid "Vidalia was unable to check for available software updates because it could not find '%1'."
msgstr ""
msgctxt "UpdateProcess"
-msgid ""
-"Vidalia was unable to check for available software updates because Tor's "
-"update process exited unexpectedly."
+msgid "Vidalia was unable to check for available software updates because Tor's update process exited unexpectedly."
msgstr ""
msgctxt "UpdateProgressDialog"
@@ -3759,10 +3242,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 ""
@@ -3775,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 ""
@@ -3812,5 +3290,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 2b5509a..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:
-# 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: 2012-02-14 09:46+0000\n"
-"Last-Translator: John <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"
@@ -210,7 +207,9 @@ msgid ""
"%1\n"
"File not found.\n"
"Please verify the correct file name was given."
-msgstr "文件 %1 没有找到。\n请核实已给定正确文件名。"
+msgstr ""
+"文件 %1 没有找到。\n"
+"请核实已给定正确文件名。"
#: qdirmodel.cpp:833
msgctxt "QFileDialog"
@@ -268,14 +267,18 @@ msgid ""
"%1\n"
"Directory not found.\n"
"Please verify the correct directory name was given."
-msgstr "目录%1 没有找到。\n请核实已给定正确目录名。"
+msgstr ""
+"目录%1 没有找到。\n"
+"请核实已给定正确目录名。"
#: qfiledialog.cpp:2281
msgctxt "QFileDialog"
msgid ""
"'%1' is write protected.\n"
"Do you want to delete it anyway?"
-msgstr "“%1“ 只读。\n你还是想删除它么？"
+msgstr ""
+"“%1“ 只读。\n"
+"你还是想删除它么？"
#: qfiledialog.cpp:2286
msgctxt "QFileDialog"
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 4eebe23..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: 2012-03-21 17:52+0000\n"
-"PO-Revision-Date: 2012-03-22 08:51+0000\n"
-"Last-Translator: Kevin Chen <szescxz at 126.com>\n"
+"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,25 +184,14 @@ 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);;所有文件 (*)"
-
-msgctxt "AdvancedPage"
-msgid "Select a file to use for Tor socket path"
msgstr ""
msgctxt "AdvancedPage"
-msgid "Configure ControlPort automatically"
-msgstr "自动配置控制端口"
-
-msgctxt "AdvancedPage"
-msgid ""
-"You've checked the autoconfiguration option for the ControlPort, but "
-"provided no Data Directory. Please add one, or uncheck the \"Configure "
-"ControlPort automatically\" option."
+msgid "Select a file to use for Tor socket path"
msgstr ""
msgctxt "AdvancedPage"
@@ -233,23 +221,6 @@ msgctxt "AppearancePage"
msgid "Vidalia was unable to load the selected language translation."
msgstr "Vidalia 无法载入选中的语言。"
-msgctxt "AppearancePage"
-msgid ""
-"System Icon Preferences (changes will take effect when you restart Vidalia)"
-msgstr ""
-
-msgctxt "AppearancePage"
-msgid "Show the Tray Icon and Dock Icon (default)"
-msgstr ""
-
-msgctxt "AppearancePage"
-msgid "Hide the Tray Icon"
-msgstr ""
-
-msgctxt "AppearancePage"
-msgid "Hide the Dock Icon"
-msgstr ""
-
msgctxt "BandwidthGraph"
msgid "Since:"
msgstr "起始时间:"
@@ -263,10 +234,6 @@ msgid "Show Settings"
msgstr "显示设定"
msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr "Tor 带宽使用"
-
-msgctxt "BandwidthGraph"
msgid "Reset"
msgstr "复位设定"
@@ -306,6 +273,10 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr "取消"
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr ""
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr "开始 HTTPS 网桥请求..."
@@ -459,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 "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:"
-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."
@@ -1186,7 +1166,7 @@ msgstr "津巴布韦"
msgctxt "CountryInfo"
msgid "Zaire"
-msgstr "扎伊尔"
+msgstr ""
msgctxt "CountryInfo"
msgid "Albania"
@@ -1286,51 +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>"
-msgstr "<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."
-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"
@@ -1358,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"
@@ -1389,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/秒"
@@ -1608,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"
@@ -1671,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"
@@ -1707,10 +1666,6 @@ msgid "View"
msgstr "查看"
msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr "Vidalia 帮助"
-
-msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr "启动浏览器时发生了错误"
@@ -1775,6 +1730,10 @@ msgid "Connected to the Tor network!"
msgstr "Tor 网络已经连接！"
msgctxt "MainWindow"
+msgid "Unrecognized startup status"
+msgstr "未知的启动状态"
+
+msgctxt "MainWindow"
msgid "miscellaneous"
msgstr "杂项"
@@ -1819,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"
@@ -1905,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 更新"
@@ -1957,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版本已经过时，不再推荐使用。"
@@ -2080,52 +1952,43 @@ 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 "Bootstrapping torrc from %1 to %2"
+msgid "toolBar"
msgstr ""
msgctxt "MainWindow"
-msgid "(probably Telnet)"
+msgid "Start"
msgstr ""
msgctxt "MainWindow"
-msgid "(probably an email client)"
+msgid "Stop"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"One of your applications %1 appears to be making a potentially unencrypted "
-"and unsafe connection to port %2."
+msgid "Restart"
msgstr ""
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 "正在关闭您的中继服务。\n再次单击'停止'立刻关闭中继。"
+msgid "Reload Tor's config"
+msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Vidalia can't find out how to talk to Tor because it can't access this file: %1\n"
-"\n"
-"Here's the last error message:\n"
-"%2"
+msgid "Actions"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"It seems Tor has stopped running since Vidalia started it.\n"
-"\n"
-"See the Advanced Message Log for more information."
+msgid "Bootstrapping torrc from %1 to %2"
msgstr ""
msgctxt "MainWindow"
@@ -2142,6 +2005,38 @@ msgid ""
"Please check the message log for recent warning or error messages."
msgstr "Vidalia检测到Tor软件意外退出。\n\n请检查消息日志获取最近的警告及错误信息。"
+msgctxt "MainWindow"
+msgid ""
+"Vidalia tried to restart Tor, but was not able to. Please check your Task "
+"Manager to ensure there are no other Tor processes running."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "failed (%1)"
+msgstr "失败（%1）"
+
+msgctxt "MainWindow"
+msgid ", probably Telnet,"
+msgstr "，也许是Telnet程序，"
+
+msgctxt "MainWindow"
+msgid ", probably an email client,"
+msgstr "，也许是Email客户端，"
+
+msgctxt "MainWindow"
+msgid ""
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
+msgstr "正在关闭您的中继服务。\n再次单击'停止'立刻关闭中继。"
+
+msgctxt "MainWindow"
+msgid "Error reloading configuration"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to reload Tor's configuration."
+msgstr ""
+
msgctxt "MessageLog"
msgid "Error Setting Filter"
msgstr "设定过滤条件时发生错误"
@@ -2395,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."
@@ -2450,10 +2337,6 @@ msgid ""
msgstr "无法写入文件%1\n\n%2。"
msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr "Tor 网络地图"
-
-msgctxt "NetViewer"
msgid "Refresh"
msgstr "刷新"
@@ -2553,6 +2436,30 @@ 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 "无效网桥"
+
+msgctxt "NetworkPage"
+msgid "The specified bridge identifier is not valid."
+msgstr "指定网桥识别无效"
+
msgctxt "NetworkPage"
msgid "Copy (Ctrl+C)"
msgstr "复制(Ctrl+C)"
@@ -2649,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>"
@@ -2667,30 +2574,30 @@ 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 / HTTPS"
-msgstr "HTTP / HTTPS"
+msgid "HTTP"
+msgstr ""
msgctxt "NetworkPage"
-msgid "You must specify one or more bridges."
+msgid "HTTP / HTTPS"
msgstr ""
msgctxt "Policy"
@@ -3107,18 +3014,18 @@ 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 for the Tor network (exit relay)"
+msgid "Relay traffic inside the Tor network (non-exit relay)"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic inside the Tor network (non-exit relay)"
+msgid "Relay traffic for the Tor network (exit relay)"
msgstr ""
msgctxt "ServerPage"
@@ -3166,10 +3073,6 @@ msgid "Directory already in use by another service."
msgstr "此目录已被其他服务占用。"
msgctxt "ServicePage"
-msgid "Form"
-msgstr "表单"
-
-msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr "已提供隐藏服务"
@@ -3215,26 +3118,26 @@ 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 ""
"Click \"Start Tor\" in the Vidalia Control Panel to restart the Tor "
"software. If Tor exited unexpectedly, select the \"Advanced\" tab above for "
"details about any errors encountered."
-msgstr "单击位于 Vidalia 控制面板的“启动 Tor”以重启 Tor 软件。如果 Tor 意外退出，选中顶端的“高级”选项卡以查看所遇到的错误的信息。"
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
@@ -3242,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 ""
@@ -3250,31 +3153,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 "您正在运行版本为 %1 的 Tor 软件，且此版本已不再支持现在的 Tor 网络。请升级到最新的版本，它可以提升重要的安全性、可靠性与性能。"
+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 ""
"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 ""
@@ -3294,7 +3197,7 @@ msgstr ""
msgctxt "StatusEventWidget"
msgid "Your Computer's Clock is Potentially Incorrect"
-msgstr "您的计算机的时钟可能不正确"
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
@@ -3313,7 +3216,7 @@ msgstr ""
msgctxt "StatusEventWidget"
msgid "Potentially Dangerous Connection!"
-msgstr "含有潜在危险的连接！"
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
@@ -3325,7 +3228,7 @@ msgstr ""
msgctxt "StatusEventWidget"
msgid "Unknown SOCKS Protocol"
-msgstr "未知 SOCKS 协议"
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
@@ -3336,7 +3239,7 @@ msgstr ""
msgctxt "StatusEventWidget"
msgid "Invalid Destination Hostname"
-msgstr "错误目标主机名"
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
@@ -3347,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 ""
@@ -3376,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 ""
@@ -3448,7 +3351,7 @@ msgstr ""
msgctxt "StatusEventWidget"
msgid "Your Relay is Online"
-msgstr "您的中继已在线"
+msgstr ""
msgctxt "StatusEventWidget"
msgid ""
@@ -3458,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 "新建"
@@ -3494,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]"
@@ -3512,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\""
@@ -3566,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"
@@ -3700,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 "确定"
@@ -3793,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 "指定语言代码无效："
diff --git a/src/vidalia/i18n/po/zh_HK/qt_zh_HK.po b/src/vidalia/i18n/po/zh_HK/qt_zh_HK.po
index 809b8b4..d9a1ae8 100644
--- a/src/vidalia/i18n/po/zh_HK/qt_zh_HK.po
+++ b/src/vidalia/i18n/po/zh_HK/qt_zh_HK.po
@@ -1,11 +1,10 @@
#
-# Translators:
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-08-20 03:25+0000\n"
-"PO-Revision-Date: 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"
@@ -431,5 +430,3 @@ msgstr ""
msgctxt "QFileSystemModel"
msgid "%1 bytes"
msgstr ""
-
-
diff --git a/src/vidalia/i18n/po/zh_HK/vidalia_zh_HK.po b/src/vidalia/i18n/po/zh_HK/vidalia_zh_HK.po
index b52b4e0..6877ae2 100755
--- a/src/vidalia/i18n/po/zh_HK/vidalia_zh_HK.po
+++ b/src/vidalia/i18n/po/zh_HK/vidalia_zh_HK.po
@@ -1,11 +1,10 @@
#
-# Translators:
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-09-07 14:40+0000\n"
-"PO-Revision-Date: 2010-12-05 20:03+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"
@@ -193,10 +192,6 @@ 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"
@@ -236,10 +231,6 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr ""
-
-msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -279,6 +270,10 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr ""
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -432,17 +427,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"
@@ -1266,44 +1270,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"
@@ -1331,10 +1342,6 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr ""
-
-msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1362,6 +1369,10 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr ""
+
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1644,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 ""
@@ -1680,10 +1663,6 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1796,10 +1775,6 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1882,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 ""
@@ -1934,82 +1897,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 ""
@@ -2057,19 +1949,39 @@ 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)"
+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"
@@ -2091,17 +2003,35 @@ msgid ""
msgstr ""
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"
@@ -2357,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"
@@ -2412,10 +2334,6 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2515,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 ""
@@ -2840,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 ""
@@ -3088,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 ""
@@ -3132,10 +3070,6 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
-msgid "Form"
-msgstr ""
-
-msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3424,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 ""
@@ -3460,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 ""
@@ -3538,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 ""
@@ -3666,6 +3646,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 ""
@@ -3759,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 ""
@@ -3812,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 854ecd9..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:
-# 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-02-14 09:46+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"
@@ -203,7 +199,7 @@ msgctxt "QFileDialog"
msgid ""
"%1 already exists.\n"
"Do you want to replace it?"
-msgstr "%1 已經存在。\n你要取代原來的嗎?"
+msgstr ""
#: qfiledialog.cpp:1690
msgctxt "QFileDialog"
@@ -211,7 +207,7 @@ msgid ""
"%1\n"
"File not found.\n"
"Please verify the correct file name was given."
-msgstr "%1\n檔案不存在。\n請確認檔名無誤。"
+msgstr ""
#: qdirmodel.cpp:833
msgctxt "QFileDialog"
@@ -269,14 +265,14 @@ msgid ""
"%1\n"
"Directory not found.\n"
"Please verify the correct directory name was given."
-msgstr "%1\n找不到目錄。\n請確認您輸入正確的目錄名。"
+msgstr ""
#: qfiledialog.cpp:2281
msgctxt "QFileDialog"
msgid ""
"'%1' is write protected.\n"
"Do you want to delete it anyway?"
-msgstr "%1' 有防寫保護。\n您仍舊要刪除它嗎?"
+msgstr ""
#: qfiledialog.cpp:2286
msgctxt "QFileDialog"
diff --git a/src/vidalia/i18n/po/zh_TW/vidalia_zh_TW.po b/src/vidalia/i18n/po/zh_TW/vidalia_zh_TW.po
index f2632c7..bf8de77 100644
--- a/src/vidalia/i18n/po/zh_TW/vidalia_zh_TW.po
+++ b/src/vidalia/i18n/po/zh_TW/vidalia_zh_TW.po
@@ -1,20 +1,15 @@
-#
-# Translators:
-# 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: 2012-03-21 17:52+0000\n"
-"PO-Revision-Date: 2012-03-22 08:51+0000\n"
-"Last-Translator: tylerlin <msn at tylerlin.com>\n"
+"Project-Id-Version: Vidalia\n"
+"Report-Msgid-Bugs-To: translations at vidalia-project.net\n"
+"POT-Creation-Date: 2009-05-19 23:56+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: \n"
"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: zh_TW\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
"X-Generator: Vidalia ts2po 0.2\n"
msgctxt "AboutDialog"
@@ -37,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 ""
+
+msgctxt "AboutDialog"
+msgid "version"
+msgstr ""
+
msgctxt "AdvancedPage"
msgid "'%1' is not a valid IP address."
msgstr "'%1' 並非有效 IP 地址."
msgctxt "AdvancedPage"
-msgid ""
-"You selected 'Password' authentication, but did not specify a password."
+msgid "You selected 'Password' authentication, but did not specify a password."
msgstr "你選擇了 '密碼' 驗證方式,但是你並未指定密碼。"
msgctxt "AdvancedPage"
@@ -83,6 +93,10 @@ msgid "Vidalia was unable to install the Tor service."
msgstr "Vidalia 無法安裝 Tor 服務。"
msgctxt "AdvancedPage"
+msgid "Control Port"
+msgstr "控制連接埠"
+
+msgctxt "AdvancedPage"
msgid "Authentication:"
msgstr "驗證:"
@@ -139,75 +153,7 @@ msgid "Select the directory used to store data for the Tor software"
msgstr ""
msgctxt "AdvancedPage"
-msgid "Tor Control"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "Use TCP connection (ControlPort)"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "Path:"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "Use Unix domain socket (ControlSocket)"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "Edit current torrc"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "NOTE: this will edit the currently loaded torrc"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "ControlSocket path doesn't exist."
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid ""
-"The specified Tor configuration file location contains characters that "
-"cannot be represented in your system's current 8-bit character encoding."
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid ""
-"The specified Tor data directory location contains characters that cannot be"
-" represented in your system's current 8-bit character encoding."
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "Warning"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "You changed torrc path, would you like to restart Tor?"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "Tor Configuration File (torrc);;All Files (*)"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "Select a file to use for Tor socket path"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid "Configure ControlPort automatically"
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid ""
-"You've checked the autoconfiguration option for the ControlPort, but "
-"provided no Data Directory. Please add one, or uncheck the \"Configure "
-"ControlPort automatically\" option."
-msgstr ""
-
-msgctxt "AdvancedPage"
-msgid ""
-"Vidalia was unable to remove the Tor service.\n"
+msgid "Vidalia was unable to remove the Tor service.\n"
"\n"
"You may need to remove it manually."
msgstr ""
@@ -232,23 +178,6 @@ msgctxt "AppearancePage"
msgid "Vidalia was unable to load the selected language translation."
msgstr "Vidalia 無法載入指定的語言。"
-msgctxt "AppearancePage"
-msgid ""
-"System Icon Preferences (changes will take effect when you restart Vidalia)"
-msgstr ""
-
-msgctxt "AppearancePage"
-msgid "Show the Tray Icon and Dock Icon (default)"
-msgstr ""
-
-msgctxt "AppearancePage"
-msgid "Hide the Tray Icon"
-msgstr ""
-
-msgctxt "AppearancePage"
-msgid "Hide the Dock Icon"
-msgstr ""
-
msgctxt "BandwidthGraph"
msgid "Since:"
msgstr "起始時間:"
@@ -466,9 +395,7 @@ msgid "Remember my password"
msgstr "記住我輸入的密碼"
msgctxt "ControlPasswordInputDialog"
-msgid ""
-"Vidalia has connected to a running Tor process that requires a password. "
-"Please enter your control password:"
+msgid "Vidalia has connected to a running Tor process that requires a password. Please enter your control password:"
msgstr ""
msgctxt "ControlSocket"
@@ -609,7 +536,7 @@ msgstr ""
msgctxt "CountryInfo"
msgid "China"
-msgstr "中國"
+msgstr ""
msgctxt "CountryInfo"
msgid "Colombia"
@@ -917,7 +844,7 @@ msgstr ""
msgctxt "CountryInfo"
msgid "Norway"
-msgstr ""
+msgstr "往後"
msgctxt "CountryInfo"
msgid "Oman"
@@ -961,7 +888,7 @@ msgstr ""
msgctxt "CountryInfo"
msgid "Portugal"
-msgstr ""
+msgstr "連接埠:"
msgctxt "CountryInfo"
msgid "Qatar"
@@ -1184,10 +1111,6 @@ msgid "Zimbabwe"
msgstr ""
msgctxt "CountryInfo"
-msgid "Zaire"
-msgstr ""
-
-msgctxt "CountryInfo"
msgid "Albania"
msgstr ""
@@ -1281,55 +1204,6 @@ msgstr ""
msgctxt "CountryInfo"
msgid "Taiwan"
-msgstr "台灣"
-
-msgctxt "CrashReportDialog"
-msgid "Submit a Crash Report"
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid "Vidalia encountered an error and needed to close"
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid "Restart Vidalia"
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid "Don't Restart"
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid "Unable to restart Vidalia"
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid ""
-"We were unable to automatically restart Vidalia. Please restart Vidalia "
-"manually."
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid "Please fill a ticket in:"
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid ""
-"<a "
-"href=\"https://trac.torproject.org/projects/tor/newticket\">https://trac.torproject.org/projects/tor/newticket</a>"
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid ""
-"A crash report has been created that you can send to the Vidalia developers "
-"to help identify and fix the problem. The submitted report does not contain "
-"any personally identifying information."
-msgstr ""
-
-msgctxt "CrashReportDialog"
-msgid ""
-"with a description of what you were doing before the application crashed, "
-"along with the following files corresponding to the crash report:"
msgstr ""
msgctxt "GeneralPage"
@@ -1349,6 +1223,10 @@ msgid "You must specify the name of your Tor executable."
msgstr "你必須為你的 Tor 執行檔命名"
msgctxt "GeneralPage"
+msgid "The proxy arguments specified are not properly formatted."
+msgstr ""
+
+msgctxt "GeneralPage"
msgid "Start Vidalia when my system starts"
msgstr ""
@@ -1545,10 +1423,7 @@ msgid "Opening External Link"
msgstr "正在開啟外部連結"
msgctxt "HelpTextBrowser"
-msgid ""
-"Vidalia can open the link you selected in your default Web browser. If your "
-"browser is not currently configured to use Tor then the request will not be "
-"anonymous."
+msgid "Vidalia can open the link you selected in your default Web browser. If your browser is not currently configured to use Tor then the request will not be anonymous."
msgstr ""
msgctxt "HelpTextBrowser"
@@ -1560,9 +1435,7 @@ msgid "Unable to Open Link"
msgstr "無法開啟連結"
msgctxt "HelpTextBrowser"
-msgid ""
-"Vidalia was unable to open the selected link in your Web browser. You can "
-"still copy the URL and paste it into your browser."
+msgid "Vidalia was unable to open the selected link in your Web browser. You can still copy the URL and paste it into your browser."
msgstr ""
msgctxt "HelpTextBrowser"
@@ -1605,30 +1478,6 @@ msgctxt "LogEvent"
msgid "Unknown"
msgstr "未知"
-msgctxt "LogTreeItem"
-msgid "Debug"
-msgstr ""
-
-msgctxt "LogTreeItem"
-msgid "Info"
-msgstr ""
-
-msgctxt "LogTreeItem"
-msgid "Notice"
-msgstr ""
-
-msgctxt "LogTreeItem"
-msgid "Warning"
-msgstr ""
-
-msgctxt "LogTreeItem"
-msgid "Error"
-msgstr ""
-
-msgctxt "LogTreeItem"
-msgid "Unknown"
-msgstr ""
-
msgctxt "MainWindow"
msgid "Start Tor"
msgstr "啟動 Tor"
@@ -1774,6 +1623,10 @@ msgid "Connected to the Tor network!"
msgstr "已連線到 Tor 網路!"
msgctxt "MainWindow"
+msgid "Unrecognized startup status"
+msgstr ""
+
+msgctxt "MainWindow"
msgid "miscellaneous"
msgstr "雜項"
@@ -1838,9 +1691,7 @@ msgid "Error Starting Tor"
msgstr "啟動 Tor 時發生錯誤"
msgctxt "MainWindow"
-msgid ""
-"Vidalia was unable to start Tor. Check your settings to ensure the correct "
-"name and location of your Tor executable is specified."
+msgid "Vidalia was unable to start Tor. Check your settings to ensure the correct name and location of your Tor executable is specified."
msgstr "Vidalia 無法啟動 Tor.請檢查 Tor 可執行程序的路徑以及設定是否正確."
msgctxt "MainWindow"
@@ -1876,9 +1727,7 @@ msgid "Cookie Authentication Required"
msgstr "需要 Cookie 驗證"
msgctxt "MainWindow"
-msgid ""
-"The Tor software requires Vidalia to send the contents of an authentication "
-"cookie, but Vidalia was unable to find one."
+msgid "The Tor software requires Vidalia to send the contents of an authentication cookie, but Vidalia was unable to find one."
msgstr ""
msgctxt "MainWindow"
@@ -1898,9 +1747,7 @@ msgid "Error Registering for Events"
msgstr "事件記錄錯誤"
msgctxt "MainWindow"
-msgid ""
-"Vidalia was unable to register for some events. Many of Vidalia's features "
-"may be unavailable."
+msgid "Vidalia was unable to register for some events. Many of Vidalia's features may be unavailable."
msgstr ""
msgctxt "MainWindow"
@@ -1920,9 +1767,7 @@ msgid "Tor Update Available"
msgstr "Tor 有新版本"
msgctxt "MainWindow"
-msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended. Please visit the Tor website to download the latest version."
+msgid "The currently installed version of Tor is out of date or no longer recommended. Please visit the Tor website to download the latest version."
msgstr "你目前安裝的版本已過期，或是官方不再建議你使用。請參訪 Tor 的官網，下載最新版本。"
msgctxt "MainWindow"
@@ -1930,9 +1775,7 @@ msgid "Tor website: %1"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"All subsequent connections will appear to be different than your old "
-"connections."
+msgid "All subsequent connections will appear to be different than your old connections."
msgstr "所有接下來的連接將會不同於之前的連接."
msgctxt "MainWindow"
@@ -1961,7 +1804,7 @@ msgstr "Vidalia 快捷方式"
msgctxt "MainWindow"
msgid "Setup Relaying"
-msgstr "設置中繼服務器\n"
+msgstr "設置中繼服務器"
msgctxt "MainWindow"
msgid "Set up a relay and help the network grow"
@@ -2024,21 +1867,15 @@ msgid "Password Reset Failed"
msgstr "重設密碼失敗"
msgctxt "MainWindow"
-msgid ""
-"Vidalia tried to reset Tor's control password, but was not able to restart "
-"the Tor software. Please check your Task Manager to ensure there are no "
-"other Tor processes running."
+msgid "Vidalia tried to reset Tor's control password, but was not able to restart the Tor software. Please check your Task Manager to ensure there are no other Tor processes running."
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended."
+msgid "The currently installed version of Tor is out of date or no longer recommended."
msgstr "你目前安裝的版本已過期，或是官方不再建議你使用。請參訪 Tor 的官網，下載最新版本。"
msgctxt "MainWindow"
-msgid ""
-"Would you like to check if a newer package is available for installation?"
+msgid "Would you like to check if a newer package is available for installation?"
msgstr ""
msgctxt "MainWindow"
@@ -2046,9 +1883,11 @@ msgid "Potentially Unsafe Connection"
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 ""
msgctxt "MainWindow"
@@ -2060,9 +1899,7 @@ msgid "Your software is up to date"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"There are no new Tor software packages available for your computer at this "
-"time."
+msgid "There are no new Tor software packages available for your computer at this time."
msgstr ""
msgctxt "MainWindow"
@@ -2078,67 +1915,52 @@ 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 "failed (%1)"
msgstr ""
msgctxt "MainWindow"
-msgid "Bootstrapping torrc from %1 to %2"
+msgid "Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
msgstr ""
msgctxt "MainWindow"
-msgid "(probably Telnet)"
+msgid "You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"\n"
+"Would you like to shutdown gracefully and give clients time to find a new relay?"
msgstr ""
msgctxt "MainWindow"
-msgid "(probably an email client)"
+msgid "Vidalia detected that the Tor software exited unexpectedly.\n"
+"\n"
+"Please check the message log for recent warning or error messages."
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"One of your applications %1 appears to be making a potentially unencrypted "
-"and unsafe connection to port %2."
+msgid ", probably Telnet,"
msgstr ""
msgctxt "MainWindow"
-msgid "failed (%1)"
+msgid ", probably an email client,"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
-msgstr ""
+msgid "Vidalia"
+msgstr "Vidalia"
msgctxt "MainWindow"
-msgid ""
-"Vidalia can't find out how to talk to Tor because it can't access this file: %1\n"
-"\n"
-"Here's the last error message:\n"
-"%2"
+msgid "File"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"It seems Tor has stopped running since Vidalia started it.\n"
-"\n"
-"See the Advanced Message Log for more information."
-msgstr ""
+msgid "About Vidalia"
+msgstr "關於 Vidalia"
msgctxt "MainWindow"
-msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
-"\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
-msgstr ""
+msgid "Home"
+msgstr "主頁"
msgctxt "MainWindow"
-msgid ""
-"Vidalia detected that the Tor software exited unexpectedly.\n"
-"\n"
-"Please check the message log for recent warning or error messages."
+msgid "Check For Updates"
msgstr ""
msgctxt "MessageLog"
@@ -2382,6 +2204,10 @@ msgid "messages"
msgstr "訊息"
msgctxt "MessageLog"
+msgid "Always Save New Log Messages"
+msgstr "總是保存新消息"
+
+msgctxt "MessageLog"
msgid "Browse"
msgstr "瀏覽"
@@ -2394,56 +2220,34 @@ 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 ""
-"Messages that appear when something has \n"
+msgid "Messages that appear when something has \n"
"gone very wrong and Tor cannot proceed."
msgstr ""
msgctxt "MessageLog"
-msgid ""
-"Messages that only appear when \n"
+msgid "Messages that only appear when \n"
"something has gone wrong with Tor."
msgstr ""
msgctxt "MessageLog"
-msgid ""
-"Messages that appear infrequently \n"
+msgid "Messages that appear infrequently \n"
"during normal Tor operation and are \n"
"not considered errors, but you may \n"
"care about."
msgstr ""
msgctxt "MessageLog"
-msgid ""
-"Messages that appear frequently \n"
+msgid "Messages that appear frequently \n"
"during normal Tor operation."
msgstr ""
msgctxt "MessageLog"
-msgid ""
-"Hyper-verbose messages primarily of \n"
+msgid "Hyper-verbose messages primarily of \n"
"interest to Tor developers."
msgstr ""
msgctxt "MessageLog"
-msgid ""
-"Cannot write file %1\n"
+msgid "Cannot write file %1\n"
"\n"
"%2."
msgstr ""
@@ -2553,19 +2357,23 @@ msgid "Ctrl+F"
msgstr "Ctrl+F"
msgctxt "NetworkPage"
+msgid "Invalid Bridge"
+msgstr "無效網橋"
+
+msgctxt "NetworkPage"
+msgid "The specified bridge identifier is not valid."
+msgstr "指定網橋識別無效"
+
+msgctxt "NetworkPage"
msgid "Copy (Ctrl+C)"
msgstr "複製(Ctrl+C)"
msgctxt "NetworkPage"
-msgid ""
-"You must specify both an IP address or hostname and a port number to "
-"configure Tor to use a proxy to access the Internet."
+msgid "You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet."
msgstr "你必須指定 Tor 用於訪問網絡的 IP 地址或主機名,以及端口."
msgctxt "NetworkPage"
-msgid ""
-"You must specify one or more ports to which your firewall allows you to "
-"connect."
+msgid "You must specify one or more ports to which your firewall allows you to connect."
msgstr "你必須指定一個或多個端口用於連接防火牆."
msgctxt "NetworkPage"
@@ -2585,10 +2393,18 @@ msgid "Proxy Settings"
msgstr "代理設定"
msgctxt "NetworkPage"
+msgid "HTTP Proxy:"
+msgstr "HTTP 代理:"
+
+msgctxt "NetworkPage"
msgid "Username:"
msgstr "用戶名"
msgctxt "NetworkPage"
+msgid "Use this proxy for HTTPS also"
+msgstr "將此代理同樣應用於 HTTPS"
+
+msgctxt "NetworkPage"
msgid "Password:"
msgstr "密碼:"
@@ -2617,9 +2433,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 ""
msgctxt "NetworkPage"
@@ -2631,10 +2445,18 @@ msgid "Bridge Settings"
msgstr "橋接設定"
msgctxt "NetworkPage"
+msgid "The Tor software you are currently running does not support bridges. <br>Directory connections will still be encrypted."
+msgstr ""
+
+msgctxt "NetworkPage"
msgid "Add a Bridge:"
msgstr "新增一個橋接器："
msgctxt "NetworkPage"
+msgid "<a href=\"bridges.finding\">How do I find a bridge?</a>"
+msgstr "我要如何找到橋接?"
+
+msgctxt "NetworkPage"
msgid "Remove the selected bridges from the list"
msgstr "從列表中移除選中的網橋"
@@ -2655,43 +2477,13 @@ msgid "<a href=\"bridges.finding\">How can I find bridges?</a>"
msgstr ""
msgctxt "NetworkPage"
-msgid ""
-"No new bridges are currently available. You can either wait a while and try "
-"again, or try another method of finding new bridges."
+msgid "No new bridges are currently available. You can either wait a while and try again, or try another method of finding new bridges."
msgstr ""
msgctxt "NetworkPage"
msgid "Click Help to see other methods of finding new bridges."
msgstr ""
-msgctxt "NetworkPage"
-msgid "Address:"
-msgstr ""
-
-msgctxt "NetworkPage"
-msgid "Type:"
-msgstr ""
-
-msgctxt "NetworkPage"
-msgid "You must select the proxy type."
-msgstr ""
-
-msgctxt "NetworkPage"
-msgid "SOCKS 4"
-msgstr ""
-
-msgctxt "NetworkPage"
-msgid "SOCKS 5"
-msgstr ""
-
-msgctxt "NetworkPage"
-msgid "HTTP / HTTPS"
-msgstr ""
-
-msgctxt "NetworkPage"
-msgid "You must specify one or more bridges."
-msgstr ""
-
msgctxt "Policy"
msgid "accept"
msgstr "接受"
@@ -2845,15 +2637,11 @@ msgid "Bridge Support Unavailable"
msgstr "網橋功能不可用"
msgctxt "ServerPage"
-msgid ""
-"You have configured Tor to act as a bridge relay for censored users, but "
-"your version of Tor does not support bridges."
+msgid "You have configured Tor to act as a bridge relay for censored users, but your version of Tor does not support bridges."
msgstr "你已將 Tor 設定為網橋中繼服務器,然而你的 Tor 版本並不支持此功能."
msgctxt "ServerPage"
-msgid ""
-"Please upgrade your Tor software or configure Tor to act as a normal Tor "
-"relay."
+msgid "Please upgrade your Tor software or configure Tor to act as a normal Tor relay."
msgstr "請升級你的 Tor 軟件或者將 Tor 設定為普通中繼服務器."
msgctxt "ServerPage"
@@ -2869,6 +2657,10 @@ msgid "Run as a client only"
msgstr "我只想當用戶端"
msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network"
+msgstr "Tor 網絡中繼"
+
+msgctxt "ServerPage"
msgid "Relay Port:"
msgstr "中繼連接埠:"
@@ -2917,9 +2709,7 @@ msgid "Basic Settings"
msgstr "基本設定"
msgctxt "ServerPage"
-msgid ""
-"For Internet connections with fast download speed but slow upload, please "
-"list your upload speed here."
+msgid "For Internet connections with fast download speed but slow upload, please list your upload speed here."
msgstr "如網絡連接的下行速率較大,而上行速度較慢,請選擇適用的網絡連接類型(主要適用於 DSL 用戶)"
msgctxt "ServerPage"
@@ -2975,14 +2765,12 @@ msgid "Peak bandwidth rate limit"
msgstr "峰值帶寬速率限制"
msgctxt "ServerPage"
-msgid ""
-"Your maximum bandwidth rate must be greater than or equal to your average "
-"bandwidth rate. Both values must be at least 20 KB/s."
+msgid "Your maximum bandwidth rate must be greater than or equal to your average bandwidth rate. Both values must be at least 20 KB/s."
msgstr "你的最大帶寬速率必須大於或等於你的平均帶寬速率.兩個數值必須至少 20KB/s"
msgctxt "ServerPage"
msgid "Bandwidth Limits"
-msgstr "頻寬限制"
+msgstr "帶寬限制"
msgctxt "ServerPage"
msgid "Ports 6660 - 6669 and 6697"
@@ -3018,7 +2806,7 @@ msgstr "即時通訊服務(IM)"
msgctxt "ServerPage"
msgid "Port 443"
-msgstr "連接埠 443"
+msgstr "端口: 443"
msgctxt "ServerPage"
msgid "Secure Websites (SSL)"
@@ -3037,14 +2825,11 @@ msgid "Show help topic on exit policies"
msgstr "顯示關於服務策略的相關幫助主題"
msgctxt "ServerPage"
-msgid ""
-"What Internet resources should users be able to access from your relay?"
+msgid "What Internet resources should users be able to access from your relay?"
msgstr "你要讓其他使用者從你的 relay 使用何種網路資源?"
msgctxt "ServerPage"
-msgid ""
-"Tor will still block some outgoing mail and file sharing applications by "
-"default to reduce spam and other abuse."
+msgid "Tor will still block some outgoing mail and file sharing applications by default to reduce spam and other abuse."
msgstr "預設情況下，Tor 仍然會阻擋某些外送郵件與檔案分享軟體，以免遭到濫用。"
msgctxt "ServerPage"
@@ -3056,8 +2841,7 @@ msgid "Let others access your bridge by giving them this line:"
msgstr ""
msgctxt "ServerPage"
-msgid ""
-"This is the identity of your bridge relay that you can give to other people"
+msgid "This is the identity of your bridge relay that you can give to other people"
msgstr ""
msgctxt "ServerPage"
@@ -3073,9 +2857,7 @@ msgid "No clients have used your relay recently."
msgstr ""
msgctxt "ServerPage"
-msgid ""
-"Leave your relay running so clients have a better chance of finding and "
-"using it."
+msgid "Leave your relay running so clients have a better chance of finding and using it."
msgstr ""
msgctxt "ServerPage"
@@ -3087,9 +2869,7 @@ msgid "Vidalia was unable to retrieve your bridge's usage history."
msgstr "Vidalia 無法保存你的 %1 設定."
msgctxt "ServerPage"
-msgid ""
-"Tor returned an improperly formatted response when Vidalia requested your "
-"bridge's usage history."
+msgid "Tor returned an improperly formatted response when Vidalia requested your bridge's usage history."
msgstr ""
msgctxt "ServerPage"
@@ -3105,28 +2885,11 @@ msgid "<a href=\"#bridgeUsage\">Who has used my bridge?</a>"
msgstr "我要如何找到橋接?"
msgctxt "ServerPage"
-msgid "<a href=\"#bridgeHelp\">What's this?</a>"
-msgstr ""
-
-msgctxt "ServerPage"
-msgid "Automatically distribute my bridge address"
-msgstr ""
-
-msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network (exit relay)"
-msgstr ""
-
-msgctxt "ServerPage"
-msgid "Relay traffic inside the Tor network (non-exit relay)"
-msgstr ""
-
-msgctxt "ServerPage"
msgid "Mirror the Relay Directory"
msgstr ""
msgctxt "ServerPage"
-msgid ""
-"Email address at which you may be reached if there is a\n"
+msgid "Email address at which you may be reached if there is a\n"
"problem with your relay. You might also include your PGP or GPG fingerprint."
msgstr ""
@@ -3135,9 +2898,7 @@ msgid "Error while trying to unpublish all services"
msgstr ""
msgctxt "ServicePage"
-msgid ""
-"Please configure at least a service directory and a virtual port for each "
-"service you want to save. Remove the other ones."
+msgid "Please configure at least a service directory and a virtual port for each service you want to save. Remove the other ones."
msgstr ""
msgctxt "ServicePage"
@@ -3212,251 +2973,6 @@ msgctxt "ServicePage"
msgid "Created by Tor"
msgstr ""
-msgctxt "StatusEventWidget"
-msgid "Copy to Clipboard"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "The Tor Software is Running"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "You are currently running version \"%1\" of the Tor software."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "The Tor Software is not Running"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Click \"Start Tor\" in the Vidalia Control Panel to restart the Tor "
-"software. If Tor exited unexpectedly, select the \"Advanced\" tab above for "
-"details about any errors encountered."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"You are currently running version \"%1\" of the Tor software, which is no "
-"longer recommended. Please upgrade to the most recent version of the "
-"software, which may contain important security, reliability and performance "
-"fixes."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"You are currently running version \"%1\" of the Tor software, which may no "
-"longer work with the current Tor network. Please upgrade to the most recent "
-"version of the software, which may contain important security, reliability "
-"and performance fixes."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Your Tor Software is Out-of-date"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Connected to the Tor Network"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"We were able to successfully establish a connection to the Tor network. You "
-"can now configure your applications to use the Internet anonymously."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Tor Software Error"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"The Tor software encountered an internal bug. Please report the following "
-"error message to the Tor developers at bugs.torproject.org: \"%1\""
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Tor has determined that your computer's clock may be set to %1 seconds in "
-"the past compared to the source \"%2\". If your clock is not correct, Tor "
-"will not be able to function. Please verify your computer displays the "
-"correct time."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Tor has determined that your computer's clock may be set to %1 seconds in "
-"the future compared to the source \"%2\". If your clock is not correct, Tor "
-"will not be able to function. Please verify your computer displays the "
-"correct time."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Your Computer's Clock is Potentially Incorrect"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"One of the applications on your computer may have attempted to make an "
-"unencrypted connection through Tor to port %1. Sending unencrypted "
-"information over the Tor network is dangerous and not recommended. For your "
-"protection, Tor has automatically closed this connection."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"One of the applications on your computer may have attempted to make an "
-"unencrypted connection through Tor to port %1. Sending unencrypted "
-"information over the Tor network is dangerous and not recommended."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Potentially Dangerous Connection!"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"One of your applications established a connection through Tor to \"%1\" "
-"using a protocol that may leak information about your destination. Please "
-"ensure you configure your applications to use only SOCKS4a or SOCKS5 with "
-"remote hostname resolution."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Unknown SOCKS Protocol"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"One of your applications tried to establish a connection through Tor using a"
-" protocol that Tor does not understand. Please ensure you configure your "
-"applications to use only SOCKS4a or SOCKS5 with remote hostname resolution."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Invalid Destination Hostname"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"One of your applications tried to establish a connection through Tor to "
-"\"%1\", which Tor does not recognize as a valid hostname. Please check your "
-"application's configuration."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "External IP Address Changed"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Tor has determined your relay's public IP address is currently %1%2. If that"
-" is not correct, please consider setting the 'Address' option in your "
-"relay's configuration."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "DNS Hijacking Detected"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Tor detected that your DNS provider is providing false responses for domains"
-" that do not exist. Some ISPs and other DNS providers, such as OpenDNS, are "
-"known to do this in order to display their own search or advertising pages."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Tor detected that your DNS provider is providing false responses for well "
-"known domains. Since clients rely on Tor network relays to provide accurate "
-"DNS repsonses, your relay will not be configured as an exit relay."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Checking Server Port Reachability"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Tor is trying to determine if your relay's server port is reachable from the"
-" Tor network by connecting to itself at %1:%2. This test could take several "
-"minutes."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Server Port Reachability Test Successful!"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Your relay's server port is reachable from the Tor network!"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Server Port Reachability Test Failed"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Your relay's server port is not reachable by other Tor clients. This can "
-"happen if you are behind a router or firewall that requires you to set up "
-"port forwarding. If %1:%2 is not your correct IP address and server port, "
-"please check your relay's configuration."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Checking Directory Port Reachability"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Tor is trying to determine if your relay's directory port is reachable from "
-"the Tor network by connecting to itself at %1:%2. This test could take "
-"several minutes."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Directory Port Reachability Test Successful!"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Your relay's directory port is reachable from the Tor network!"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Directory Port Reachability Test Failed"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Your relay's directory port is not reachable by other Tor clients. This can "
-"happen if you are behind a router or firewall that requires you to set up "
-"port forwarding. If %1:%2 is not your correct IP address and directory port,"
-" please check your relay's configuration."
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Relay Descriptor Rejected"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Your relay's descriptor, which enables clients to connect to your relay, was"
-" rejected by the directory server at %1:%2. The reason given was: %3"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid "Your Relay is Online"
-msgstr ""
-
-msgctxt "StatusEventWidget"
-msgid ""
-"Your relay is now online and available for Tor clients to use. You should "
-"see an increase in network traffic shown by the Bandwidth Graph within a few"
-" hours as more clients learn about your relay. Thank you for contributing to"
-" the Tor network!"
-msgstr ""
-
msgctxt "Stream"
msgid "New"
msgstr "新建"
@@ -3509,75 +3025,13 @@ msgctxt "TorSettings"
msgid "Failed to hash the control password."
msgstr "無法切細主密碼。"
-msgctxt "TorrcDialog"
-msgid "Editing torrc"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid ""
-"Save settings. If unchecked it will only apply settings to the current Tor "
-"instance."
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Cut"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Copy"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Paste"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Undo"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Redo"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Select All"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Apply all"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Apply selection only"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Error connecting to Tor"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Selection is empty. Please select some text, or check \"Apply all\""
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Error at line %1: \"%2\""
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "Error"
-msgstr ""
-
-msgctxt "TorrcDialog"
-msgid "An error ocurred while opening torrc file"
-msgstr ""
-
msgctxt "UPNPControl"
msgid "Success"
msgstr "成功"
msgctxt "UPNPControl"
msgid "No UPnP-enabled devices found"
-msgstr "沒找到使用 UPnP 的裝置"
+msgstr "沒找到啟用 UPnP的裝置"
msgctxt "UPNPControl"
msgid "No valid UPnP-enabled Internet gateway devices found"
@@ -3605,7 +3059,7 @@ msgstr "未知的錯誤"
msgctxt "UPNPTestDialog"
msgid "Discovering UPnP-enabled devices"
-msgstr "正在尋找使用 UPnP 的裝置"
+msgstr "正在尋找啟用 UPnP的裝置"
msgctxt "UPNPTestDialog"
msgid "Updating directory port mapping"
@@ -3628,15 +3082,11 @@ msgid "Testing Universal Plug & Play Support"
msgstr "正在測試 UPnP 是否支援"
msgctxt "UpdateProcess"
-msgid ""
-"Vidalia was unable to check for available software updates because it could "
-"not find '%1'."
+msgid "Vidalia was unable to check for available software updates because it could not find '%1'."
msgstr ""
msgctxt "UpdateProcess"
-msgid ""
-"Vidalia was unable to check for available software updates because Tor's "
-"update process exited unexpectedly."
+msgid "Vidalia was unable to check for available software updates because Tor's update process exited unexpectedly."
msgstr ""
msgctxt "UpdateProgressDialog"
@@ -3792,10 +3242,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 ""
@@ -3808,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 ""
@@ -3845,3 +3290,4 @@ msgstr ""
msgctxt "stringutil.h"
msgid "%1 mins"
msgstr ""
+
diff --git a/src/vidalia/i18n/po/zu/qt_zu.po b/src/vidalia/i18n/po/zu/qt_zu.po
index aedebb9..da31ae8 100644
--- a/src/vidalia/i18n/po/zu/qt_zu.po
+++ b/src/vidalia/i18n/po/zu/qt_zu.po
@@ -1,11 +1,10 @@
#
-# Translators:
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-08-20 03:25+0000\n"
-"PO-Revision-Date: 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"
@@ -431,5 +430,3 @@ msgstr ""
msgctxt "QFileSystemModel"
msgid "%1 bytes"
msgstr ""
-
-
diff --git a/src/vidalia/i18n/po/zu/vidalia_zu.po b/src/vidalia/i18n/po/zu/vidalia_zu.po
index 1d680ee..68927a4 100644
--- a/src/vidalia/i18n/po/zu/vidalia_zu.po
+++ b/src/vidalia/i18n/po/zu/vidalia_zu.po
@@ -1,11 +1,10 @@
#
-# Translators:
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-09-07 14:40+0000\n"
-"PO-Revision-Date: 2010-12-05 20:03+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"
@@ -193,10 +192,6 @@ 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"
@@ -236,10 +231,6 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr ""
-
-msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -279,6 +270,10 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr ""
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -432,17 +427,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"
@@ -1266,44 +1270,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"
@@ -1331,10 +1342,6 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr ""
-
-msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1362,6 +1369,10 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr ""
+
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1644,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 ""
@@ -1680,10 +1663,6 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1796,10 +1775,6 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1882,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 ""
@@ -1934,82 +1897,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 ""
@@ -2057,19 +1949,39 @@ 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)"
+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"
@@ -2091,17 +2003,35 @@ msgid ""
msgstr ""
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"
@@ -2357,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"
@@ -2412,10 +2334,6 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2515,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 ""
@@ -2840,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 ""
@@ -3088,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 ""
@@ -3132,10 +3070,6 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
-msgid "Form"
-msgstr ""
-
-msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3424,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 ""
@@ -3460,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 ""
@@ -3538,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 ""
@@ -3666,6 +3646,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 ""
@@ -3759,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 ""
@@ -3812,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 95e3101..1105cf7 100644
--- a/src/vidalia/i18n/vidalia_i18n.qrc
+++ b/src/vidalia/i18n/vidalia_i18n.qrc
@@ -2,66 +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_my.qm</file>
- <file>vidalia_eu.qm</file>
- <file>vidalia_hr_HR.qm</file>
- <file>vidalia_sr.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_my.qm</file>
- <file>qt_eu.qm</file>
- <file>qt_hr_HR.qm</file>
- <file>qt_sr.qm</file>
+ <file>qt_zh_TW.qm</file>
</qresource>
</RCC>
diff --git a/src/vidalia/log/LogFilter.cpp b/src/vidalia/log/LogFilter.cpp
new file mode 100644
index 0000000..d7b64d6
--- /dev/null
+++ b/src/vidalia/log/LogFilter.cpp
@@ -0,0 +1,241 @@
+/*
+** 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 LogFilter.cpp
+** \brief Object used to filter message log history
+*/
+
+#include "LogFilter.h"
+#include <QStack>
+
+/** Constructor taking severity as argument. */
+LogFilter::LogFilter(uint filter)
+ : _filter(filter)
+{
+}
+
+/** Default destructor. */
+LogFilter::~LogFilter()
+{
+}
+
+/** Evaluate if message should be included into log history.
+ * \param type Message severity
+ * \param message Message
+ */
+bool
+LogFilter::eval(tc::Severity type, const QString &message) const
+{
+ Q_UNUSED(message);
+ return (_filter & (uint)type);
+}
+
+/** Constructor regular expression and severity. */
+LogFilterRegExp::LogFilterRegExp(const QRegExp &exp, uint filter)
+ :LogFilter(filter)
+ ,_regExp(exp)
+{
+
+}
+
+/** Evaluate if message should be included into log history.
+ * \param type Message severity
+ * \param message Message
+ */
+bool
+LogFilterRegExp::eval(tc::Severity type, const QString &message) const
+{
+ if (LogFilter::eval(type, message))
+ return _regExp.isValid() ? message.contains(_regExp) : true;
+ return false;
+}
+
+/** Helper class for search expression tree. */
+class LogFilterSearchTerm::ExpTree {
+public:
+ ExpTree(const QString& value=QString())
+ {
+ _value = value;
+ _left = NULL;
+ _right = NULL;
+ _invert = false;
+ }
+
+ ~ExpTree()
+ {
+ if (_left)
+ delete _left;
+ if (_right)
+ delete _right;
+ }
+
+ bool eval(const QString& input)
+ {
+ if (_value.isEmpty())
+ return true;
+ bool result;
+ if (_value == "|") {
+ if (!_left || !_right)
+ return false;
+ result = _left->eval(input) || _right->eval(input);
+ } else if (_value == "&") {
+ if (!_left || !_right)
+ return false;
+ result = _left->eval(input) && _right->eval(input);
+ } else {
+ result = input.contains(_value);
+ }
+ return _invert ? !result : result;
+ }
+
+private:
+ /** Stores the value of this node, can be a string or operator. */
+ QString _value;
+ /** Remembers if the result of this node evaluation should be inverted. */
+ bool _invert;
+ /** Left child node. */
+ ExpTree * _left;
+ /** Right child node. */
+ ExpTree * _right;
+
+ friend class LogFilterSearchTerm;
+};
+
+/** Constructor taking search term and severity as arguments. */
+LogFilterSearchTerm::LogFilterSearchTerm(const QString &term, uint filter)
+ :LogFilter(filter)
+ ,_expressionTree(NULL)
+{
+ parseString(term);
+}
+
+/** Default destructor. */
+LogFilterSearchTerm::~LogFilterSearchTerm()
+{
+ if (_expressionTree)
+ delete _expressionTree;
+}
+
+/** Evaluate if message should be included into log history.
+ * \param type Message severity
+ * \param msg Message
+ */
+bool
+LogFilterSearchTerm::eval(tc::Severity type, const QString &msg) const
+{
+ if (LogFilter::eval(type, msg))
+ return _expressionTree->eval(msg);
+ return false;
+}
+
+/** Helper method that inserts string into list and clears it. */
+void
+addToQueue(QList<QString>& queue, QString& token)
+{
+ if (!token.isEmpty()) {
+ queue.append(token);
+ token.clear();
+ }
+}
+
+/** Helper method used to parse input string and create regular expression.
+ * It uses 'Shunting-yard algorithm' to build reverse polish notation of
+ * the input expression. This output is then converted to expression tree
+ * for evaluation.
+ */
+void
+LogFilterSearchTerm::parseString(const QString& input)
+{
+ QStack<QString> stack; /* Stack for operators */
+ QList<QString> outputQueue; /* RPN output */
+ QString pattern = input;
+ pattern.replace("OR","|");
+ pattern.replace("AND","&");
+ pattern.replace("NOT","!");
+
+ /* Step 1: create RPN of input expression. */
+ QString token;
+ foreach (const QChar& c, pattern) {
+ if (c.isSpace())
+ continue;
+ if (c=='!' || c=='&' || c=='|') {
+ addToQueue(outputQueue, token);
+ /* Checking operator precedence with op on top of the stack. */
+ while (!stack.isEmpty()) {
+ QString op = stack.top();
+ if (c=='&' || c=='|') {
+ if (op=="!") {
+ addToQueue(outputQueue, op);
+ stack.pop();
+ } else {
+ break;
+ }
+ } else {
+ break;
+ }
+ }
+ stack.push(c);
+ } else if (c=='(') {
+ addToQueue(outputQueue, token);
+ stack.push(c);
+ } else if (c==')') {
+ addToQueue(outputQueue, token);
+ while (!stack.isEmpty()) {
+ QString tmp = stack.pop();
+ if (tmp=="(") {
+ break;
+ } else {
+ addToQueue(outputQueue, tmp);
+ }
+ }
+ } else {
+ token += c;
+ }
+ }
+ addToQueue(outputQueue, token);
+ while (!stack.isEmpty()) {
+ QString top = stack.pop();
+ addToQueue(outputQueue, top);
+ }
+
+ /* Step 2: convert RPN expression to binary tree. */
+ QStack<ExpTree*> tree;
+ foreach (QString s, outputQueue) {
+ if (s == "!") {
+ if (tree.isEmpty()) {
+ break;
+ }
+ ExpTree * top = tree.top();
+ top->_invert = !top->_invert;
+ } else if (s == "&" || s == "|") {
+ if (tree.count() < 2) {
+ qDeleteAll(tree);
+ tree.clear();
+ break;
+ }
+ ExpTree * node = new ExpTree(s);
+ node->_left = tree.pop();
+ node->_right = tree.pop();
+ tree.push(node);
+ } else {
+ tree.push(new ExpTree(s));
+ }
+ }
+ if (_expressionTree)
+ delete _expressionTree;
+ /* If everything is ok, there should be only one item left on stack */
+ if (tree.count() == 1) {
+ _expressionTree = tree.top();
+ } else {
+ qDeleteAll(tree);
+ _expressionTree = new ExpTree();
+ }
+}
diff --git a/src/vidalia/log/LogFilter.h b/src/vidalia/log/LogFilter.h
new file mode 100644
index 0000000..f1bb415
--- /dev/null
+++ b/src/vidalia/log/LogFilter.h
@@ -0,0 +1,70 @@
+/*
+** 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 LogFilter.h
+** \brief Object used to filter message log history
+*/
+
+#ifndef _LOGFILTER_H
+#define _LOGFILTER_H
+
+#include "tcglobal.h"
+#include <QRegExp>
+
+/** Base class for objects used to filter log history. */
+class LogFilter {
+
+public:
+ /** Constructor taking severity filter as argument. */
+ LogFilter(uint filter);
+ virtual ~LogFilter();
+ /** Method used to evaluate given log message. */
+ virtual bool eval(tc::Severity type, const QString& message) const;
+
+private:
+ /** Stores severity filter */
+ uint _filter;
+};
+
+
+/** Message filter based on regular expression. */
+class LogFilterRegExp : public LogFilter {
+
+public:
+ LogFilterRegExp(const QRegExp& exp, uint filter);
+ bool eval(tc::Severity type, const QString &message) const;
+
+private:
+ /** Stores regular expression used to filter messages. */
+ QRegExp _regExp;
+};
+
+
+/** Message filter based on simple search query. */
+class LogFilterSearchTerm : public LogFilter {
+
+public:
+ LogFilterSearchTerm(const QString& term, uint filter);
+ ~LogFilterSearchTerm();
+ bool eval(tc::Severity type, const QString &message) const;
+
+private:
+ class ExpTree;
+
+ /** Helper method used to create expression tree from given query. */
+ void parseString(const QString& input);
+
+ /** Stores the expression tree for filtering messages. */
+ ExpTree * _expressionTree;
+};
+
+#endif
+
diff --git a/src/vidalia/log/LogTreeWidget.cpp b/src/vidalia/log/LogTreeWidget.cpp
index eb20bea..2b8aeb2 100644
--- a/src/vidalia/log/LogTreeWidget.cpp
+++ b/src/vidalia/log/LogTreeWidget.cpp
@@ -60,7 +60,7 @@ LogTreeWidget::verticalSliderReleased()
/** Cast a QList of QTreeWidgetItem pointers to a list of LogTreeWidget
* pointers. There really must be a better way to do this. */
QList<LogTreeItem *>
-LogTreeWidget::qlist_cast(QList<QTreeWidgetItem *> inlist)
+LogTreeWidget::qlist_cast(QList<QTreeWidgetItem *> inlist) const
{
QList<LogTreeItem *> outlist;
foreach (QTreeWidgetItem *item, inlist) {
@@ -71,7 +71,7 @@ LogTreeWidget::qlist_cast(QList<QTreeWidgetItem *> inlist)
/** Sorts the list of pointers to log tree items by timestamp. */
QList<LogTreeItem *>
-LogTreeWidget::qlist_sort(QList<LogTreeItem *> inlist)
+LogTreeWidget::qlist_sort(QList<LogTreeItem *> inlist) const
{
QMap<quint32, LogTreeItem *> outlist;
foreach (LogTreeItem *item, inlist) {
@@ -106,7 +106,7 @@ LogTreeWidget::clearMessages()
/** Returns a list of all currently selected items. */
QStringList
-LogTreeWidget::selectedMessages()
+LogTreeWidget::selectedMessages() const
{
QStringList messages;
@@ -123,7 +123,7 @@ LogTreeWidget::selectedMessages()
/** Returns a list of all items in the tree. */
QStringList
-LogTreeWidget::allMessages()
+LogTreeWidget::allMessages() const
{
QStringList messages;
@@ -229,12 +229,16 @@ LogTreeWidget::addLogTreeItem(LogTreeItem *item)
/** Filters the message log based on the given filter. */
void
-LogTreeWidget::filter(uint filter)
+LogTreeWidget::filter(LogFilter * filter)
{
+ if (!filter) {
+ return;
+ }
int itemsShown = 0;
for (int i = _itemHistory.size()-1; i >= 0; i--) {
LogTreeItem *item = _itemHistory.at(i);
- if ((itemsShown < _maxItemCount) && (filter & item->severity())) {
+ tc::Severity type = item->severity();
+ if ((itemsShown < _maxItemCount) && filter->eval(type,item->message())) {
itemsShown++;
} else {
int itemIndex = indexOfTopLevelItem(item);
diff --git a/src/vidalia/log/LogTreeWidget.h b/src/vidalia/log/LogTreeWidget.h
index 298038d..c87f3d4 100644
--- a/src/vidalia/log/LogTreeWidget.h
+++ b/src/vidalia/log/LogTreeWidget.h
@@ -17,6 +17,7 @@
#define _LOGTREEWIDGET_H
#include "LogTreeItem.h"
+#include "LogFilter.h"
#include "TorControl.h"
@@ -44,9 +45,9 @@ public:
LogTreeWidget(QWidget *parent = 0);
/** Returns a list of all currently selected messages. */
- QStringList selectedMessages();
+ QStringList selectedMessages() const;
/** Returns a list of all messages in the tree. */
- QStringList allMessages();
+ QStringList allMessages() const;
/** Deselects all currently selected messages. */
void deselectAll();
@@ -55,8 +56,8 @@ public:
/** Sets the maximum number of items in the tree. */
void setMaximumMessageCount(int max);
/** Filters the log according to the specified filter. */
- void filter(uint filter);
-
+ void filter(LogFilter * filter);
+
/** Adds a log item to the tree. */
LogTreeItem* log(tc::Severity severity, const QString &message);
@@ -79,9 +80,9 @@ private:
/** Adds <b>item</b> as a top-level item in the tree. */
void addLogTreeItem(LogTreeItem *item);
/** Casts a QList of one pointer type to another. */
- QList<LogTreeItem *> qlist_cast(QList<QTreeWidgetItem *> inlist);
+ QList<LogTreeItem *> qlist_cast(QList<QTreeWidgetItem *> inlist) const;
/** Sortrs a QList of pointers to tree items. */
- QList<LogTreeItem *> qlist_sort(QList<LogTreeItem *> inlist);
+ QList<LogTreeItem *> qlist_sort(QList<LogTreeItem *> inlist) const;
/**< List of pointers to all log message items currently in the tree. */
QList<LogTreeItem *> _itemHistory;
diff --git a/src/vidalia/log/MessageLog.cpp b/src/vidalia/log/MessageLog.cpp
index 796f28d..f1a1871 100644
--- a/src/vidalia/log/MessageLog.cpp
+++ b/src/vidalia/log/MessageLog.cpp
@@ -26,8 +26,11 @@
#include <QMessageBox>
#include <QClipboard>
+#include <QToolBar>
+
/* Message log settings */
#define SETTING_MSG_FILTER "MessageFilter"
+#define SETTING_FILTER_TERM "MessageFilterSearchTerm"
#define SETTING_MAX_MSG_COUNT "MaxMsgCount"
#define SETTING_ENABLE_LOGFILE "EnableLogFile"
#define SETTING_LOGFILE "LogFile"
@@ -43,6 +46,7 @@
#else
#define DEFAULT_LOGFILE (QDir::homePath() + "/.tor/tor-log.txt")
#endif
+#define DEFAULT_FILTER_TERM ""
#define ADD_TO_FILTER(f,v,b) (f = ((b) ? ((f) | (v)) : ((f) & ~(v))))
@@ -54,8 +58,10 @@
* \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),
+ _logFilter(NULL),
+ _statusBar(st)
{
/* Invoke Qt Designer generated QObject setup routine */
ui.setupUi(this);
@@ -77,7 +83,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
@@ -85,6 +92,8 @@ MessageLog::MessageLog(QWidget *parent, Qt::WFlags flags)
MessageLog::~MessageLog()
{
_logFile.close();
+ if (_logFilter)
+ delete _logFilter;
}
/** Binds events (signals) to actions (slots). */
@@ -121,6 +130,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
@@ -145,6 +167,13 @@ MessageLog::setToolTips()
"during normal Tor operation."));
ui.chkTorDebug->setToolTip(tr("Hyper-verbose messages primarily of \n"
"interest to Tor developers."));
+ ui.chkFilterSearch->setToolTip(tr("Custom filter based on search term."));
+ ui.lineSearchTerm->setToolTip(tr("Here you can type a search term used \n"
+ "to filter log messages. Recognized "
+ "keywords: \nNOT, AND, OR.\n"
+ "You can use brackets for grouping.\n"
+ "To input regular expression in perl\n"
+ "syntax, use \\r prefix."));
}
/** Called when the user changes the UI translation. */
@@ -152,6 +181,7 @@ void
MessageLog::retranslateUi()
{
ui.retranslateUi(this);
+ setTitle(tr("Message Log"));
setToolTips();
}
@@ -164,7 +194,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,
@@ -184,9 +213,18 @@ MessageLog::loadSettings()
ui.chkTorDebug->setChecked(_filter & tc::DebugSeverity);
registerLogEvents();
+ /* Load custom search term filter */
+ const QString term = getSetting(SETTING_FILTER_TERM, DEFAULT_FILTER_TERM)
+ .toString();
+ ui.chkFilterSearch->setChecked(!term.isEmpty());
+ ui.lineSearchTerm->setEnabled(!term.isEmpty());
+
+ ui.lineSearchTerm->setText(term);
+ buildMessageFilter(term);
+
/* Filter the message log */
QApplication::setOverrideCursor(Qt::WaitCursor);
- ui.listMessages->filter(_filter);
+ ui.listMessages->filter(_logFilter);
QApplication::restoreOverrideCursor();
}
@@ -262,7 +300,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;
@@ -274,9 +311,17 @@ MessageLog::saveSettings()
saveSetting(SETTING_MSG_FILTER, filter);
registerLogEvents();
+ /* Save search term filter */
+ QString term;
+ if (ui.chkFilterSearch->isChecked()) {
+ term = ui.lineSearchTerm->text();
+ }
+ saveSetting(SETTING_FILTER_TERM, term);
+ buildMessageFilter(term);
+
/* Filter the message log */
QApplication::setOverrideCursor(Qt::WaitCursor);
- ui.listMessages->filter(_filter);
+ ui.listMessages->filter(_logFilter);
QApplication::restoreOverrideCursor();
/* Hide the settings frame and reset toggle button*/
@@ -351,29 +396,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 +418,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 +431,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 +451,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) {
@@ -445,6 +467,18 @@ MessageLog::find()
}
}
+/** Tests if message should be added to the Message History.
+ * \param severity The message's severity type.
+ * \param message The log message to be tested.
+ */
+bool
+MessageLog::testMessage(tc::Severity severity, const QString &message) const
+{
+ if (_logFilter)
+ return _logFilter->eval(severity, message);
+ return true;
+}
+
/** Writes a message to the Message History and tags it with
* the proper date, time and type.
* \param type The message's severity type.
@@ -455,17 +489,19 @@ MessageLog::log(tc::Severity type, const QString &message)
{
setUpdatesEnabled(false);
/* Only add the message if it's not being filtered out */
- if (_filter & (uint)type) {
+ if (testMessage(type, message)) {
/* Add the message to the list and scroll to it if necessary. */
LogTreeItem *item = ui.listMessages->log(type, 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) {
@@ -482,3 +518,23 @@ MessageLog::help()
emit helpRequested("log");
}
+/** Create regular expression used to filter incoming log messages.
+ * \param input String used to create reg exp.
+ */
+void
+MessageLog::buildMessageFilter(const QString &input)
+{
+ if (_logFilter)
+ delete _logFilter;
+
+ if (input.isEmpty()) {
+ _logFilter = new LogFilter(_filter);
+ } else if (input.startsWith("\\r")) {
+ QString pattern = input;
+ pattern.remove(0,2);
+ const QRegExp rx(pattern.trimmed(), Qt::CaseSensitive, QRegExp::RegExp);
+ _logFilter = new LogFilterRegExp(rx, _filter);
+ } else {
+ _logFilter = new LogFilterSearchTerm(input, _filter);
+ }
+}
diff --git a/src/vidalia/log/MessageLog.h b/src/vidalia/log/MessageLog.h
index 08cecd4..6595eea 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();
@@ -78,18 +78,26 @@ private:
void save(const QStringList &messages);
/** Rotates the log file based on the filename and the current logging status. */
bool rotateLogFile(const QString &filename);
+ /** Test if given log message should be included into message history. */
+ bool testMessage(tc::Severity severity, const QString& message) const;
+ /** Create filter for log messages. */
+ void buildMessageFilter(const QString& input);
/** A pointer to a TorControl object, used to register for log events */
TorControl* _torControl;
/** A VidaliaSettings object that handles getting/saving settings **/
VidaliaSettings* _settings;
- /** Stores the current message filter */
+ /** Stores the current message severity filter */
uint _filter;
+ /** Stores message filter */
+ LogFilter* _logFilter;
/** Set to true if we will log all messages to a file. */
bool _enableLogging;
- /* The log file used to store log messages. */
+ /** The log file used to store log messages. */
LogFile _logFile;
+ QPointer<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..7b8e05a 100644
--- a/src/vidalia/log/MessageLog.ui
+++ b/src/vidalia/log/MessageLog.ui
@@ -1,499 +1,473 @@
<?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>671</width>
+ <height>626</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="QGridLayout" name="gridLayout_2">
+ <item row="1" column="2">
+ <layout class="QGridLayout" name="gridLayout_3">
+ <property name="horizontalSpacing">
+ <number>0</number>
+ </property>
+ <item row="0" column="1">
+ <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 row="1" column="1">
+ <widget class="QFrame" name="frmSettings">
+ <property name="enabled">
+ <bool>true</bool>
+ </property>
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="minimumSize">
+ <size>
+ <width>520</width>
+ <height>261</height>
+ </size>
+ </property>
+ <property name="maximumSize">
+ <size>
+ <width>800</width>
+ <height>261</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>
+ <property name="spacing">
+ <number>3</number>
</property>
- <item row="0" column="0">
- <widget class="LogTreeWidget" name="listMessages">
+ <item row="1" column="1">
+ <widget class="QGroupBox" name="grpLogHistory">
<property name="contextMenuPolicy">
<enum>Qt::NoContextMenu</enum>
</property>
- <property name="autoFillBackground">
- <bool>false</bool>
- </property>
- <property name="alternatingRowColors">
- <bool>true</bool>
+ <property name="title">
+ <string>Message Log History</string>
</property>
- <property name="selectionMode">
- <enum>QAbstractItemView::ExtendedSelection</enum>
- </property>
- <property name="rootIsDecorated">
- <bool>false</bool>
+ <layout class="QHBoxLayout" name="_5">
+ <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="0" column="1" colspan="2">
+ <widget class="QGroupBox" name="grpLogFilter">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Minimum" vsizetype="MinimumExpanding">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
</property>
- <property name="uniformRowHeights">
- <bool>true</bool>
+ <property name="minimumSize">
+ <size>
+ <width>0</width>
+ <height>170</height>
+ </size>
</property>
- <property name="itemsExpandable">
- <bool>false</bool>
+ <property name="contextMenuPolicy">
+ <enum>Qt::NoContextMenu</enum>
</property>
- <property name="sortingEnabled">
- <bool>true</bool>
+ <property name="title">
+ <string>Message Filter</string>
</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>
+ <layout class="QGridLayout" name="_2">
+ <property name="sizeConstraint">
+ <enum>QLayout::SetDefaultConstraint</enum>
</property>
- </column>
- </widget>
- </item>
- </layout>
- </widget>
- </widget>
- </item>
- <item>
- <widget class="QFrame" name="frmSettings">
- <property name="enabled">
- <bool>true</bool>
- </property>
- <property name="sizePolicy">
- <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="minimumSize">
- <size>
- <width>520</width>
- <height>183</height>
- </size>
- </property>
- <property name="maximumSize">
- <size>
- <width>520</width>
- <height>183</height>
- </size>
- </property>
- <property name="contextMenuPolicy">
- <enum>Qt::NoContextMenu</enum>
- </property>
- <property name="visible">
- <bool>false</bool>
- </property>
- <property name="frameShape">
- <enum>QFrame::StyledPanel</enum>
- </property>
- <property name="frameShadow">
- <enum>QFrame::Raised</enum>
- </property>
- <layout class="QGridLayout">
- <property name="margin">
- <number>3</number>
- </property>
- <property name="spacing">
- <number>3</number>
- </property>
- <item row="0" column="2">
- <layout class="QHBoxLayout">
- <item>
- <spacer>
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeHint" >
- <size>
- <width>40</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- </item>
- <item>
- <layout class="QVBoxLayout">
- <item>
- <widget class="QPushButton" name="btnSaveSettings">
+ <item row="8" column="3">
+ <widget class="QCheckBox" name="chkTorInfo">
+ <property name="minimumSize">
+ <size>
+ <width>87</width>
+ <height>20</height>
+ </size>
+ </property>
<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>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="btnCancelSettings">
+ <item row="6" column="1" colspan="2">
+ <widget class="QCheckBox" name="chkTorErr">
<property name="minimumSize">
<size>
- <width>90</width>
- <height>0</height>
+ <width>124</width>
+ <height>20</height>
+ </size>
+ </property>
+ <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 row="6" column="3">
+ <widget class="QCheckBox" name="chkTorDebug">
+ <property name="minimumSize">
+ <size>
+ <width>87</width>
+ <height>20</height>
</size>
</property>
<property name="contextMenuPolicy">
<enum>Qt::NoContextMenu</enum>
</property>
<property name="toolTip">
- <string>Cancels changes made to settings</string>
+ <string/>
</property>
<property name="text">
- <string>Cancel</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>
+ <item row="2" column="1" colspan="5">
+ <widget class="QLineEdit" name="lineSearchTerm">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Minimum" vsizetype="MinimumExpanding">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="minimumSize">
+ <size>
+ <width>590</width>
+ <height>22</height>
+ </size>
+ </property>
+ </widget>
+ </item>
+ <item row="7" column="3">
+ <widget class="QCheckBox" name="chkTorNote">
+ <property name="minimumSize">
+ <size>
+ <width>87</width>
+ <height>20</height>
+ </size>
+ </property>
+ <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 row="7" column="1" colspan="2">
+ <widget class="QCheckBox" name="chkTorWarn">
+ <property name="minimumSize">
+ <size>
+ <width>124</width>
+ <height>20</height>
+ </size>
+ </property>
+ <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 row="1" column="1">
+ <widget class="QCheckBox" name="chkFilterSearch">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="minimumSize">
+ <size>
+ <width>114</width>
+ <height>20</height>
+ </size>
+ </property>
+ <property name="text">
+ <string>Filter by term:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="7" column="4">
+ <spacer name="horizontalSpacer">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>40</width>
+ <height>1</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item row="6" column="5" rowspan="3">
+ <layout class="QVBoxLayout" name="_3">
+ <item>
+ <widget class="QPushButton" name="btnSaveSettings">
+ <property name="minimumSize">
+ <size>
+ <width>125</width>
+ <height>32</height>
+ </size>
+ </property>
+ <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>125</width>
+ <height>32</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>
- </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="2">
+ <widget class="QGroupBox" name="grpSaveNewLog">
+ <property name="contextMenuPolicy">
+ <enum>Qt::NoContextMenu</enum>
+ </property>
+ <property name="title">
+ <string>Always Save New Log Messages </string>
</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>
+ <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>
+ <item row="0" column="0">
+ <spacer name="verticalSpacer">
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>0</width>
+ <height>40</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ </layout>
+ </item>
+ <item row="0" column="2">
+ <layout class="QVBoxLayout" name="verticalLayout"/>
+ </item>
+ </layout>
<action name="actionMessage_Filters">
<property name="text">
<string>Message Filters...</string>
@@ -667,77 +641,72 @@
<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>
+ <sender>actionSettings</sender>
+ <signal>toggled(bool)</signal>
+ <receiver>frmSettings</receiver>
+ <slot>setVisible(bool)</slot>
<hints>
<hint type="sourcelabel">
<x>-1</x>
<y>-1</y>
</hint>
<hint type="destinationlabel">
- <x>407</x>
- <y>378</y>
+ <x>264</x>
+ <y>424</y>
</hint>
</hints>
</connection>
<connection>
- <sender>actionSettings</sender>
+ <sender>chkEnableLogFile</sender>
<signal>toggled(bool)</signal>
- <receiver>frmSettings</receiver>
- <slot>setVisible(bool)</slot>
+ <receiver>lineFile</receiver>
+ <slot>setEnabled(bool)</slot>
<hints>
<hint type="sourcelabel">
- <x>-1</x>
- <y>-1</y>
+ <x>283</x>
+ <y>461</y>
</hint>
<hint type="destinationlabel">
- <x>407</x>
- <y>393</y>
+ <x>283</x>
+ <y>487</y>
</hint>
</hints>
</connection>
<connection>
<sender>chkEnableLogFile</sender>
<signal>toggled(bool)</signal>
- <receiver>lineFile</receiver>
+ <receiver>btnBrowse</receiver>
<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>473</x>
+ <y>487</y>
</hint>
</hints>
</connection>
<connection>
- <sender>chkEnableLogFile</sender>
+ <sender>chkFilterSearch</sender>
<signal>toggled(bool)</signal>
- <receiver>btnBrowse</receiver>
+ <receiver>lineSearchTerm</receiver>
<slot>setEnabled(bool)</slot>
<hints>
<hint type="sourcelabel">
- <x>20</x>
- <y>20</y>
+ <x>82</x>
+ <y>238</y>
</hint>
<hint type="destinationlabel">
- <x>20</x>
- <y>20</y>
+ <x>284</x>
+ <y>265</y>
</hint>
</hints>
</connection>
diff --git a/src/vidalia/main.cpp b/src/vidalia/main.cpp
index 5c08f57..9e55234 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/CircuitListWidget.cpp b/src/vidalia/network/CircuitListWidget.cpp
index 3871503..a92ad9c 100644
--- a/src/vidalia/network/CircuitListWidget.cpp
+++ b/src/vidalia/network/CircuitListWidget.cpp
@@ -34,7 +34,7 @@ CircuitListWidget::CircuitListWidget(QWidget *parent)
: QTreeWidget(parent)
{
/* Create and initialize columns */
- setHeaderLabels(QStringList() << tr("Connection") << tr("Status"));
+ setHeaderLabels(QStringList() << tr("Connection") << tr("Status") << tr("Traffic"));
/* Find out when a circuit has been selected */
connect(this, SIGNAL(currentItemChanged(QTreeWidgetItem*,QTreeWidgetItem*)),
@@ -52,13 +52,14 @@ CircuitListWidget::CircuitListWidget(QWidget *parent)
void
CircuitListWidget::retranslateUi()
{
- setHeaderLabels(QStringList() << tr("Connection") << tr("Status"));
+ setHeaderLabels(QStringList() << tr("Connection") << tr("Status") << tr("Traffic"));
for (int i = 0; i < topLevelItemCount(); i++) {
CircuitItem *circuitItem = dynamic_cast<CircuitItem *>(topLevelItem(i));
circuitItem->update(circuitItem->circuit());
foreach (StreamItem *streamItem, circuitItem->streams()) {
streamItem->update(streamItem->stream());
+ streamItem->setTraffic(streamItem->bytesReceived(), streamItem->bytesSent());
}
}
}
@@ -79,8 +80,11 @@ CircuitListWidget::customContextMenuRequested(const QPoint &pos)
if (!item->parent()) {
/* A circuit was selected */
CircuitItem *circuitItem = dynamic_cast<CircuitItem *>(item);
- if (!circuitItem)
+ if (!circuitItem and
+ ((circuitItem->circuit().status() == Circuit::Closed) or
+ (circuitItem->circuit().status() == Circuit::Failed)))
return;
+ CircuitId id = circuitItem->id();
/* Set up the circuit context menu */
QAction *zoomAct = new QAction(QIcon(IMG_ZOOM),
@@ -98,14 +102,15 @@ CircuitListWidget::customContextMenuRequested(const QPoint &pos)
* selected */
QAction* action = menu.exec(mapToGlobal(pos));
if (action == closeAct)
- emit closeCircuit(circuitItem->id());
+ emit closeCircuit(id);
else if (action == zoomAct)
- emit zoomToCircuit(circuitItem->id());
+ emit zoomToCircuit(id);
} else {
/* A stream was selected */
StreamItem *streamItem = dynamic_cast<StreamItem *>(item);
if (!streamItem)
return;
+ StreamId id = streamItem->id();
/* Set up the stream context menu */
QAction *closeAct = new QAction(QIcon(IMG_CLOSE),
@@ -116,7 +121,7 @@ CircuitListWidget::customContextMenuRequested(const QPoint &pos)
* selected */
QAction* action = menu.exec(mapToGlobal(pos));
if (action == closeAct)
- emit closeStream(streamItem->id());
+ emit closeStream(id);
}
}
@@ -193,6 +198,20 @@ CircuitListWidget::addStream(const Stream &stream)
}
}
+/** Updates the traffic totals for a stream with the given delta values. */
+void
+CircuitListWidget::onStreamBandwidthUpdate(const StreamId &streamId,
+ quint64 bytesReceived,
+ quint64 bytesSent)
+{
+ StreamItem *item = findStreamItem(streamId);
+ if (item) {
+ item->setTraffic(
+ item->bytesReceived() + bytesReceived,
+ item->bytesSent() + bytesSent);
+ }
+}
+
/** Schedules the given circuit to be removed after the specified timeout. */
void
CircuitListWidget::scheduleCircuitRemoval(CircuitItem *circuit, int delay)
diff --git a/src/vidalia/network/CircuitListWidget.h b/src/vidalia/network/CircuitListWidget.h
index 1405b17..7fb4d5e 100644
--- a/src/vidalia/network/CircuitListWidget.h
+++ b/src/vidalia/network/CircuitListWidget.h
@@ -34,7 +34,8 @@ public:
/** Circuit list columns. */
enum Columns {
ConnectionColumn = 0, /**< Column for either the circuit or stream */
- StatusColumn = 1 /**< Status of the connection. */
+ StatusColumn = 1, /**< Status of the connection. */
+ TrafficColumn = 2, /**< Amount of data received and sent by the stream. */
};
/** Default constructor */
@@ -66,6 +67,9 @@ signals:
public slots:
/** Clears all circuits and streams from the list. */
void clearCircuits();
+ /** Updates the traffic totals for a stream with the given delta values. */
+ void onStreamBandwidthUpdate(const StreamId &streamId,
+ quint64 bytesReceived, quint64 bytesSent);
private slots:
/** Removes the first circuit scheduled to be removed.*/
diff --git a/src/vidalia/network/CountryInfo.cpp b/src/vidalia/network/CountryInfo.cpp
index 3e0cfd9..8230597 100644
--- a/src/vidalia/network/CountryInfo.cpp
+++ b/src/vidalia/network/CountryInfo.cpp
@@ -35,203 +35,254 @@ CountryInfo::countryName(const QString &countryCode)
{
static QMap<QString,QString> db;
if (db.isEmpty()) {
- db.insert("af", QT_TR_NOOP("Afghanistan"));
- db.insert("al", QT_TR_NOOP("Albania "));
- db.insert("dz", QT_TR_NOOP("Algeria "));
+ db.insert("a1", QT_TR_NOOP("Anonymous Proxy"));
+ db.insert("a2", QT_TR_NOOP("Satellite Provider"));
db.insert("ad", QT_TR_NOOP("Andorra"));
+ db.insert("ae", QT_TR_NOOP("United Arab Emirates"));
+ db.insert("af", QT_TR_NOOP("Afghanistan"));
+ db.insert("ag", QT_TR_NOOP("Antigua and Barbuda"));
+ db.insert("ai", QT_TR_NOOP("Anguilla"));
+ db.insert("al", QT_TR_NOOP("Albania"));
+ db.insert("am", QT_TR_NOOP("Armenia"));
+ db.insert("an", QT_TR_NOOP("Netherlands Antilles"));
db.insert("ao", QT_TR_NOOP("Angola"));
- db.insert("ag", QT_TR_NOOP("Antigua & Barbuda"));
+ db.insert("ap", QT_TR_NOOP("Asia/Pacific Region"));
+ db.insert("aq", QT_TR_NOOP("Antarctica"));
db.insert("ar", QT_TR_NOOP("Argentina"));
- db.insert("am", QT_TR_NOOP("Armenia"));
+ db.insert("as", QT_TR_NOOP("American Samoa"));
+ db.insert("at", QT_TR_NOOP("Austria"));
db.insert("au", QT_TR_NOOP("Australia"));
- db.insert("at", QT_TR_NOOP("Austria "));
+ db.insert("aw", QT_TR_NOOP("Aruba"));
+ db.insert("ax", QT_TR_NOOP("Aland Islands"));
db.insert("az", QT_TR_NOOP("Azerbaijan"));
- db.insert("bs", QT_TR_NOOP("Bahamas"));
- db.insert("bh", QT_TR_NOOP("Bahrain "));
- db.insert("bd", QT_TR_NOOP("Bangladesh"));
+ db.insert("ba", QT_TR_NOOP("Bosnia and Herzegovina"));
db.insert("bb", QT_TR_NOOP("Barbados"));
- db.insert("by", QT_TR_NOOP("Belarus"));
+ db.insert("bd", QT_TR_NOOP("Bangladesh"));
db.insert("be", QT_TR_NOOP("Belgium"));
- db.insert("bz", QT_TR_NOOP("Belize"));
- db.insert("bj", QT_TR_NOOP("Benin "));
- db.insert("bt", QT_TR_NOOP("Bhutan"));
- db.insert("bo", QT_TR_NOOP("Bolivia"));
- db.insert("ba", QT_TR_NOOP("Bosnia & Herzegovina"));
- db.insert("bw", QT_TR_NOOP("Botswana"));
- db.insert("br", QT_TR_NOOP("Brazil"));
- db.insert("bn", QT_TR_NOOP("Brunei Darussalam"));
- db.insert("bg", QT_TR_NOOP("Bulgaria"));
db.insert("bf", QT_TR_NOOP("Burkina Faso"));
+ db.insert("bg", QT_TR_NOOP("Bulgaria"));
+ db.insert("bh", QT_TR_NOOP("Bahrain"));
db.insert("bi", QT_TR_NOOP("Burundi"));
- db.insert("kh", QT_TR_NOOP("Cambodia"));
- db.insert("cm", QT_TR_NOOP("Cameroon"));
+ db.insert("bj", QT_TR_NOOP("Benin"));
+ db.insert("bl", QT_TR_NOOP("Saint Barthelemy"));
+ db.insert("bm", QT_TR_NOOP("Bermuda"));
+ db.insert("bn", QT_TR_NOOP("Brunei Darussalam"));
+ db.insert("bo", QT_TR_NOOP("Bolivia"));
+ db.insert("br", QT_TR_NOOP("Brazil"));
+ db.insert("bs", QT_TR_NOOP("Bahamas"));
+ db.insert("bt", QT_TR_NOOP("Bhutan"));
+ db.insert("bv", QT_TR_NOOP("Bouvet Island"));
+ db.insert("bw", QT_TR_NOOP("Botswana"));
+ db.insert("by", QT_TR_NOOP("Belarus"));
+ db.insert("bz", QT_TR_NOOP("Belize"));
db.insert("ca", QT_TR_NOOP("Canada"));
- db.insert("cv", QT_TR_NOOP("Cape Verde"));
+ db.insert("cc", QT_TR_NOOP("Cocos (Keeling) Islands"));
+ db.insert("cd", QT_TR_NOOP("Congo, The Democratic Republic of the"));
db.insert("cf", QT_TR_NOOP("Central African Republic"));
- db.insert("td", QT_TR_NOOP("Chad"));
+ db.insert("cg", QT_TR_NOOP("Congo"));
+ db.insert("ch", QT_TR_NOOP("Switzerland"));
+ db.insert("ci", QT_TR_NOOP("Cote D'Ivoire"));
+ db.insert("ck", QT_TR_NOOP("Cook Islands"));
db.insert("cl", QT_TR_NOOP("Chile"));
+ db.insert("cm", QT_TR_NOOP("Cameroon"));
db.insert("cn", QT_TR_NOOP("China"));
db.insert("co", QT_TR_NOOP("Colombia"));
- db.insert("km", QT_TR_NOOP("Comoros"));
- db.insert("cd", QT_TR_NOOP("Congo, The Democratic Republic of the"));
- db.insert("cg", QT_TR_NOOP("Congo"));
db.insert("cr", QT_TR_NOOP("Costa Rica"));
- db.insert("ci", QT_TR_NOOP("Cote d’Ivoire"));
- db.insert("hr", QT_TR_NOOP("Croatia"));
db.insert("cu", QT_TR_NOOP("Cuba"));
+ db.insert("cv", QT_TR_NOOP("Cape Verde"));
+ db.insert("cx", QT_TR_NOOP("Christmas Island"));
db.insert("cy", QT_TR_NOOP("Cyprus"));
db.insert("cz", QT_TR_NOOP("Czech Republic"));
- db.insert("dk", QT_TR_NOOP("Denmark"));
+ db.insert("de", QT_TR_NOOP("Germany"));
db.insert("dj", QT_TR_NOOP("Djibouti"));
+ db.insert("dk", QT_TR_NOOP("Denmark"));
db.insert("dm", QT_TR_NOOP("Dominica"));
db.insert("do", QT_TR_NOOP("Dominican Republic"));
+ db.insert("dz", QT_TR_NOOP("Algeria"));
db.insert("ec", QT_TR_NOOP("Ecuador"));
+ db.insert("ee", QT_TR_NOOP("Estonia"));
db.insert("eg", QT_TR_NOOP("Egypt"));
- db.insert("sv", QT_TR_NOOP("El Salvador"));
- db.insert("gq", QT_TR_NOOP("Equatorial Guinea"));
+ db.insert("eh", QT_TR_NOOP("Western Sahara"));
db.insert("er", QT_TR_NOOP("Eritrea"));
- db.insert("ee", QT_TR_NOOP("Estonia"));
- db.insert("et", QT_TR_NOOP("Ethiopia "));
- db.insert("fj", QT_TR_NOOP("Fiji "));
- db.insert("fi", QT_TR_NOOP("Finland "));
+ db.insert("es", QT_TR_NOOP("Spain"));
+ db.insert("et", QT_TR_NOOP("Ethiopia"));
+ db.insert("eu", QT_TR_NOOP("Europe"));
+ db.insert("fi", QT_TR_NOOP("Finland"));
+ db.insert("fj", QT_TR_NOOP("Fiji"));
+ db.insert("fk", QT_TR_NOOP("Falkland Islands (Malvinas)"));
+ db.insert("fm", QT_TR_NOOP("Micronesia, Federated States of"));
+ db.insert("fo", QT_TR_NOOP("Faroe Islands"));
db.insert("fr", QT_TR_NOOP("France"));
db.insert("ga", QT_TR_NOOP("Gabon"));
- db.insert("gm", QT_TR_NOOP("Gambia"));
+ db.insert("gb", QT_TR_NOOP("United Kingdom"));
+ db.insert("gd", QT_TR_NOOP("Grenada"));
db.insert("ge", QT_TR_NOOP("Georgia"));
- db.insert("de", QT_TR_NOOP("Germany"));
+ db.insert("gf", QT_TR_NOOP("French Guiana"));
+ db.insert("gg", QT_TR_NOOP("Guernsey"));
db.insert("gh", QT_TR_NOOP("Ghana"));
- db.insert("gr", QT_TR_NOOP("Greece "));
- db.insert("gd", QT_TR_NOOP("Grenada"));
- db.insert("gt", QT_TR_NOOP("Guatemala"));
- db.insert("gu", QT_TR_NOOP("Guam "));
+ db.insert("gi", QT_TR_NOOP("Gibraltar"));
+ db.insert("gl", QT_TR_NOOP("Greenland"));
+ db.insert("gm", QT_TR_NOOP("Gambia"));
db.insert("gn", QT_TR_NOOP("Guinea"));
+ db.insert("gp", QT_TR_NOOP("Guadeloupe"));
+ db.insert("gq", QT_TR_NOOP("Equatorial Guinea"));
+ db.insert("gr", QT_TR_NOOP("Greece"));
+ db.insert("gs", QT_TR_NOOP("South Georgia and the South Sandwich Islands"));
+ db.insert("gt", QT_TR_NOOP("Guatemala"));
+ db.insert("gu", QT_TR_NOOP("Guam"));
db.insert("gw", QT_TR_NOOP("Guinea-Bissau"));
db.insert("gy", QT_TR_NOOP("Guyana"));
db.insert("hk", QT_TR_NOOP("Hong Kong"));
- db.insert("ht", QT_TR_NOOP("Haiti"));
+ db.insert("hm", QT_TR_NOOP("Heard Island and McDonald Islands"));
db.insert("hn", QT_TR_NOOP("Honduras"));
- db.insert("hu", QT_TR_NOOP("Hungary "));
- db.insert("is", QT_TR_NOOP("Iceland "));
- db.insert("in", QT_TR_NOOP("India "));
- db.insert("id", QT_TR_NOOP("Indonesia "));
- db.insert("ir", QT_TR_NOOP("Iran "));
- db.insert("iq", QT_TR_NOOP("Iraq "));
- db.insert("ie", QT_TR_NOOP("Ireland "));
+ db.insert("hr", QT_TR_NOOP("Croatia"));
+ db.insert("ht", QT_TR_NOOP("Haiti"));
+ db.insert("hu", QT_TR_NOOP("Hungary"));
+ db.insert("id", QT_TR_NOOP("Indonesia"));
+ db.insert("ie", QT_TR_NOOP("Ireland"));
db.insert("il", QT_TR_NOOP("Israel"));
+ db.insert("im", QT_TR_NOOP("Isle of Man"));
+ db.insert("in", QT_TR_NOOP("India"));
+ db.insert("io", QT_TR_NOOP("British Indian Ocean Territory"));
+ db.insert("iq", QT_TR_NOOP("Iraq"));
+ db.insert("ir", QT_TR_NOOP("Iran, Islamic Republic of"));
+ db.insert("is", QT_TR_NOOP("Iceland"));
db.insert("it", QT_TR_NOOP("Italy"));
+ db.insert("je", QT_TR_NOOP("Jersey"));
db.insert("jm", QT_TR_NOOP("Jamaica"));
- db.insert("jp", QT_TR_NOOP("Japan"));
db.insert("jo", QT_TR_NOOP("Jordan"));
- db.insert("kz", QT_TR_NOOP("Kazakhstan"));
+ db.insert("jp", QT_TR_NOOP("Japan"));
db.insert("ke", QT_TR_NOOP("Kenya"));
+ db.insert("kg", QT_TR_NOOP("Kyrgyzstan"));
+ db.insert("kh", QT_TR_NOOP("Cambodia"));
db.insert("ki", QT_TR_NOOP("Kiribati"));
- db.insert("kp", QT_TR_NOOP("Korea, North "));
- db.insert("kr", QT_TR_NOOP("Korea, South "));
+ db.insert("km", QT_TR_NOOP("Comoros"));
+ db.insert("kn", QT_TR_NOOP("Saint Kitts and Nevis"));
+ db.insert("kp", QT_TR_NOOP("Korea, Democratic People's Republic of"));
+ db.insert("kr", QT_TR_NOOP("Korea, Republic of"));
db.insert("kw", QT_TR_NOOP("Kuwait"));
- db.insert("kg", QT_TR_NOOP("Kyrgyzstan"));
- db.insert("la", QT_TR_NOOP("Laos"));
- db.insert("lv", QT_TR_NOOP("Latvia"));
+ db.insert("ky", QT_TR_NOOP("Cayman Islands"));
+ db.insert("kz", QT_TR_NOOP("Kazakhstan"));
+ db.insert("la", QT_TR_NOOP("Lao People's Democratic Republic"));
db.insert("lb", QT_TR_NOOP("Lebanon"));
- db.insert("ls", QT_TR_NOOP("Lesotho"));
- db.insert("lr", QT_TR_NOOP("Liberia"));
- db.insert("ly", QT_TR_NOOP("Libya "));
+ db.insert("lc", QT_TR_NOOP("Saint Lucia"));
db.insert("li", QT_TR_NOOP("Liechtenstein"));
+ db.insert("lk", QT_TR_NOOP("Sri Lanka"));
+ db.insert("lr", QT_TR_NOOP("Liberia"));
+ db.insert("ls", QT_TR_NOOP("Lesotho"));
db.insert("lt", QT_TR_NOOP("Lithuania"));
db.insert("lu", QT_TR_NOOP("Luxembourg"));
- db.insert("mk", QT_TR_NOOP("Macedonia"));
+ db.insert("lv", QT_TR_NOOP("Latvia"));
+ db.insert("ly", QT_TR_NOOP("Libyan Arab Jamahiriya"));
+ db.insert("ma", QT_TR_NOOP("Morocco"));
+ db.insert("mc", QT_TR_NOOP("Monaco"));
+ db.insert("md", QT_TR_NOOP("Moldova, Republic of"));
+ db.insert("me", QT_TR_NOOP("Montenegro"));
+ db.insert("mf", QT_TR_NOOP("Saint Martin"));
db.insert("mg", QT_TR_NOOP("Madagascar"));
- db.insert("mw", QT_TR_NOOP("Malawi"));
- db.insert("my", QT_TR_NOOP("Malaysia"));
- db.insert("mv", QT_TR_NOOP("Maldives "));
- db.insert("ml", QT_TR_NOOP("Mali"));
- db.insert("mt", QT_TR_NOOP("Malta"));
db.insert("mh", QT_TR_NOOP("Marshall Islands"));
+ db.insert("mk", QT_TR_NOOP("Macedonia"));
+ db.insert("ml", QT_TR_NOOP("Mali"));
+ db.insert("mm", QT_TR_NOOP("Myanmar"));
+ db.insert("mn", QT_TR_NOOP("Mongolia"));
+ db.insert("mo", QT_TR_NOOP("Macau"));
+ db.insert("mp", QT_TR_NOOP("Northern Mariana Islands"));
+ db.insert("mq", QT_TR_NOOP("Martinique"));
db.insert("mr", QT_TR_NOOP("Mauritania"));
+ db.insert("ms", QT_TR_NOOP("Montserrat"));
+ db.insert("mt", QT_TR_NOOP("Malta"));
db.insert("mu", QT_TR_NOOP("Mauritius"));
- db.insert("mx", QT_TR_NOOP("Mexico "));
- db.insert("fm", QT_TR_NOOP("Micronesia"));
- db.insert("md", QT_TR_NOOP("Moldova"));
- db.insert("mc", QT_TR_NOOP("Monaco"));
- db.insert("mn", QT_TR_NOOP("Mongolia"));
- db.insert("me", QT_TR_NOOP("Montenegro"));
- db.insert("ma", QT_TR_NOOP("Morocco"));
+ db.insert("mv", QT_TR_NOOP("Maldives"));
+ db.insert("mw", QT_TR_NOOP("Malawi"));
+ db.insert("mx", QT_TR_NOOP("Mexico"));
+ db.insert("my", QT_TR_NOOP("Malaysia"));
db.insert("mz", QT_TR_NOOP("Mozambique"));
- db.insert("mm", QT_TR_NOOP("Myanmar "));
db.insert("na", QT_TR_NOOP("Namibia"));
- db.insert("nr", QT_TR_NOOP("Nauru"));
- db.insert("np", QT_TR_NOOP("Nepal"));
- db.insert("nl", QT_TR_NOOP("Netherlands"));
- db.insert("nz", QT_TR_NOOP("New Zealand"));
- db.insert("ni", QT_TR_NOOP("Nicaragua"));
+ db.insert("nc", QT_TR_NOOP("New Caledonia"));
db.insert("ne", QT_TR_NOOP("Niger"));
+ db.insert("nf", QT_TR_NOOP("Norfolk Island"));
db.insert("ng", QT_TR_NOOP("Nigeria"));
+ db.insert("ni", QT_TR_NOOP("Nicaragua"));
+ db.insert("nl", QT_TR_NOOP("Netherlands"));
db.insert("no", QT_TR_NOOP("Norway"));
+ db.insert("np", QT_TR_NOOP("Nepal"));
+ db.insert("nr", QT_TR_NOOP("Nauru"));
+ db.insert("nu", QT_TR_NOOP("Niue"));
+ db.insert("nz", QT_TR_NOOP("New Zealand"));
db.insert("om", QT_TR_NOOP("Oman"));
- db.insert("pk", QT_TR_NOOP("Pakistan"));
- db.insert("pw", QT_TR_NOOP("Palau"));
- db.insert("ps", QT_TR_NOOP("Palestine"));
db.insert("pa", QT_TR_NOOP("Panama"));
- db.insert("pg", QT_TR_NOOP("Papua New Guinea"));
- db.insert("py", QT_TR_NOOP("Paraguay"));
db.insert("pe", QT_TR_NOOP("Peru"));
+ db.insert("pf", QT_TR_NOOP("French Polynesia"));
+ db.insert("pg", QT_TR_NOOP("Papua New Guinea"));
db.insert("ph", QT_TR_NOOP("Philippines"));
+ db.insert("pk", QT_TR_NOOP("Pakistan"));
db.insert("pl", QT_TR_NOOP("Poland"));
+ db.insert("pm", QT_TR_NOOP("Saint Pierre and Miquelon"));
+ db.insert("pn", QT_TR_NOOP("Pitcairn Islands"));
+ db.insert("pr", QT_TR_NOOP("Puerto Rico"));
+ db.insert("ps", QT_TR_NOOP("Palestinian Territory, Occupied"));
db.insert("pt", QT_TR_NOOP("Portugal"));
+ db.insert("pw", QT_TR_NOOP("Palau"));
+ db.insert("py", QT_TR_NOOP("Paraguay"));
db.insert("qa", QT_TR_NOOP("Qatar"));
+ db.insert("re", QT_TR_NOOP("Reunion"));
db.insert("ro", QT_TR_NOOP("Romania"));
- db.insert("ru", QT_TR_NOOP("Russia"));
+ db.insert("rs", QT_TR_NOOP("Serbia"));
+ db.insert("ru", QT_TR_NOOP("Russian Federation"));
db.insert("rw", QT_TR_NOOP("Rwanda"));
- db.insert("kn", QT_TR_NOOP("Saint Kitts & Nevis"));
- db.insert("lc", QT_TR_NOOP("Saint Lucia"));
- db.insert("vc", QT_TR_NOOP("Saint Vincent & the Grenadines"));
- db.insert("ws", QT_TR_NOOP("Samoa"));
- db.insert("sm", QT_TR_NOOP("San Marino"));
- db.insert("st", QT_TR_NOOP("Sao Tome & Principe"));
db.insert("sa", QT_TR_NOOP("Saudi Arabia"));
- db.insert("sn", QT_TR_NOOP("Senegal"));
- db.insert("rs", QT_TR_NOOP("Serbia"));
+ db.insert("sb", QT_TR_NOOP("Solomon Islands"));
db.insert("sc", QT_TR_NOOP("Seychelles"));
- db.insert("sl", QT_TR_NOOP("Sierra Leone"));
+ db.insert("sd", QT_TR_NOOP("Sudan"));
+ db.insert("se", QT_TR_NOOP("Sweden"));
db.insert("sg", QT_TR_NOOP("Singapore"));
- db.insert("sk", QT_TR_NOOP("Slovakia"));
+ db.insert("sh", QT_TR_NOOP("Saint Helena"));
db.insert("si", QT_TR_NOOP("Slovenia"));
- db.insert("sb", QT_TR_NOOP("Solomon Islands"));
+ db.insert("sj", QT_TR_NOOP("Svalbard and Jan Mayen"));
+ db.insert("sk", QT_TR_NOOP("Slovakia"));
+ db.insert("sl", QT_TR_NOOP("Sierra Leone"));
+ db.insert("sm", QT_TR_NOOP("San Marino"));
+ db.insert("sn", QT_TR_NOOP("Senegal"));
db.insert("so", QT_TR_NOOP("Somalia"));
- db.insert("za", QT_TR_NOOP("South Africa"));
- db.insert("es", QT_TR_NOOP("Spain"));
- db.insert("lk", QT_TR_NOOP("Sri Lanka"));
- db.insert("sd", QT_TR_NOOP("Sudan"));
db.insert("sr", QT_TR_NOOP("Suriname"));
+ db.insert("st", QT_TR_NOOP("Sao Tome and Principe"));
+ db.insert("sv", QT_TR_NOOP("El Salvador"));
+ db.insert("sy", QT_TR_NOOP("Syrian Arab Republic"));
db.insert("sz", QT_TR_NOOP("Swaziland"));
- db.insert("se", QT_TR_NOOP("Sweden"));
- db.insert("ch", QT_TR_NOOP("Switzerland"));
- db.insert("sy", QT_TR_NOOP("Syria"));
- db.insert("tw", QT_TR_NOOP("Taiwan "));
- db.insert("tj", QT_TR_NOOP("Tajikistan"));
- db.insert("tz", QT_TR_NOOP("Tanzania"));
- db.insert("th", QT_TR_NOOP("Thailand"));
- db.insert("tl", QT_TR_NOOP("Timor-Leste (East Timor)"));
+ db.insert("tc", QT_TR_NOOP("Turks and Caicos Islands"));
+ db.insert("td", QT_TR_NOOP("Chad"));
+ db.insert("tf", QT_TR_NOOP("French Southern Territories"));
db.insert("tg", QT_TR_NOOP("Togo"));
- db.insert("to", QT_TR_NOOP("Tonga"));
- db.insert("tt", QT_TR_NOOP("Trinidad & Tobago"));
+ db.insert("th", QT_TR_NOOP("Thailand"));
+ db.insert("tj", QT_TR_NOOP("Tajikistan"));
+ db.insert("tk", QT_TR_NOOP("Tokelau"));
+ db.insert("tl", QT_TR_NOOP("Timor-Leste"));
+ db.insert("tm", QT_TR_NOOP("Turkmenistan"));
db.insert("tn", QT_TR_NOOP("Tunisia"));
+ db.insert("to", QT_TR_NOOP("Tonga"));
db.insert("tr", QT_TR_NOOP("Turkey"));
- db.insert("tm", QT_TR_NOOP("Turkmenistan"));
+ db.insert("tt", QT_TR_NOOP("Trinidad and Tobago"));
db.insert("tv", QT_TR_NOOP("Tuvalu"));
- db.insert("ug", QT_TR_NOOP("Uganda"));
+ db.insert("tw", QT_TR_NOOP("Taiwan"));
+ db.insert("tz", QT_TR_NOOP("Tanzania, United Republic of"));
db.insert("ua", QT_TR_NOOP("Ukraine"));
- db.insert("ae", QT_TR_NOOP("United Arab Emirates"));
- db.insert("gb", QT_TR_NOOP("United Kingdom"));
+ db.insert("ug", QT_TR_NOOP("Uganda"));
+ db.insert("um", QT_TR_NOOP("United States Minor Outlying Islands"));
db.insert("us", QT_TR_NOOP("United States"));
db.insert("uy", QT_TR_NOOP("Uruguay"));
db.insert("uz", QT_TR_NOOP("Uzbekistan"));
- db.insert("vu", QT_TR_NOOP("Vanuatu"));
- db.insert("va", QT_TR_NOOP("Vatican"));
+ db.insert("va", QT_TR_NOOP("Holy See (Vatican City State)"));
+ db.insert("vc", QT_TR_NOOP("Saint Vincent and the Grenadines"));
db.insert("ve", QT_TR_NOOP("Venezuela"));
+ db.insert("vg", QT_TR_NOOP("Virgin Islands, British"));
+ db.insert("vi", QT_TR_NOOP("Virgin Islands, U.S."));
db.insert("vn", QT_TR_NOOP("Vietnam"));
- db.insert("eh", QT_TR_NOOP("Western Sahara"));
+ db.insert("vu", QT_TR_NOOP("Vanuatu"));
+ db.insert("wf", QT_TR_NOOP("Wallis and Futuna"));
+ db.insert("ws", QT_TR_NOOP("Samoa"));
db.insert("ye", QT_TR_NOOP("Yemen"));
- db.insert("zr", QT_TR_NOOP("Zaire"));
+ db.insert("yt", QT_TR_NOOP("Mayotte"));
+ db.insert("za", QT_TR_NOOP("South Africa"));
db.insert("zm", QT_TR_NOOP("Zambia"));
db.insert("zw", QT_TR_NOOP("Zimbabwe"));
}
diff --git a/src/vidalia/network/NetViewer.cpp b/src/vidalia/network/NetViewer.cpp
index 535c127..475a35e 100644
--- a/src/vidalia/network/NetViewer.cpp
+++ b/src/vidalia/network/NetViewer.cpp
@@ -18,8 +18,10 @@
#include "RouterListItem.h"
#include "Vidalia.h"
#include "VMessageBox.h"
+#include "ServerSettings.h"
#include <QMessageBox>
+#include <QToolBar>
#include <QHeaderView>
#include <QCoreApplication>
@@ -37,22 +39,54 @@
#define MAX_RESOLVE_QUEUE_DELAY (30*1000)
#endif
+/* Settings key for main layout splitter state */
+#define SETTING_SPLITTER_MAIN "NetViewSplitMain"
+/* Key for network map splitter */
+#define SETTING_SPLITTER_MAP "NetViewSplitMap"
+/* Key for router description splitter */
+#define SETTING_SPLITTER_ROUT "NetViewSplitRouter"
+
+/* Default values for splitter states. */
+#define DEFAULT_SPLITTER_MAIN QByteArray()
+#define DEFAULT_SPLITTER_MAP QByteArray()
+#define DEFAULT_SPLITTER_ROUT QByteArray()
+
+/* Settings key for IP column */
+#define SETTING_IP_COLUMN "RelayPanel/ShowIPColumn"
+/* Settings key for Bandwidth column */
+#define SETTING_BW_COLUMN "RelayPanel/ShowBandwidthColumn"
+/* Settings key for Uptime column */
+#define SETTING_UPTIME_COLUMN "RelayPanel/ShowUptimeColumn"
+
+/* Default key value for IP column */
+#define DEFAULT_IP_COLUMN false
+/* Default key value for Bandwidth column */
+#define DEFAULT_BW_COLUMN false
+/* Default key value for Uptime column */
+#define DEFAULT_UPTIME_COLUMN false
+
/** Constructor. Loads settings from VidaliaSettings.
* \param parent The parent widget of this NetViewer object.\
*/
NetViewer::NetViewer(QWidget *parent)
- : VidaliaWindow("NetViewer", parent)
+ : VidaliaTab(tr("Network Map"), "NetViewer", parent)
{
/* Invoke Qt Designer generated QObject setup routine */
ui.setupUi(this);
+ ui.treeRouterList->setSortingEnabled(false);
+
+ ui.lblConsensus->setVisible(false);
+ ui.lblOffline->setVisible(false);
+ loadSettings();
+ ui.frmSettings->setVisible(false);
#if defined(Q_WS_MAC)
ui.actionHelp->setShortcut(QString("Ctrl+?"));
#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();
@@ -69,6 +103,10 @@ NetViewer::NetViewer(QWidget *parent)
connect(_torControl, SIGNAL(streamStatusChanged(Stream)),
this, SLOT(addStream(Stream)));
+ _torControl->setEvent(TorEvents::StreamBandwidth);
+ connect(_torControl, SIGNAL(streamBandwidthUpdate(StreamId, quint64, quint64)),
+ ui.treeCircuitList, SLOT(onStreamBandwidthUpdate(StreamId, quint64, quint64)));
+
_torControl->setEvent(TorEvents::AddressMap);
connect(_torControl, SIGNAL(addressMapped(QString, QString, QDateTime)),
this, SLOT(addressMapped(QString, QString, QDateTime)));
@@ -77,6 +115,15 @@ NetViewer::NetViewer(QWidget *parent)
connect(_torControl, SIGNAL(newDescriptors(QStringList)),
this, SLOT(newDescriptors(QStringList)));
+ _torControl->setEvent(TorEvents::NewDescriptor);
+ connect(_torControl, SIGNAL(newConsensus()),
+ this, SLOT(refresh()));
+
+ connect(ui.lblOffline, SIGNAL(linkActivated(QString)),
+ this, SLOT(linkActivated(QString)));
+ connect(ui.lblConsensus, SIGNAL(linkActivated(QString)),
+ this, SLOT(linkActivated(QString)));
+
/* Change the column widths of the tree widgets */
ui.treeRouterList->header()->
resizeSection(RouterListWidget::StatusColumn, 25);
@@ -84,6 +131,10 @@ NetViewer::NetViewer(QWidget *parent)
resizeSection(RouterListWidget::CountryColumn, 25);
ui.treeCircuitList->header()->
resizeSection(CircuitListWidget::ConnectionColumn, 235);
+ ui.treeInternalCircuitList->header()->
+ resizeSection(CircuitListWidget::ConnectionColumn, 235);
+ ui.treeHSCircuitList->header()->
+ resizeSection(CircuitListWidget::ConnectionColumn, 235);
/* Create the TorMapWidget and add it to the dialog */
#if defined(USE_MARBLE)
@@ -99,7 +150,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 +178,48 @@ 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)));
+ connect(ui.treeRouterList, SIGNAL(displayRouterInfo(QString)),
+ this, SLOT(displayRouterInfo(QString)));
+ connect(ui.btnSaveSettings, SIGNAL(clicked()),
+ this, SLOT(saveSettings()));
+ connect(ui.btnCancelSettings, SIGNAL(clicked()),
+ this, SLOT(cancelChanges()));
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->addAction(ui.actionSettings);
+
+ tb->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
+ ui.horizontalLayout->addWidget(tb);
+
+ /* Restore the state of each splitter */
+ ui.spltMain->restoreState(getSetting(SETTING_SPLITTER_MAIN,
+ DEFAULT_SPLITTER_MAIN)
+ .toByteArray());
+ ui.spltMap->restoreState(getSetting(SETTING_SPLITTER_MAP,
+ DEFAULT_SPLITTER_MAP)
+ .toByteArray());
+ ui.spltRouter->restoreState(getSetting(SETTING_SPLITTER_ROUT,
+ DEFAULT_SPLITTER_ROUT)
+ .toByteArray());
+}
+
+/** Destructor. Saves splitter states to store layout. */
+NetViewer::~NetViewer()
+{
+ saveSetting(SETTING_SPLITTER_MAIN, ui.spltMain->saveState());
+ saveSetting(SETTING_SPLITTER_MAP, ui.spltMap->saveState());
+ saveSetting(SETTING_SPLITTER_ROUT, ui.spltRouter->saveState());
}
/** Called when the user changes the UI translation. */
@@ -137,6 +227,7 @@ void
NetViewer::retranslateUi()
{
ui.retranslateUi(this);
+ setTitle(tr("Network Map"));
ui.treeRouterList->retranslateUi();
ui.treeCircuitList->retranslateUi();
@@ -208,12 +299,8 @@ NetViewer::refresh()
/* Clear the data */
clear();
- /* Load router information */
- loadNetworkStatus();
- /* Load existing address mappings */
- loadAddressMap();
- /* Load Circuits and Streams information */
- loadConnections();
+ /* Async router load */
+ preLoadNetworkStatus();
/* Ok, they can refresh again. */
ui.actionRefresh->setEnabled(true);
@@ -234,6 +321,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()
@@ -267,7 +362,19 @@ void
NetViewer::addCircuit(const Circuit &circuit)
{
/* Add the circuit to the list of all current circuits */
- ui.treeCircuitList->addCircuit(circuit);
+ if(circuit.purpose() == Circuit::General or
+ circuit.purpose() == Circuit::Controller or
+ circuit.purpose() == Circuit::Testing) {
+ if((circuit.buildFlags() & Circuit::OneHopTunnel) or
+ (circuit.buildFlags() & Circuit::IsInternal)) {
+ ui.treeInternalCircuitList->addCircuit(circuit);
+ } else {
+ ui.treeCircuitList->addCircuit(circuit);
+ }
+ } else {
+ ui.treeHSCircuitList->addCircuit(circuit);
+ }
+
/* Plot the circuit on the map */
_map->addCircuit(circuit.id(), circuit.routerIDs());
}
@@ -307,22 +414,73 @@ NetViewer::help()
}
/** Retrieves a list of all running routers from Tor and their descriptors,
- * and adds them to the RouterListWidget. */
+ * and adds them to the _router list. */
void
-NetViewer::loadNetworkStatus()
+NetViewer::preLoadNetworkStatus()
{
NetworkStatus networkStatus = _torControl->getNetworkStatus();
+ ServerSettings settings(_torControl);
+ if (settings.isServerEnabled()) {
+ RouterDescriptor *rd = RouterDescriptor::fromTorControl(_torControl);
+ if(_torControl->isConnected() and settings.isServerEnabled()) {
+ _routers << *rd;
+ } else {
+ ui.lblConsensus->setVisible(false);
+ ui.lblOffline->setVisible(rd->offline());
+ }
+ }
+
+ bool usingMicrodescriptors = _torControl->useMicrodescriptors();
+
foreach(RouterStatus rs, networkStatus) {
+ if (!_torControl->isConnected())
+ return;
+
if (!rs.isRunning())
continue;
RouterDescriptor rd = _torControl->getRouterDescriptor(rs.id());
+ if(usingMicrodescriptors) {
+ rd.appendRouterStatusInfo(rs);
+ }
if (!rd.isEmpty())
- addRouter(rd);
+ _routers << rd;
QCoreApplication::processEvents();
}
+
+ _it = _routers.constBegin();
+ QTimer::singleShot(200, this, SLOT(loadNetworkStatus()));
+}
+
+/** Adds routers to the RouterListWidget after they have been loaded
+ * in the internal _router list */
+void
+NetViewer::loadNetworkStatus()
+{
+ int count = 0, thres = 50;
+ for(; _it != _routers.constEnd() and count < thres; ++_it, ++count) {
+ addRouter((*_it));
+ QCoreApplication::processEvents();
+ }
+
+ if(_it != _routers.constEnd())
+ QTimer::singleShot(1, this, SLOT(loadNetworkStatus()));
+ else {
+ QString id = _torControl->getInfo("fingerprint").toString();
+ RouterListItem *item = ui.treeRouterList->findRouterById(id);
+ if(item) {
+ ui.lblConsensus->setVisible(true);
+ ui.lblOffline->setVisible(false);
+ }
+
+ ui.treeRouterList->setSortingEnabled(true);
+ /* Load existing address mappings */
+ loadAddressMap();
+ /* Load Circuits and Streams information */
+ loadConnections();
+ }
}
/** Adds a router to our list of servers and retrieves geographic location
@@ -397,8 +555,8 @@ NetViewer::routerSelected(const QList<RouterDescriptor> &routers)
* map. But our current map sucks and you can't even tell when one is
* selected anyway. Worry about this when we actually get to Marble.
*/
- if (routers.size() == 1)
- _map->selectRouter(routers[0].id());
+ // if (routers.size() == 1)
+ // _map->selectRouter(routers[0].id());
}
/** Called when the user selects a router on the network map. Displays a
@@ -481,3 +639,68 @@ NetViewer::toggleFullScreen()
}
}
+/** Called when the user clicks on a QLabel containing a hyperlink. */
+void
+NetViewer::linkActivated(const QString &url)
+{
+ emit helpRequested(url);
+}
+
+/** Saves the Network Map settings and
+ * then hides the settings frame. */
+void
+NetViewer::saveSettings()
+{
+ /* Hide the settings frame and reset toggle button */
+ ui.actionSettings->toggle();
+ ui.treeRouterList->setColumnHidden(RouterListWidget::IPnumberColumn,
+ !(ui.chkShowIP->isChecked()));
+ ui.treeRouterList->setColumnHidden(RouterListWidget::BandwidthColumn,
+ !(ui.chkShowBW->isChecked()));
+ ui.treeRouterList->setColumnHidden(RouterListWidget::UptimeColumn,
+ !(ui.chkShowUptime->isChecked()));
+ saveSetting(SETTING_IP_COLUMN, ui.chkShowIP->isChecked());
+ saveSetting(SETTING_BW_COLUMN, ui.chkShowBW->isChecked());
+ saveSetting(SETTING_UPTIME_COLUMN, ui.chkShowUptime->isChecked());
+}
+
+/** Simply restores the previously saved settings and hides the settings
+ * frame. */
+void
+NetViewer::cancelChanges()
+{
+ /* Hide the settings frame and reset toggle button */
+ ui.actionSettings->toggle();
+ /* Reload the settings */
+ loadSettings();
+}
+
+/** Loads the saved Network Map settings
+ * except Splitter settings. */
+void
+NetViewer::loadSettings()
+{
+ /* Add optional columns to Relay Panel if their setting values are
+ * true, otherwise use default values. */
+ ui.treeRouterList->setColumnHidden(RouterListWidget::IPnumberColumn,
+ !(getSetting(SETTING_IP_COLUMN,
+ DEFAULT_IP_COLUMN).
+ toBool()));
+ ui.chkShowIP->setChecked(getSetting(SETTING_IP_COLUMN,
+ DEFAULT_IP_COLUMN).
+ toBool());
+ ui.treeRouterList->setColumnHidden(RouterListWidget::BandwidthColumn,
+ !(getSetting(SETTING_BW_COLUMN,
+ DEFAULT_BW_COLUMN).
+ toBool()));
+ ui.chkShowBW->setChecked(getSetting(SETTING_BW_COLUMN,
+ DEFAULT_BW_COLUMN).
+ toBool());
+ ui.treeRouterList->setColumnHidden(RouterListWidget::UptimeColumn,
+ !(getSetting(SETTING_UPTIME_COLUMN,
+ DEFAULT_UPTIME_COLUMN).
+ toBool()));
+ ui.chkShowUptime->setChecked(getSetting(SETTING_UPTIME_COLUMN,
+ DEFAULT_UPTIME_COLUMN).
+ toBool());
+}
diff --git a/src/vidalia/network/NetViewer.h b/src/vidalia/network/NetViewer.h
index 6b4026a..39a3de0 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,13 +38,15 @@
class QDateTime;
-class NetViewer : public VidaliaWindow
+class NetViewer : public VidaliaTab
{
Q_OBJECT
public:
/** Default constructor */
NetViewer(QWidget* parent = 0);
+ /** Destructor */
+ ~NetViewer();
public slots:
/** Displays the network map window. */
@@ -73,6 +75,10 @@ public slots:
/** Clears all known information */
void clear();
+ /** Adds a router to our list of servers and retrieves geographic location
+ * information for the server. */
+ void addRouter(const RouterDescriptor &rd);
+
protected:
/** Called when the user changes the UI translation. */
void retranslateUi();
@@ -101,18 +107,35 @@ 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();
+
+ /** Adds routers to the RouterListWidget after they have been loaded
+ * in the internal _router list */
+ void loadNetworkStatus();
+
+ /** Called when the user clicks on a QLabel containing a hyperlink. */
+ void linkActivated(const QString &url);
+
+ /** Saves the Network Map settings and
+ * then hides the settings frame. */
+ void saveSettings();
+ /** Loads the saved Network Map settings
+ * except Splitter settings. */
+ void loadSettings();
+ /** Simply restores the previously saved settings and hides the settings
+ * frame. */
+ void cancelChanges();
private:
/** */
void setupGeoIpResolver();
- /** Retrieves a list of all running routers from Tor and their descriptors,
- * and adds them to the RouterListWidget. */
- void loadNetworkStatus();
/** Loads a list of address mappings from Tor. */
void loadAddressMap();
- /** Adds a router to our list of servers and retrieves geographic location
- * information for the server. */
- void addRouter(const RouterDescriptor &rd);
+ /** Retrieves a list of all running routers from Tor and their descriptors,
+ * and adds them to the _routers list. */
+ void preLoadNetworkStatus();
/** TorControl object used to talk to Tor. */
TorControl* _torControl;
@@ -123,6 +146,12 @@ private:
/** Stores a list of address mappings from Tor. */
AddressMap _addressMap;
+ /** RouterDescriptor list that is used to load the routers in an
+ * asyc way */
+ QList<RouterDescriptor> _routers;
+ /** Iterator to keep the loaded routers at any time */
+ QList<RouterDescriptor>::const_iterator _it;
+
/** Widget that displays the Tor network map. */
#if defined(USE_MARBLE)
TorMapWidget* _map;
diff --git a/src/vidalia/network/NetViewer.ui b/src/vidalia/network/NetViewer.ui
index 63c8d88..9d8dc87 100644
--- a/src/vidalia/network/NetViewer.ui
+++ b/src/vidalia/network/NetViewer.ui
@@ -1,356 +1,696 @@
-<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>740</width>
+ <height>752</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" >
- <enum>Qt::NoContextMenu</enum>
- </property>
- <property name="orientation" >
+ <layout class="QVBoxLayout" name="verticalLayout_11">
+ <item>
+ <widget class="QSplitter" name="spltMain">
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
+ </property>
+ <widget class="QWidget" name="layoutWidget">
+ <layout class="QVBoxLayout" name="verticalLayout_9" stretch="0,1">
+ <item>
+ <layout class="QGridLayout" name="notificationLayout">
+ <item row="1" column="0">
+ <widget class="QLabel" name="lblOffline">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="text">
+ <string><a href="server.offline">Why is my relay offline?</a></string>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="0">
+ <widget class="QLabel" name="lblConsensus">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="text">
+ <string>If your relay isn't listed among the others, it may be because it doesn't have a Running flag yet. <a href="server.consensus">What's this?</a></string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ <item>
+ <widget class="QSplitter" name="spltMap">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <widget class="QWidget" name="layoutWidget_1">
+ <layout class="QVBoxLayout" name="verticalLayout_8">
+ <item>
+ <layout class="QHBoxLayout" name="horizontalLayout">
+ <property name="topMargin">
+ <number>0</number>
+ </property>
+ </layout>
+ </item>
+ <item>
+ <widget class="QFrame" name="frmMap">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+ <horstretch>100</horstretch>
+ <verstretch>100</verstretch>
+ </sizepolicy>
+ </property>
+ <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="QGridLayout" name="gridLayout_5">
+ <item row="0" column="0">
+ <layout class="QGridLayout" name="gridLayout"/>
+ </item>
+ </layout>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ <widget class="QWidget" name="layoutWidget_2">
+ <layout class="QVBoxLayout" name="verticalLayout_7">
+ <item>
+ <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>
+ </item>
+ <item>
+ <widget class="RouterListWidget" name="treeRouterList">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
+ <horstretch>1</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="minimumSize">
+ <size>
+ <width>175</width>
+ <height>0</height>
+ </size>
+ </property>
+ <property name="contextMenuPolicy">
+ <enum>Qt::DefaultContextMenu</enum>
+ </property>
+ <property name="statusTip">
+ <string/>
+ </property>
+ <property name="selectionMode">
+ <enum>QAbstractItemView::ExtendedSelection</enum>
+ </property>
+ <property name="indentation">
+ <number>0</number>
+ </property>
+ <property name="sortingEnabled">
+ <bool>true</bool>
+ </property>
+ <property name="columnCount">
+ <number>6</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>
+ <column>
+ <property name="text">
+ <string>IP</string>
+ </property>
+ </column>
+ <column>
+ <property name="text">
+ <string>Bandwidth</string>
+ </property>
+ </column>
+ <column>
+ <property name="text">
+ <string>Uptime</string>
+ </property>
+ </column>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ <widget class="QSplitter" name="spltRouter">
+ <property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
- <property name="childrenCollapsible" >
- <bool>false</bool>
- </property>
- <widget class="RouterListWidget" name="treeRouterList" >
- <property name="sizePolicy" >
- <sizepolicy>
- <hsizetype>5</hsizetype>
- <vsizetype>7</vsizetype>
- <horstretch>1</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="minimumSize" >
- <size>
- <width>175</width>
- <height>0</height>
- </size>
- </property>
- <property name="contextMenuPolicy" >
- <enum>Qt::DefaultContextMenu</enum>
- </property>
- <property name="statusTip" >
- <string/>
- </property>
- <property name="indentation" >
+ <widget class="QTabWidget" name="tabWidget">
+ <property name="currentIndex">
<number>0</number>
</property>
- <property name="sortingEnabled" >
- <bool>true</bool>
- </property>
- <property name="selectionMode" >
- <enum>QAbstractItemView::ExtendedSelection</enum>
- </property>
+ <widget class="QWidget" name="tab">
+ <attribute name="title">
+ <string>Exit circuits</string>
+ </attribute>
+ <layout class="QVBoxLayout" name="verticalLayout_2">
+ <item>
+ <layout class="QVBoxLayout" name="verticalLayout">
+ <item>
+ <widget class="CircuitListWidget" name="treeCircuitList">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+ <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>
+ <property name="columnCount">
+ <number>3</number>
+ </property>
+ <column>
+ <property name="text">
+ <string>Connection</string>
+ </property>
+ </column>
+ <column>
+ <property name="text">
+ <string>Status</string>
+ </property>
+ </column>
+ <column>
+ <property name="text">
+ <string>Traffic</string>
+ </property>
+ </column>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ </layout>
+ </widget>
+ <widget class="QWidget" name="tab_2">
+ <attribute name="title">
+ <string>Internal circuits</string>
+ </attribute>
+ <layout class="QVBoxLayout" name="verticalLayout_4">
+ <item>
+ <layout class="QVBoxLayout" name="verticalLayout_3">
+ <item>
+ <widget class="CircuitListWidget" name="treeInternalCircuitList">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+ <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="frameShape">
+ <enum>QFrame::StyledPanel</enum>
+ </property>
+ <property name="frameShadow">
+ <enum>QFrame::Sunken</enum>
+ </property>
+ <property name="sortingEnabled">
+ <bool>false</bool>
+ </property>
+ <property name="columnCount">
+ <number>3</number>
+ </property>
+ <column>
+ <property name="text">
+ <string>Connection</string>
+ </property>
+ </column>
+ <column>
+ <property name="text">
+ <string>Status</string>
+ </property>
+ </column>
+ <column>
+ <property name="text">
+ <string>Traffic</string>
+ </property>
+ </column>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ </layout>
+ </widget>
+ <widget class="QWidget" name="tab_3">
+ <attribute name="title">
+ <string>Hidden Service circuits</string>
+ </attribute>
+ <layout class="QVBoxLayout" name="verticalLayout_6">
+ <item>
+ <layout class="QVBoxLayout" name="verticalLayout_5">
+ <item>
+ <widget class="CircuitListWidget" name="treeHSCircuitList">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+ <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="frameShape">
+ <enum>QFrame::StyledPanel</enum>
+ </property>
+ <property name="frameShadow">
+ <enum>QFrame::Sunken</enum>
+ </property>
+ <property name="sortingEnabled">
+ <bool>false</bool>
+ </property>
+ <property name="columnCount">
+ <number>3</number>
+ </property>
+ <column>
+ <property name="text">
+ <string>Connection</string>
+ </property>
+ </column>
+ <column>
+ <property name="text">
+ <string>Status</string>
+ </property>
+ </column>
+ <column>
+ <property name="text">
+ <string>Traffic</string>
+ </property>
+ </column>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ </layout>
+ </widget>
</widget>
- <widget class="QSplitter" name="splitter3" >
- <property name="sizePolicy" >
- <sizepolicy>
- <hsizetype>5</hsizetype>
- <vsizetype>5</vsizetype>
+ <widget class="RouterDescriptorView" name="textRouterInfo">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>100</horstretch>
- <verstretch>0</verstretch>
+ <verstretch>100</verstretch>
</sizepolicy>
</property>
- <property name="contextMenuPolicy" >
- <enum>Qt::NoContextMenu</enum>
- </property>
- <property name="orientation" >
- <enum>Qt::Vertical</enum>
+ <property name="contextMenuPolicy">
+ <enum>Qt::DefaultContextMenu</enum>
</property>
- <property name="childrenCollapsible" >
- <bool>false</bool>
+ <property name="readOnly">
+ <bool>true</bool>
</property>
- <widget class="QFrame" name="frmMap" >
- <property name="sizePolicy" >
- <sizepolicy>
- <hsizetype>7</hsizetype>
- <vsizetype>7</vsizetype>
- <horstretch>100</horstretch>
- <verstretch>100</verstretch>
+ </widget>
+ </widget>
+ </widget>
+ </item>
+ <item>
+ <widget class="QFrame" name="frmSettings">
+ <property name="enabled">
+ <bool>true</bool>
+ </property>
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Expanding" vsizetype="Minimum">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="minimumSize">
+ <size>
+ <width>550</width>
+ <height>140</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="QHBoxLayout" name="horizontalLayout_2">
+ <item>
+ <widget class="QGroupBox" name="grpRelayPanel">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Expanding" vsizetype="Minimum">
+ <horstretch>1</horstretch>
+ <verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="minimumSize" >
+ <property name="minimumSize">
<size>
<width>400</width>
- <height>300</height>
+ <height>110</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 name="title">
+ <string>Add columns to Relay panel:</string>
</property>
- <layout class="QHBoxLayout" >
- <property name="margin" >
- <number>9</number>
- </property>
- <property name="spacing" >
- <number>6</number>
- </property>
- <item>
- <layout class="QGridLayout" >
- <property name="margin" >
- <number>0</number>
+ <layout class="QFormLayout" name="formLayout">
+ <item row="0" column="0">
+ <widget class="QCheckBox" name="chkShowIP">
+ <property name="text">
+ <string>IP</string>
</property>
- <property name="spacing" >
- <number>6</number>
+ </widget>
+ </item>
+ <item row="1" column="0">
+ <widget class="QCheckBox" name="chkShowBW">
+ <property name="text">
+ <string>Bandwidth</string>
</property>
- </layout>
+ </widget>
+ </item>
+ <item row="2" column="0">
+ <widget class="QCheckBox" name="chkShowUptime">
+ <property name="text">
+ <string>Uptime</string>
+ </property>
+ </widget>
</item>
</layout>
</widget>
- <widget class="QSplitter" name="splitter2" >
- <property name="sizePolicy" >
- <sizepolicy>
- <hsizetype>7</hsizetype>
- <vsizetype>1</vsizetype>
- <horstretch>100</horstretch>
- <verstretch>1</verstretch>
- </sizepolicy>
- </property>
- <property name="contextMenuPolicy" >
- <enum>Qt::NoContextMenu</enum>
- </property>
- <property name="orientation" >
- <enum>Qt::Horizontal</enum>
+ </item>
+ <item>
+ <layout class="QVBoxLayout" name="verticalLayout_10">
+ <property name="sizeConstraint">
+ <enum>QLayout::SetFixedSize</enum>
</property>
- <property name="childrenCollapsible" >
- <bool>false</bool>
- </property>
- <widget class="CircuitListWidget" name="treeCircuitList" >
- <property name="sizePolicy" >
- <sizepolicy>
- <hsizetype>5</hsizetype>
- <vsizetype>5</vsizetype>
- <horstretch>100</horstretch>
- <verstretch>100</verstretch>
- </sizepolicy>
- </property>
- <property name="minimumSize" >
- <size>
- <width>300</width>
- <height>0</height>
- </size>
- </property>
- <property name="contextMenuPolicy" >
- <enum>Qt::CustomContextMenu</enum>
- </property>
- <property name="statusTip" >
- <string/>
- </property>
- <property name="sortingEnabled" >
- <bool>false</bool>
- </property>
- </widget>
- <widget class="RouterDescriptorView" name="textRouterInfo" >
- <property name="sizePolicy" >
- <sizepolicy>
- <hsizetype>5</hsizetype>
- <vsizetype>5</vsizetype>
- <horstretch>100</horstretch>
- <verstretch>100</verstretch>
- </sizepolicy>
- </property>
- <property name="contextMenuPolicy" >
- <enum>Qt::DefaultContextMenu</enum>
- </property>
- <property name="readOnly" >
- <bool>true</bool>
- </property>
- </widget>
- </widget>
- </widget>
- </widget>
- </item>
- </layout>
- </widget>
- <widget class="QStatusBar" name="statusbar" />
- <widget class="QToolBar" name="toolBar" >
- <property name="contextMenuPolicy" >
- <enum>Qt::NoContextMenu</enum>
- </property>
- <property name="movable" >
+ <item>
+ <spacer name="verticalSpacer_2">
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>20</width>
+ <height>40</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item>
+ <widget class="QPushButton" name="btnSaveSettings">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="minimumSize">
+ <size>
+ <width>85</width>
+ <height>27</height>
+ </size>
+ </property>
+ <property name="contextMenuPolicy">
+ <enum>Qt::NoContextMenu</enum>
+ </property>
+ <property name="toolTip">
+ <string>Saves the current Network Map settings</string>
+ </property>
+ <property name="text">
+ <string>Save</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QPushButton" name="btnCancelSettings">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="minimumSize">
+ <size>
+ <width>85</width>
+ <height>27</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>
+ <item>
+ <spacer name="verticalSpacer">
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>20</width>
+ <height>40</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ </layout>
+ </item>
+ </layout>
+ </widget>
+ </item>
+ </layout>
+ <action name="actionRefresh">
+ <property name="enabled">
<bool>false</bool>
</property>
- <property name="orientation" >
- <enum>Qt::Horizontal</enum>
- </property>
- <attribute name="toolBarArea" >
- <number>4</number>
- </attribute>
- <addaction name="actionRefresh" />
- <addaction name="separator" />
- <addaction name="actionZoomIn" />
- <addaction name="actionZoomOut" />
- <addaction name="actionZoomToFit" />
- <addaction name="actionZoomFullScreen" />
- <addaction name="separator" />
- <addaction name="actionHelp" />
- <addaction name="actionClose" />
- </widget>
- <action name="actionRefresh" >
- <property name="enabled" >
- <bool>false</bool>
+ <property name="icon">
+ <iconset resource="../res/vidalia.qrc">
+ <normaloff>:/images/32x32/view-refresh.png</normaloff>:/images/32x32/view-refresh.png</iconset>
</property>
- <property name="icon" >
- <iconset resource="../res/vidalia.qrc" >:/images/32x32/view-refresh.png</iconset>
- </property>
- <property name="text" >
+ <property name="text">
<string>Refresh</string>
</property>
- <property name="toolTip" >
+ <property name="toolTip">
<string>Refresh the list of Tor relays and connections</string>
</property>
- <property name="statusTip" >
+ <property name="statusTip">
<string>Refresh the list of Tor relays and connections</string>
</property>
- <property name="shortcut" >
+ <property name="shortcut">
<string>Ctrl+R</string>
</property>
</action>
- <action name="actionHelp" >
- <property name="icon" >
- <iconset resource="../res/vidalia.qrc" >:/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>
+ <action name="actionSettings">
+ <property name="checkable">
+ <bool>true</bool>
+ </property>
+ <property name="icon">
+ <iconset resource="../res/vidalia.qrc">
+ <normaloff>:/images/32x32/preferences-other.png</normaloff>:/images/32x32/preferences-other.png</iconset>
+ </property>
+ <property name="text">
+ <string>Settings</string>
+ </property>
+ <property name="statusTip">
+ <string>Adjust Network Map Settings</string>
+ </property>
+ <property name="shortcut">
+ <string>Ctrl+T</string>
+ </property>
+ </action>
</widget>
<customwidgets>
<customwidget>
@@ -370,22 +710,22 @@
</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>
+ <sender>actionSettings</sender>
+ <signal>toggled(bool)</signal>
+ <receiver>frmSettings</receiver>
+ <slot>setVisible(bool)</slot>
<hints>
- <hint type="sourcelabel" >
+ <hint type="sourcelabel">
<x>-1</x>
<y>-1</y>
</hint>
- <hint type="destinationlabel" >
- <x>403</x>
- <y>322</y>
+ <hint type="destinationlabel">
+ <x>264</x>
+ <y>424</y>
</hint>
</hints>
</connection>
diff --git a/src/vidalia/network/RouterDescriptorView.cpp b/src/vidalia/network/RouterDescriptorView.cpp
index bb4b19d..22116c8 100644
--- a/src/vidalia/network/RouterDescriptorView.cpp
+++ b/src/vidalia/network/RouterDescriptorView.cpp
@@ -106,10 +106,12 @@ RouterDescriptorView::display(QList<RouterDescriptor> rdlist)
/* Add the IP address and router platform information */
html.append(trow(tcol(b(tr("IP Address:"))) + tcol(rd.ip().toString())));
- html.append(trow(tcol(b(tr("Platform:"))) + tcol(rd.platform())));
+ html.append(trow(tcol(b(tr("Fingerprint:"))) + tcol(rd.id())));
+ if(!rd.platform().isEmpty())
+ html.append(trow(tcol(b(tr("Platform:"))) + tcol(rd.platform())));
/* If the router is online, then show the uptime and bandwidth stats. */
- if (!rd.offline()) {
+ if (!rd.offline() and rd.uptime() != 0) {
qint64 minBandwidth = (qint64)qMin(rd.observedBandwidth(),
qMin(rd.averageBandwidth(),
rd.burstBandwidth()));
@@ -121,8 +123,9 @@ RouterDescriptorView::display(QList<RouterDescriptor> rdlist)
}
/* Date the router was published */
- html.append(trow(tcol(b(tr("Last Updated:"))) +
- tcol(string_format_datetime(rd.published()) + " GMT")));
+ if(!string_format_datetime(rd.published()).isEmpty())
+ html.append(trow(tcol(b(tr("Last Updated:"))) +
+ tcol(string_format_datetime(rd.published()) + " GMT")));
html.append("</table>");
diff --git a/src/vidalia/network/RouterInfoDialog.cpp b/src/vidalia/network/RouterInfoDialog.cpp
index 727acd4..1731103 100644
--- a/src/vidalia/network/RouterInfoDialog.cpp
+++ b/src/vidalia/network/RouterInfoDialog.cpp
@@ -41,13 +41,31 @@ RouterInfoDialog::setRouterInfo(const QStringList &desc,
{
RouterDescriptor rd(desc);
- ui.lblName->setText(rd.name());
- ui.lblIPAddress->setText(rd.ip().toString());
- ui.lblPlatform->setText(rd.platform());
- ui.lblBandwidth->setText(string_format_bandwidth(rd.observedBandwidth()));
- ui.lblLastUpdated->setText(string_format_datetime(rd.published()) + " GMT");
- ui.lblUptime->setText(string_format_uptime(adjustUptime(rd.uptime(),
- rd.published())));
+ ui.lblName->setText(status.name());
+ ui.lblIPAddress->setText(status.ipAddress().toString());
+ if(rd.platform().isEmpty()) {
+ ui.lblPlatformLabel->setVisible(false);
+ ui.lblPlatform->setVisible(false);
+ } else {
+ ui.lblPlatform->setText(rd.platform());
+ }
+
+ if(rd.observedBandwidth() == 0) {
+ ui.lblBandwidthLabel->setVisible(false);
+ ui.lblBandwidth->setVisible(false);
+ } else {
+ ui.lblBandwidth->setText(string_format_bandwidth(rd.observedBandwidth()));
+ }
+
+ ui.lblLastUpdated->setText(string_format_datetime(status.published()) + " GMT");
+
+ if(rd.uptime() == 0) {
+ ui.lblUptimeLabel->setVisible(false);
+ ui.lblUptime->setVisible(false);
+ } else {
+ ui.lblUptime->setText(string_format_uptime(adjustUptime(rd.uptime(),
+ status.published())));
+ }
if (rd.hibernating()) {
ui.lblStatus->setText(tr("Hibernating"));
@@ -74,5 +92,7 @@ void
RouterInfoDialog::setLocation(const QString &location)
{
ui.lblLocation->setText(location);
+ ui.lblLocation->setVisible(!location.isEmpty());
+ ui.lblLocationLabel->setVisible(!location.isEmpty());
}
diff --git a/src/vidalia/network/RouterListItem.cpp b/src/vidalia/network/RouterListItem.cpp
index 5bf29e7..08ce5f7 100644
--- a/src/vidalia/network/RouterListItem.cpp
+++ b/src/vidalia/network/RouterListItem.cpp
@@ -16,11 +16,23 @@
#include "RouterListItem.h"
#include "RouterListWidget.h"
+#include "TorSettings.h"
+#include "Vidalia.h"
+#include "stringutil.h"
+
#include <QHeaderView>
#define STATUS_COLUMN (RouterListWidget::StatusColumn)
#define COUNTRY_COLUMN (RouterListWidget::CountryColumn)
#define NAME_COLUMN (RouterListWidget::NameColumn)
+#define IP_COLUMN (RouterListWidget::IPnumberColumn)
+#define BW_COLUMN (RouterListWidget::BandwidthColumn)
+#define UPTIME_COLUMN (RouterListWidget::UptimeColumn)
+
+#define NONEXIT_COLOR (Qt::white)
+#define EXIT_COLOR (QColor::fromRgb(169, 207, 84))
+#define CANBEEXIT_COLOR (QColor::fromRgb(172, 209, 233))
+#define ENTRY_COLOR (QColor::fromRgb(255, 144, 0))
#define IMG_NODE_OFFLINE ":/images/icons/node-unresponsive.png"
#define IMG_NODE_SLEEPING ":/images/icons/node-hibernating.png"
@@ -39,6 +51,7 @@ RouterListItem::RouterListItem(RouterListWidget *list, RouterDescriptor rd)
_rd = 0;
_countryCode = "~"; /* Force items with no country to the bottom */
setIcon(COUNTRY_COLUMN, QIcon(IMG_FLAG_UNKNOWN));
+ _selectedExit = false;
update(rd);
}
@@ -87,6 +100,20 @@ RouterListItem::update(const RouterDescriptor &rd)
/* Make the new information visible */
setIcon(STATUS_COLUMN, statusIcon);
setText(NAME_COLUMN, _rd->name());
+ setText(IP_COLUMN, _rd->ip().toString());
+ /* We show the observedBandwidth and not the minBandwidth as in
+ * RouterDescriptorView.cpp
+ */
+ setText(BW_COLUMN, string_format_bandwidth(_rd->observedBandwidth()));
+ /* Clf. quint64
+ * RouterInfoDialog::adjustUptime(quint64 uptime, const QDateTime &published)
+ */
+ QDateTime now = QDateTime::currentDateTime().toUTC();
+ if (now < _rd->published())
+ setText(UPTIME_COLUMN, string_format_uptime(_rd->uptime()));
+ else
+ setText(UPTIME_COLUMN, string_format_uptime(_rd->uptime() +
+ (now.toTime_t() - _rd->published().toTime_t())));
setToolTip(NAME_COLUMN, QString(_rd->name() + "\r\n" + _rd->platform()));
}
@@ -102,9 +129,32 @@ RouterListItem::setLocation(const GeoIpRecord &geoip)
if (_rd)
_rd->setLocation(geoip.toString());
+
+ _location = geoip;
_countryCode = geoip.countryCode();
}
+/** Convert IP numbers to quint64 for the comparison operator
+ * filling the dot separated groups with zeroes if necessary.
+ */
+quint64
+RouterListItem::iptoquint64(const RouterListItem *ListItem) const
+{
+ bool ok;
+ quint64 ipNumber;
+ QString ipString;
+ ipString = ListItem->descriptor().ip().toString();
+ QStringList ipList = ipString.split(".", QString::SkipEmptyParts);
+ ipString = "";
+ for (int i = ipList.size()-1; i >= 1; i--) {
+ ipList[i] = ipList[i].rightJustified(3, '0');
+ ipString.prepend(ipList[i]);
+ }
+ ipString.prepend(ipList[0]);
+ ipNumber = ipString.toULongLong(&ok, 10);
+ return(ipNumber);
+}
+
/** Overload the comparison operator. */
bool
RouterListItem::operator<(const QTreeWidgetItem &other) const
@@ -142,6 +192,35 @@ RouterListItem::operator<(const QTreeWidgetItem &other) const
return (a->_statusValue < b->_statusValue);
}
return (a->name().toLower() < b->name().toLower());
+ /* Compare IP numbers based on their quint64 values */
+ case RouterListWidget::IPnumberColumn:
+ if (a->descriptor().ip() == b->descriptor().ip()) {
+ if (order == Qt::AscendingOrder)
+ return (a->_statusValue > b->_statusValue);
+ else
+ return (a->_statusValue < b->_statusValue);
+ }
+ return (iptoquint64(a) < iptoquint64(b));
+ case RouterListWidget::BandwidthColumn:
+ /* Compare bandwidth in bytes */
+ if (a->descriptor().observedBandwidth() ==
+ b->descriptor().observedBandwidth()) {
+ if (order == Qt::AscendingOrder)
+ return (a->_statusValue > b->_statusValue);
+ else
+ return (a->_statusValue < b->_statusValue);
+ }
+ return (a->descriptor().observedBandwidth() <
+ b->descriptor().observedBandwidth());
+ case RouterListWidget::UptimeColumn:
+ /* Compare uptime in seconds */
+ if (a->descriptor().uptime() == b->descriptor().uptime()) {
+ if (order == Qt::AscendingOrder)
+ return (a->_statusValue > b->_statusValue);
+ else
+ return (a->_statusValue < b->_statusValue);
+ }
+ return (a->descriptor().uptime() < b->descriptor().uptime());
default:
break;
}
@@ -149,3 +228,82 @@ RouterListItem::operator<(const QTreeWidgetItem &other) const
return QTreeWidgetItem::operator<(other);
}
+/** Sets the whole line to the given brush */
+void
+RouterListItem::setBackground(const QBrush &brush)
+{
+ QTreeWidgetItem::setBackground(STATUS_COLUMN, brush);
+ QTreeWidgetItem::setBackground(COUNTRY_COLUMN, brush);
+ QTreeWidgetItem::setBackground(NAME_COLUMN, brush);
+}
+
+/** Sets this item's background to selected exit color if exit is true */
+void
+RouterListItem::showAsSelectedExit(bool exit)
+{
+ _selectedExit = exit;
+ TorSettings settings;
+ QStringList exitNodes = settings.exitNodes();
+ bool changed = false;
+
+ if (exit) {
+ setBackground(EXIT_COLOR);
+
+ if (exitNodes.indexOf(id()) == -1) {
+ exitNodes << id();
+ settings.setExitNodes(exitNodes);
+ changed = true;
+ }
+ } else {
+ setBackground(CANBEEXIT_COLOR);
+ exitNodes.removeAll(id());
+ settings.setExitNodes(exitNodes);
+ changed = true;
+ }
+
+ QString errmsg;
+ if (changed && !settings.apply(&errmsg)) {
+ vWarn(errmsg);
+ }
+}
+
+/** Sets this item's background to exit color if exit is true */
+void
+RouterListItem::showAsExit(bool exit)
+{
+ if (exit) {
+ setBackground(CANBEEXIT_COLOR);
+ } else {
+ setBackground(NONEXIT_COLOR);
+ }
+}
+
+/** Sets this item's background to selected entry color if entry is true */
+void
+RouterListItem::showAsSelectedEntry(bool entry)
+{
+ _selectedEntry = entry;
+ TorSettings settings;
+ QStringList entryNodes = settings.entryNodes();
+ bool changed = false;
+
+ if (entry) {
+ setBackground(ENTRY_COLOR);
+
+ if (entryNodes.indexOf(id()) == -1) {
+ entryNodes << id();
+ settings.setEntryNodes(entryNodes);
+ changed = true;
+ }
+ } else {
+ setBackground(NONEXIT_COLOR);
+ entryNodes.removeAll(id());
+ settings.setEntryNodes(entryNodes);
+ changed = true;
+ }
+
+ QString errmsg;
+ if (changed && !settings.apply(&errmsg)) {
+ vWarn(errmsg);
+ }
+}
diff --git a/src/vidalia/network/RouterListItem.h b/src/vidalia/network/RouterListItem.h
index 4397947..7f3f9f8 100644
--- a/src/vidalia/network/RouterListItem.h
+++ b/src/vidalia/network/RouterListItem.h
@@ -49,17 +49,39 @@ public:
void setLocation(const GeoIpRecord &geoip);
/** Returns the location information set for this router item. */
GeoIpRecord location() const { return _location; }
-
+ /** Convert IP numbers to quint64 for the comparison operator
+ * filling the dot separated groups with zeroes if necessary.
+ */
+ quint64 iptoquint64(const RouterListItem *ListItem) const;
/** Overload the comparison operator. */
virtual bool operator<(const QTreeWidgetItem &other) const;
+ /** Sets this item's background to selected exit color if exit is true */
+ void showAsSelectedExit(bool exit);
+ /** Sets this item's background to exit color if exit is true */
+ void showAsExit(bool exit);
+
+ /** Returns true if this item has been selected as exit */
+ bool selectedExit() const { return _selectedExit; }
+
+ /** Sets this item's background to selected entry color if exit is true */
+ void showAsSelectedEntry(bool entry);
+
+ /** Returns true if this item has been selected as entry */
+ bool selectedEntry() const { return _selectedEntry; }
+
private:
RouterDescriptor* _rd; /**< Descriptor for this router item. */
RouterListWidget* _list; /**< The list for this list item. */
qint64 _statusValue; /**< Value used to sort items by status. */
GeoIpRecord _location; /**< Location information for this router. */
QString _countryCode;
+
+ bool _selectedExit; /**< True if this router has been selected for exit */
+ bool _selectedEntry; /**< True if this router has been selected for exit */
+
+ /** Sets the whole line to the given brush */
+ void setBackground(const QBrush &brush);
};
#endif
-
diff --git a/src/vidalia/network/RouterListWidget.cpp b/src/vidalia/network/RouterListWidget.cpp
index 22d2829..409c99e 100644
--- a/src/vidalia/network/RouterListWidget.cpp
+++ b/src/vidalia/network/RouterListWidget.cpp
@@ -16,13 +16,17 @@
#include "RouterListWidget.h"
#include "RouterListItem.h"
#include "Vidalia.h"
+#include "VidaliaSettings.h"
+#include "VMessageBox.h"
#include <QHeaderView>
#include <QClipboard>
#define IMG_ZOOM ":/images/22x22/page-zoom.png"
#define IMG_COPY ":/images/22x22/edit-copy.png"
-
+#define IMG_PLUS ":/images/22x22/list-add.png"
+#define IMG_MINUS ":/images/22x22/list-remove.png"
+#define IMG_INFO ":/images/16x16/dialog-information.png"
RouterListWidget::RouterListWidget(QWidget *parent)
: QTreeWidget(parent)
@@ -30,9 +34,13 @@ RouterListWidget::RouterListWidget(QWidget *parent)
/* Create and initialize columns */
setHeaderLabels(QStringList() << QString("")
<< QString("")
- << tr("Relay"));
+ << tr("Relay")
+ << tr("IP")
+ << tr("Bandwidth")
+ << tr("Uptime"));
/* Sort by descending server bandwidth */
+ setSortingEnabled(false);
sortItems(StatusColumn, Qt::DescendingOrder);
/* Find out when the selected item has changed. */
@@ -46,7 +54,10 @@ RouterListWidget::retranslateUi()
{
setHeaderLabels(QStringList() << QString("")
<< QString("")
- << tr("Relay"));
+ << tr("Relay")
+ << tr("IP")
+ << tr("Bandwidth")
+ << tr("Uptime"));
}
/** Called when the user requests a context menu for a router in the list. A
@@ -55,7 +66,7 @@ RouterListWidget::retranslateUi()
void
RouterListWidget::contextMenuEvent(QContextMenuEvent *event)
{
- QAction *action;
+ QAction *action, *routerInfoAction, *useAsExit, *useAsEntry;
QMenu *menu, *copyMenu;
QList<QTreeWidgetItem *> selected;
@@ -77,6 +88,37 @@ RouterListWidget::contextMenuEvent(QContextMenuEvent *event)
else
connect(action, SIGNAL(triggered()), this, SLOT(zoomToSelectedRelay()));
+ routerInfoAction = menu->addAction(QIcon(IMG_INFO), tr("Router Info"));
+ connect(routerInfoAction, SIGNAL(triggered()), this, SLOT(displayRouterInfo()));
+
+ RouterListItem *item = static_cast<RouterListItem*>(selected.first());
+
+ useAsExit = menu->addAction(QIcon(IMG_PLUS), tr("Use as Exit node"));
+ if (selected.size() > 1) {
+ useAsExit->setEnabled(false);
+ } else if (item->descriptor().exitPolicy().isEmpty()) {
+ useAsExit->setEnabled(false);
+ } else {
+ if (item->selectedExit()) {
+ useAsExit->setText(tr("Do not use as Exit node"));
+ useAsExit->setIcon(QIcon(IMG_MINUS));
+ }
+
+ connect(useAsExit, SIGNAL(triggered()), this, SLOT(useAsExit()));
+ }
+
+ useAsEntry = menu->addAction(QIcon(IMG_PLUS), tr("Use as Entry node"));
+ if (selected.size() > 1) {
+ useAsEntry->setEnabled(false);
+ } else {
+ if (item->selectedEntry()) {
+ useAsEntry->setText(tr("Do not use as Entry node"));
+ useAsEntry->setIcon(QIcon(IMG_MINUS));
+ }
+
+ connect(useAsEntry, SIGNAL(triggered()), this, SLOT(useAsEntry()));
+ }
+
menu->exec(event->globalPos());
delete menu;
}
@@ -152,6 +194,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
@@ -211,7 +287,15 @@ RouterListWidget::addRouter(const RouterDescriptor &rd)
if (item) {
item->update(rd);
} else {
+ TorSettings settings;
+ QStringList exitNodes = settings.exitNodes();
+
item = new RouterListItem(this, rd);
+ if (exitNodes.indexOf(id) == -1)
+ item->showAsExit(rd.exitPolicy().length() != 0);
+ else
+ item->showAsSelectedExit(true);
+
addTopLevelItem(item);
_idmap.insert(id, item);
}
@@ -239,3 +323,70 @@ RouterListWidget::onSelectionChanged()
emit routerSelected(descriptors);
}
+/** Called when the Display router info menu action is selected */
+void
+RouterListWidget::displayRouterInfo()
+{
+ foreach (QTreeWidgetItem *item, selectedItems()) {
+ RouterListItem *relay = dynamic_cast<RouterListItem *>(item);
+ if (relay)
+ emit displayRouterInfo(relay->id());
+ break;
+ }
+}
+
+/** Called when the Use as Exit node menu action is selected */
+void
+RouterListWidget::useAsExit()
+{
+ foreach (QTreeWidgetItem *item, selectedItems()) {
+ RouterListItem *relay = dynamic_cast<RouterListItem *>(item);
+ if (relay->descriptor().exitPolicy().length() != 0) {
+ VidaliaSettings settings;
+ if (!settings.dontWarnExitNodes()) {
+ int res = VMessageBox::question(this, tr("You are about to set a fixed Exit node"),
+ tr("You need to understand that by doing this you might be "
+ "putting your anonymity at risk and/or limiting the "
+ "services you have available through Tor.\n\n"
+ "Do you still want to set this node as Exit?"),
+ VMessageBox::Yes,
+ VMessageBox::No|VMessageBox::Default,
+ VMessageBox::Cancel|VMessageBox::Escape,
+ "I know what I'm doing, do not remind me", &settings,
+ SETTING_REMEMBER_DONTWARNEXIT);
+
+ if (res == VMessageBox::Yes)
+ relay->showAsSelectedExit(!relay->selectedExit());
+ } else {
+ relay->showAsSelectedExit(!relay->selectedExit());
+ }
+ }
+ }
+}
+
+/** Called when the Use as Entry node menu action is selected */
+void
+RouterListWidget::useAsEntry()
+{
+ foreach (QTreeWidgetItem *item, selectedItems()) {
+ RouterListItem *relay = dynamic_cast<RouterListItem *>(item);
+ VidaliaSettings settings;
+ if (!settings.dontWarnEntryNodes()) {
+ int res = VMessageBox::question(this, tr("You are about to set a fixed Entry node"),
+ tr("You need to understand that by doing this you might be "
+ "putting your anonymity at risk and/or limiting the "
+ "services you have available through Tor.\n\n"
+ "Do you still want to set this node as Entry?"),
+ VMessageBox::Yes,
+ VMessageBox::No|VMessageBox::Default,
+ VMessageBox::Cancel|VMessageBox::Escape,
+ "I know what I'm doing, do not remind me", &settings,
+ SETTING_REMEMBER_DONTWARNENTRY);
+
+ if (res == VMessageBox::Yes)
+ relay->showAsSelectedEntry(!relay->selectedEntry());
+ } else {
+ relay->showAsSelectedEntry(!relay->selectedEntry());
+ }
+ }
+}
diff --git a/src/vidalia/network/RouterListWidget.h b/src/vidalia/network/RouterListWidget.h
index efa4c6f..6a3b7c1 100644
--- a/src/vidalia/network/RouterListWidget.h
+++ b/src/vidalia/network/RouterListWidget.h
@@ -37,9 +37,12 @@ class RouterListWidget : public QTreeWidget
public:
/** Columns in the list. */
enum Columns {
- StatusColumn = 0, /**< Status column, indicating bandwidth. */
- CountryColumn = 1, /**< Router's country flag. */
- NameColumn = 2, /**< Router's name. */
+ StatusColumn = 0, /**< Status column, indicating bandwidth. */
+ CountryColumn = 1, /**< Router's country flag. */
+ NameColumn = 2, /**< Router's name. */
+ IPnumberColumn = 3, /**< Router's IP. */
+ BandwidthColumn = 4, /**< Router's Bandwidth. */
+ UptimeColumn = 5, /**< Router's Uptime. */
};
/** Default constructor. */
@@ -54,16 +57,24 @@ 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. */
void routerSelected(QList<RouterDescriptor> rd);
/** Emitted when the user selects a router to zoom in on. */
void zoomToRouter(QString id);
+ /** Emitted when the user selects a router to display more
+ * information about */
+ void displayRouterInfo(QString id);
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. */
@@ -79,6 +90,12 @@ private slots:
/** Emits a zoomToRouter() signal containing the fingerprint of the
* currently selected relay. */
void zoomToSelectedRelay();
+ /** Called when the Display router info menu action is selected */
+ void displayRouterInfo();
+ /** Called when the Use as Exit node menu action is selected */
+ void useAsExit();
+ /** Called when the Use as Entry node menu action is selected */
+ void useAsEntry();
protected:
/** Called when the user presses a key while the list has focus. */
diff --git a/src/vidalia/network/StreamItem.cpp b/src/vidalia/network/StreamItem.cpp
index 5083b81..6d77afe 100644
--- a/src/vidalia/network/StreamItem.cpp
+++ b/src/vidalia/network/StreamItem.cpp
@@ -19,6 +19,7 @@
/** Constructor */
StreamItem::StreamItem(const Stream &stream)
+ : _bytesReceived(0), _bytesSent(0)
{
/* Set the stream's displayed target information */
setText(CircuitListWidget::ConnectionColumn, stream.target());
@@ -37,3 +38,36 @@ StreamItem::update(const Stream &stream)
setToolTip(CircuitListWidget::StatusColumn, stream.statusString());
}
+/** Formats a count of bytes appropriately as bytes, kilobytes,
+ * megabytes, or gigabytes. */
+static
+QString formatBytes(quint64 bytes) {
+ const int K = 1024, M = K * K, G = K * M;
+ double d = bytes;
+ /*if (bytes < 1 * K) return QString("%1 B").arg(bytes);*/
+ if (bytes < 10 * K) return QString("%1 KB").arg(d / K, 0, 'f', 1);
+ if (bytes < 1 * M) return QString("%1 KB").arg(d / K, 0, 'f', 0);
+ if (bytes < 100 * M) return QString("%1 MB").arg(d / M, 0, 'f', 1);
+ if (bytes < 1 * G) return QString("%1 MB").arg(d / M, 0, 'f', 0);
+ return QString("%1 GB").arg(d / G, 0, 'f', 1);
+}
+
+/** Updates the traffic totals of this stream item. */
+void
+StreamItem::setTraffic(quint64 bytesReceived, quint64 bytesSent)
+{
+ _bytesReceived = bytesReceived;
+ _bytesSent = bytesSent;
+
+ QString str;
+ if (bytesReceived | bytesSent) {
+ str = QString("%1 down / %2 up").arg(
+ formatBytes(bytesReceived),
+ formatBytes(bytesSent));
+ } else {
+ str = QString();
+ }
+
+ setText(CircuitListWidget::TrafficColumn, str);
+ setToolTip(CircuitListWidget::TrafficColumn, str);
+}
diff --git a/src/vidalia/network/StreamItem.h b/src/vidalia/network/StreamItem.h
index ea8d906..1521d03 100644
--- a/src/vidalia/network/StreamItem.h
+++ b/src/vidalia/network/StreamItem.h
@@ -33,8 +33,15 @@ public:
/** Returns the ID of the stream associated with this tree item. */
StreamId id() const { return _stream.id(); }
+ /** Updates the traffic totals of this stream item. */
+ void setTraffic(quint64 bytesReceived, quint64 bytesSent);
+ quint64 bytesReceived() const { return _bytesReceived; }
+ quint64 bytesSent() const { return _bytesSent; }
+
private:
Stream _stream;
+ quint64 _bytesReceived;
+ quint64 _bytesSent;
};
#endif
diff --git a/src/vidalia/network/TorMapWidget.cpp b/src/vidalia/network/TorMapWidget.cpp
index 6d0696d..2c12424 100644
--- a/src/vidalia/network/TorMapWidget.cpp
+++ b/src/vidalia/network/TorMapWidget.cpp
@@ -14,11 +14,15 @@
*/
#include "TorMapWidget.h"
-#include "TorMapWidgetInputHandler.h"
#include "TorMapWidgetPopupMenu.h"
#include "Vidalia.h"
#include <MarbleModel.h>
+#include <MarbleWidgetInputHandler.h>
+#include <GeoDataPlacemark.h>
+#include <GeoDataTreeModel.h>
+#include <GeoDataDocument.h>
+#include <GeoDataFolder.h>
#include <HttpDownloadManager.h>
#include <QStringList>
@@ -26,8 +30,8 @@
using namespace Marble;
/** QPens to use for drawing different map elements */
-#define CIRCUIT_NORMAL_PEN QPen(Qt::blue, 2.0)
-#define CIRCUIT_SELECTED_PEN QPen(Qt::green, 3.0)
+#define CIRCUIT_NORMAL_PEN QPen(QBrush(QColor(0,51,102)), 2.0)
+#define CIRCUIT_SELECTED_PEN QPen(QBrush(QColor(65,146,75)), 3.0)
/** Default constructor */
@@ -42,22 +46,24 @@ TorMapWidget::TorMapWidget(QWidget *parent)
model()->downloadManager()->setDownloadEnabled(false);
- TorMapWidgetInputHandler *handler = new TorMapWidgetInputHandler();
+ _document = new Marble::GeoDataDocument();
+ _folder = new Marble::GeoDataFolder();
+ model()->treeModel()->addDocument(_document);
+ model()->treeModel()->addFeature(_document, _folder);
+
TorMapWidgetPopupMenu *popupMenu = new TorMapWidgetPopupMenu(this);
- connect(handler, SIGNAL(featureClicked(QPoint,Qt::MouseButton)),
- popupMenu, SLOT(featureClicked(QPoint,Qt::MouseButton)));
- connect(popupMenu, SIGNAL(displayRouterInfo(QString)),
- this, SIGNAL(displayRouterInfo(QString)));
+ // Properly disable all right click menus
+ inputHandler()->setMouseButtonPopupEnabled(Qt::RightButton, false);
- /* We can't call setInputHandler() until MarbleWidget has called its
- * internal _q_initGui() method, which doesn't happen until a
- * QTimer::singleShot(0, this, SLOT(_q_initGui())) timer set in its
- * constructor times out. So force that event to process now. */
- vApp->processEvents(QEventLoop::ExcludeUserInputEvents
- | QEventLoop::ExcludeSocketNotifiers);
+ // Hack to disable Marble's menus
+ disconnect(inputHandler(), SIGNAL(lmbRequest(int,int)),
+ 0,0);
- setInputHandler(handler);
+ connect(inputHandler(), SIGNAL(lmbRequest(int,int)),
+ popupMenu, SLOT(featureLeftClicked(int,int)));
+ connect(popupMenu, SIGNAL(displayRouterInfo(QString)),
+ this, SIGNAL(displayRouterInfo(QString)));
}
/** Destructor */
@@ -70,7 +76,6 @@ TorMapWidget::~TorMapWidget()
void
TorMapWidget::addRouter(const RouterDescriptor &desc, const GeoIpRecord &geoip)
{
- QString kml;
qreal lon = geoip.longitude();
qreal lat = geoip.latitude();
quint64 bw;
@@ -78,30 +83,16 @@ TorMapWidget::addRouter(const RouterDescriptor &desc, const GeoIpRecord &geoip)
bw = qMin(desc.averageBandwidth(), desc.burstBandwidth());
bw = qMin(bw, desc.observedBandwidth());
- kml.append("<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
- "<kml xmlns=\"http://earth.google.com/kml/2.0\">"
- "<Document>"
- " <Style id=\"normalPlacemark\">"
- " <IconStyle><Icon><href>:/images/icons/placemark-relay.png</href></Icon></IconStyle>"
- " </Style>"
- );
-
- kml.append("<Placemark>");
- kml.append("<styleUrl>#normalPlacemark</styleUrl>");
- kml.append(QString("<name>%1</name>").arg(desc.name()));
- kml.append(QString("<description>%1</description>").arg(desc.id()));
- kml.append(QString("<role>1</role>"));
- kml.append(QString("<address>%1</address>").arg(geoip.toString()));
- kml.append(QString("<CountryNameCode>%1</CountryNameCode>").arg(geoip.country()));
- kml.append(QString("<pop>%1</pop>").arg(10 * bw));
- kml.append(QString("<Point>"
- " <coordinates>%1,%2</coordinates>"
- "</Point>").arg(lon).arg(lat));
- kml.append("</Placemark>");
- kml.append("</Document></kml>");
-
QString id = desc.id();
- addPlacemarkData(kml, id);
+
+ GeoDataPlacemark *pm = new GeoDataPlacemark(desc.name());
+ pm->setDescription(desc.id());
+ pm->setRole("1");
+ pm->setAddress(geoip.toString());
+ pm->setCountryCode(geoip.country());
+ pm->setPopularity(10 * bw);
+ pm->setCoordinate(lon, lat, 0.0, GeoDataCoordinates::Degree);
+ model()->treeModel()->addFeature(_folder, pm);
_routers.insert(id, GeoDataCoordinates(lon, lat, 0.0,
GeoDataCoordinates::Degree));
}
@@ -154,19 +145,6 @@ TorMapWidget::removeCircuit(const CircuitId &circid)
repaint();
}
-/** Selects and highlights the router on the map. */
-void
-TorMapWidget::selectRouter(const QString &id)
-{
-#if 0
- if (_routers.contains(id)) {
- QPair<QPointF, bool> *routerPair = _routers.value(id);
- routerPair->second = true;
- }
- repaint();
-#endif
-}
-
/** Selects and highlights the circuit with the id <b>circid</b>
* on the map. */
void
@@ -184,13 +162,6 @@ TorMapWidget::selectCircuit(const CircuitId &circid)
void
TorMapWidget::deselectAll()
{
-#if 0
- /* Deselect all router points */
- foreach (QString router, _routers.keys()) {
- QPair<QPointF,bool> *routerPair = _routers.value(router);
- routerPair->second = false;
- }
-#endif
/* Deselect all circuit paths */
foreach (CircuitGeoPath *path, _circuits.values()) {
path->second = false;
@@ -204,7 +175,7 @@ void
TorMapWidget::clear()
{
foreach (QString id, _routers.keys()) {
- removePlacemarkKey(id);
+ model()->removeGeoData(id);
}
foreach (CircuitId circid, _circuits.keys()) {
@@ -234,18 +205,10 @@ TorMapWidget::zoomToFit()
void
TorMapWidget::zoomToCircuit(const CircuitId &circid)
{
-#if 0
if (_circuits.contains(circid)) {
- QPair<QPainterPath*,bool> *pair = _circuits.value(circid);
- QRectF rect = ((QPainterPath *)pair->first)->boundingRect();
- if (!rect.isNull()) {
- float zoomLevel = 1.0 - qMax(rect.height()/float(MAP_HEIGHT),
- rect.width()/float(MAP_WIDTH));
-
- zoom(rect.center().toPoint(), zoomLevel+0.2);
- }
+ CircuitGeoPath *pair = _circuits.value(circid);
+ centerOn(pair->first.latLonAltBox(), true);
}
-#endif
}
/** Zooms in on the router with the given <b>id</b>. */
@@ -257,7 +220,7 @@ TorMapWidget::zoomToRouter(const QString &id)
GeoDataCoordinates coords = _routers.value(id);
coords.geoCoordinates(lon, lat, GeoDataPoint::Degree);
- zoomView(maximumZoom());
+ zoomView(zoomFromDistance(1000));
centerOn(lon, lat, true);
}
}
diff --git a/src/vidalia/network/TorMapWidget.h b/src/vidalia/network/TorMapWidget.h
index cf0a8ea..c03dedc 100644
--- a/src/vidalia/network/TorMapWidget.h
+++ b/src/vidalia/network/TorMapWidget.h
@@ -33,6 +33,8 @@
typedef QPair<Marble::GeoDataLineString, bool> CircuitGeoPath;
+class Marble::GeoDataDocument;
+class Marble::GeoDataFolder;
class TorMapWidget : public Marble::MarbleWidget
{
@@ -48,8 +50,6 @@ public:
void addRouter(const RouterDescriptor &desc, const GeoIpRecord &geoip);
/** Plots the given circuit on the map. */
void addCircuit(const CircuitId &circid, const QStringList &path);
- /** Selects and hightlights a router on the map. */
- void selectRouter(const QString &id);
/** Selects and highlights a circuit on the map. */
void selectCircuit(const CircuitId &circid);
@@ -82,6 +82,9 @@ private:
QHash<QString, Marble::GeoDataCoordinates> _routers;
/** Stores circuit information */
QHash<CircuitId, CircuitGeoPath*> _circuits;
+
+ Marble::GeoDataDocument *_document;
+ Marble::GeoDataFolder *_folder;
};
#endif
diff --git a/src/vidalia/network/TorMapWidgetInputHandler.cpp b/src/vidalia/network/TorMapWidgetInputHandler.cpp
deleted file mode 100644
index 0e1dcd2..0000000
--- a/src/vidalia/network/TorMapWidgetInputHandler.cpp
+++ /dev/null
@@ -1,138 +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.
-*/
-
-#include "TorMapWidgetInputHandler.h"
-
-#include <MarbleWidget.h>
-#include <MarbleMap.h>
-#include <MarbleModel.h>
-#include <ViewParams.h>
-#include <ViewportParams.h>
-
-#include <QTimer>
-#include <QMouseEvent>
-#include <QWheelEvent>
-#include <QPersistentModelIndex>
-
-using namespace Marble;
-
-
-/** Amount to zoom in or out when responding to mouse double clicks. This
- * value was taken from MarbleMap.cpp.
- */
-#define MAP_ZOOM_STEP 40
-
-/** Number of units the mouse must be clicked and dragged before it will
- * force a map rotation and repaint.
-*/
-#define MIN_DRAG_THRESHOLD 3
-
-
-TorMapWidgetInputHandler::TorMapWidgetInputHandler()
- : MarbleWidgetInputHandler()
-{
-}
-
-bool
-TorMapWidgetInputHandler::eventFilter(QObject *obj, QEvent *e)
-{
- Q_UNUSED(obj);
-
- QWheelEvent *wheelEvent = 0;
- QMouseEvent *mouseEvent = static_cast<QMouseEvent*>(e);
-
- switch (e->type()) {
- case QEvent::MouseButtonPress:
- _mousePressedX = mouseEvent->x();
- _mousePressedY = mouseEvent->y();
- _mousePressedLon = m_widget->centerLongitude();
- _mousePressedLat = m_widget->centerLatitude();
-
- if (pointHasFeatures(mouseEvent->pos()))
- emit featureClicked(mouseEvent->pos(), mouseEvent->button());
- else
- m_widget->setCursor(Qt::ClosedHandCursor);
- break;
-
- case QEvent::MouseButtonRelease:
- if (! pointHasFeatures(mouseEvent->pos()))
- m_widget->setCursor(Qt::OpenHandCursor);
- else
- m_widget->setCursor(Qt::PointingHandCursor);
- break;
-
- case QEvent::MouseMove:
- if (mouseEvent->buttons() & Qt::LeftButton) {
- // Pan the map if the left button is pressed while dragging
- int dx = mouseEvent->x() - _mousePressedX;
- int dy = mouseEvent->y() - _mousePressedY;
-
- if (abs(dx) <= MIN_DRAG_THRESHOLD && abs(dy) <= MIN_DRAG_THRESHOLD)
- return true;
- m_widget->setCursor(Qt::ClosedHandCursor);
-
- qreal dir = 1;
- if (m_widget->projection() == Spherical) {
- if (m_widget->map()->viewParams()->viewport()->polarity() > 0) {
- if (mouseEvent->y() < (-m_widget->northPoleY() + m_widget->height()/2))
- dir = -1;
- } else {
- if (mouseEvent->y() > (+m_widget->northPoleY() + m_widget->height()/2))
- dir = -1;
- }
- }
-
- qreal radius = (qreal)(m_widget->radius());
- qreal lon = (qreal)(_mousePressedLon) - 90.0 * dir * dx / radius;
- qreal lat = (qreal)(_mousePressedLat) + 90.0 * dy / radius;
- m_widget->centerOn(lon, lat, false);
-
- return true;
- } else {
- // Change the mouse cursor if we're hovering over a relay placemark
- if (pointHasFeatures(mouseEvent->pos()) > 0)
- m_widget->setCursor(Qt::PointingHandCursor);
- else
- m_widget->setCursor(Qt::OpenHandCursor);
- }
- break;
-
- case QEvent::MouseButtonDblClick:
- // Adjust the zoom level on the map
- if (mouseEvent->button() == Qt::LeftButton) {
- m_widget->zoomViewBy(MAP_ZOOM_STEP);
- return true;
- } else if (mouseEvent->button() == Qt::RightButton) {
- m_widget->zoomViewBy(-MAP_ZOOM_STEP);
- return true;
- }
- break;
-
- case QEvent::Wheel:
- // Adjust the zoom level on the map
- m_widget->setViewContext(Marble::Animation);
-
- wheelEvent = static_cast<QWheelEvent*>(e);
- m_widget->zoomViewBy((int)(wheelEvent->delta() / 3));
- m_mouseWheelTimer->start(400);
- return true;
-
- default:
- break;
- }
- return MarbleWidgetInputHandler::eventFilter(obj, e);
-}
-
-bool
-TorMapWidgetInputHandler::pointHasFeatures(const QPoint &point) const
-{
- return (m_widget->model()->whichFeatureAt(point).size() > 0);
-}
-
diff --git a/src/vidalia/network/TorMapWidgetInputHandler.h b/src/vidalia/network/TorMapWidgetInputHandler.h
deleted file mode 100644
index bca2b4c..0000000
--- a/src/vidalia/network/TorMapWidgetInputHandler.h
+++ /dev/null
@@ -1,55 +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.
-*/
-
-#ifndef _TORMAPWIDGETINPUTHANDLER_H
-#define _TORMAPWIDGETINPUTHANDLER_H
-
-#include "MarbleWidgetInputHandler.h"
-
-#include <QEvent>
-#include <QObject>
-#include <QPoint>
-
-
-class TorMapWidgetInputHandler : public Marble::MarbleWidgetInputHandler
-{
- Q_OBJECT
-
-public:
- /** Default constructor.
- */
- TorMapWidgetInputHandler();
-
-signals:
- /** Emitted when the user clicks on a map feature located at <b>point</b>.
- * <b>button</b> indicates which mouse button was clicked.
- */
- void featureClicked(const QPoint &point, Qt::MouseButton button);
-
-protected:
- /** Filter and handles event <b>e</b> that was sent to widget <b>obj</b>.
- * <b>obj</b> is always a MarbleWidget object.
- */
- virtual bool eventFilter(QObject *obj, QEvent *e);
-
-private:
- /** Returns true if the map has one or more features located at the screen
- * position <b>point</b>.
- */
- bool pointHasFeatures(const QPoint &point) const;
-
- int _mousePressedX;
- int _mousePressedY;
- qreal _mousePressedLon;
- qreal _mousePressedLat;
-};
-
-#endif
-
diff --git a/src/vidalia/network/TorMapWidgetPopupMenu.cpp b/src/vidalia/network/TorMapWidgetPopupMenu.cpp
index 3e877e2..bd53dbc 100644
--- a/src/vidalia/network/TorMapWidgetPopupMenu.cpp
+++ b/src/vidalia/network/TorMapWidgetPopupMenu.cpp
@@ -18,6 +18,7 @@
#include <MarbleModel.h>
#include <MarblePlacemarkModel.h>
+#include <MarbleWidgetInputHandler.h>
#include <QChar>
#include <QVector>
@@ -31,41 +32,29 @@ TorMapWidgetPopupMenu::TorMapWidgetPopupMenu(TorMapWidget *widget)
_widget(widget)
{
_leftClickMenu = new QMenu(widget);
+
+ _widget->inputHandler()->setMouseButtonPopupEnabled(Qt::LeftButton, true);
+
connect(_leftClickMenu, SIGNAL(triggered(QAction*)),
this, SLOT(relaySelected(QAction*)));
}
void
-TorMapWidgetPopupMenu::featureClicked(const QPoint &pos, Qt::MouseButton btn)
+TorMapWidgetPopupMenu::featureLeftClicked(int x, int y)
{
- switch (btn) {
- case Qt::LeftButton:
- featureLeftClicked(pos);
- break;
-
- case Qt::RightButton:
- break;
-
- default:
- break;
- }
-}
+ QVector<const GeoDataPlacemark*> features = _widget->whichFeatureAt(QPoint(x,y));
+ QVector<const GeoDataPlacemark*>::const_iterator it = features.constBegin();
+ QVector<const GeoDataPlacemark*>::const_iterator const itEnd = features.constEnd();
-void
-TorMapWidgetPopupMenu::featureLeftClicked(const QPoint &pos)
-{
- QVector<QModelIndex>::const_iterator it;
- QVector<QModelIndex> features = _widget->model()->whichFeatureAt(pos);
QString name, id;
int numRelays = 0;
_leftClickMenu->clear();
- for (it = features.constBegin(); it != features.constEnd(); ++it) {
- QChar role = (*it).data(MarblePlacemarkModel::GeoTypeRole).toChar();
- if (role == '1') {
+ for (; it != itEnd; ++it) {
+ if ((*it)->role() == "1") {
/* Normal Tor Relay */
- name = (*it).data().toString();
- id = (*it).data(MarblePlacemarkModel::DescriptionRole).toString();
+ name = (*it)->name();
+ id = (*it)->description();
QAction *action = _leftClickMenu->addAction(name);
action->setData(id);
@@ -76,7 +65,7 @@ TorMapWidgetPopupMenu::featureLeftClicked(const QPoint &pos)
if (numRelays == 1)
emit displayRouterInfo(id);
else if (numRelays > 1)
- _leftClickMenu->popup(_widget->mapToGlobal(pos));
+ _leftClickMenu->popup(_widget->mapToGlobal(QPoint(x,y)));
}
void
diff --git a/src/vidalia/network/TorMapWidgetPopupMenu.h b/src/vidalia/network/TorMapWidgetPopupMenu.h
index 0954b3d..546b9ae 100644
--- a/src/vidalia/network/TorMapWidgetPopupMenu.h
+++ b/src/vidalia/network/TorMapWidgetPopupMenu.h
@@ -35,14 +35,14 @@ public:
TorMapWidgetPopupMenu(TorMapWidget *widget);
public slots:
- /** Called when the user clicks on one or more map features located at mouse
- * position <b>pos</b>. <b>button</b> specifies the mouse button clicked.
- * A popup menu will be displayed depending on which mouse button was
- * clicked.
+ /** Called when the user left-clicks on one or more placemarks at mouse
+ * position <b>pos</b>. If only one relay placemark exists at <b>pos</b>,
+ * then the displayRouterInfo() signal will be emitted. Otherwise, a
+ * popup menu will be displayed listing all placemarks at this location.
*
* \sa featureLeftClicked
*/
- void featureClicked(const QPoint &pos, Qt::MouseButton button);
+ void featureLeftClicked(int x, int y);
signals:
/** Emitted when the user selects the router placemark whose fingerprint
@@ -50,16 +50,6 @@ signals:
*/
void displayRouterInfo(const QString &id);
-protected:
- /** Called when the user left-clicks on one or more placemarks at mouse
- * position <b>pos</b>. If only one relay placemark exists at <b>pos</b>,
- * then the displayRouterInfo() signal will be emitted. Otherwise, a
- * popup menu will be displayed listing all placemarks at this location.
- *
- * \sa featureLeftClicked
- */
- virtual void featureLeftClicked(const QPoint &pos);
-
private slots:
/** Called when the user selects a relay from the popup menu used to
* disambiguate a location with multiple relay placemarks.
diff --git a/src/vidalia/network/ZImageView.cpp b/src/vidalia/network/ZImageView.cpp
index 2ce0005..dc72643 100644
--- a/src/vidalia/network/ZImageView.cpp
+++ b/src/vidalia/network/ZImageView.cpp
@@ -137,13 +137,13 @@ ZImageView::drawScaledImage()
if (extraWidth > 0) {
p.fillRect(0, 0, extraWidth, sRect.height(), background);
p.fillRect(sRect.width() - extraWidth, 0,
- sRect.width(), sRect.height(), background);
+ sRect.width(), sRect.height(), background);
}
if (extraHeight > 0) {
p.fillRect(0, 0, sRect.width(), extraHeight, background);
p.fillRect(0, sRect.height() - extraHeight,
- sRect.width(), sRect.height(), background);
+ sRect.width(), sRect.height(), background);
}
// Finally, paint the image copy.
diff --git a/src/vidalia/plugin/DebugDialog.cpp b/src/vidalia/plugin/DebugDialog.cpp
new file mode 100644
index 0000000..a6105c4
--- /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..3367e64
--- /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..93d50c0
--- /dev/null
+++ b/src/vidalia/plugin/PluginEngine.cpp
@@ -0,0 +1,240 @@
+/*
+** 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"
+#include "VidaliaExtensions.h"
+
+#include <unistd.h>
+
+PluginEngine::PluginEngine(QObject *parent)
+ : QScriptEngine(parent)
+{
+ VidaliaExtensions ve;
+ ve.initialize("vidalia", this);
+
+ ADD_PROTOTYPE(VidaliaTabPrototype)
+ MAKE_CREATABLE(VidaliaTabPrototype)
+ ADD_PROTOTYPE(HelperProcessPrototype)
+ MAKE_CREATABLE(HelperProcessPrototype)
+ ADD_PROTOTYPE(TorrcPrototype)
+
+ globalObject().setProperty("torControl", newQObject(Vidalia::torControl()));
+ globalObject().setProperty("torrc", newQObject(Vidalia::torrc()));
+ 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;
+ QDir path(settings.pluginPath());
+ if(path.isRelative()) {
+ path.setPath(QApplication::applicationDirPath() + "/" + settings.pluginPath());
+ }
+
+ globalObject().setProperty("pluginPath", QScriptValue(path.canonicalPath()));
+
+ DebugDialog::outputDebug("Available extensions:");
+ foreach(QString ext, availableExtensions())
+ DebugDialog::outputDebug(QString(" %1").arg(ext));
+}
+
+PluginEngine::~PluginEngine()
+{
+ foreach(PluginWrapper *wrapper, wrappers)
+ wrapper->stop();
+}
+
+void
+PluginEngine::loadAllPlugins()
+{
+ DebugDialog::outputDebug("Loading all plugins...");
+
+ VidaliaSettings settings;
+ QDir path(settings.pluginPath());
+ if(path.isRelative()) {
+ path.setPath(QApplication::applicationDirPath() + "/" + settings.pluginPath());
+ }
+
+ DebugDialog::outputDebug(QString("PluginPath=%1").arg(path.canonicalPath()));
+
+ 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::provide(const QString &name, QObject *obj)
+{
+ globalObject().setProperty(name, newQObject(obj));
+}
+
+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
+ (void)::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..b8b65aa
--- /dev/null
+++ b/src/vidalia/plugin/PluginEngine.h
@@ -0,0 +1,63 @@
+/*
+** 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 "TorrcPrototype.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();
+
+ void loadAllPlugins();
+ QList<QAction *> getAllActions();
+ void provide(const QString &name, QObject *obj);
+
+ 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 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..15634b5
--- /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..288c62f
--- /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/extensions/VidaliaExtensions.cpp b/src/vidalia/plugin/extensions/VidaliaExtensions.cpp
new file mode 100644
index 0000000..7bb85f6
--- /dev/null
+++ b/src/vidalia/plugin/extensions/VidaliaExtensions.cpp
@@ -0,0 +1,26 @@
+#include <QtScript/QScriptExtensionPlugin>
+#include <QtScript/QScriptValue>
+#include <QtScript/QScriptEngine>
+
+#include <QDebug>
+
+#include "VidaliaExtensions.h"
+
+void vidalia_initialize_bindings(QScriptValue &);
+
+QStringList VidaliaExtensions::keys() const
+{
+ return QStringList() << "vidalia";
+}
+
+void VidaliaExtensions::initialize(const QString &key, QScriptEngine *engine)
+{
+ if (key == QLatin1String("vidalia")) {
+ QScriptValue extensionObject = engine->globalObject();
+ vidalia_initialize_bindings(extensionObject);
+ } else {
+ Q_ASSERT_X(false, "vidalia::initialize", qPrintable(key));
+ }
+}
+
+Q_EXPORT_PLUGIN2(vidalia_extensions, VidaliaExtensions)
diff --git a/src/vidalia/plugin/extensions/VidaliaExtensions.h b/src/vidalia/plugin/extensions/VidaliaExtensions.h
new file mode 100644
index 0000000..b3e9ed3
--- /dev/null
+++ b/src/vidalia/plugin/extensions/VidaliaExtensions.h
@@ -0,0 +1,17 @@
+#ifndef VIDALIAEXTENSIONS_H
+#define VIDALIAEXTENSIONS_H
+
+#include <QtCore>
+#include <QtScript/QScriptExtensionPlugin>
+#include <QtScript/QScriptValue>
+#include <QtScript/QScriptEngine>
+
+class VidaliaExtensions : public QScriptExtensionPlugin
+{
+public:
+ void initialize(const QString &key, QScriptEngine *engine);
+ QStringList keys() const;
+};
+
+
+#endif // VIDALIAEXTENSIONS_H
diff --git a/src/vidalia/plugin/extensions/VidaliaExtensionsInit.cpp b/src/vidalia/plugin/extensions/VidaliaExtensionsInit.cpp
new file mode 100644
index 0000000..0dd4887
--- /dev/null
+++ b/src/vidalia/plugin/extensions/VidaliaExtensionsInit.cpp
@@ -0,0 +1,25 @@
+#include <QtScript/QScriptValue>
+#include <QtScript/QScriptEngine>
+
+const int classCount = 1;
+
+QScriptValue qtscript_create_TorControl_class(QScriptEngine *engine);
+
+static const char * const vidalia_class_names[] = {
+ "TorControl"
+};
+
+typedef QScriptValue (*QtBindingCreator)(QScriptEngine *engine);
+static const QtBindingCreator vidalia_class_functions[] = {
+ qtscript_create_TorControl_class
+};
+
+void vidalia_initialize_bindings(QScriptValue &extensionObject)
+{
+ QScriptEngine *engine = extensionObject.engine();
+ for (int i = 0; i < classCount; ++i) {
+ extensionObject.setProperty(vidalia_class_names[i],
+ vidalia_class_functions[i](engine),
+ QScriptValue::SkipInEnumeration);
+ }
+}
diff --git a/src/vidalia/plugin/extensions/qtscript_TorControl.cpp b/src/vidalia/plugin/extensions/qtscript_TorControl.cpp
new file mode 100644
index 0000000..67a3a7a
--- /dev/null
+++ b/src/vidalia/plugin/extensions/qtscript_TorControl.cpp
@@ -0,0 +1,704 @@
+#include <QtScript/QScriptEngine>
+#include <QtScript/QScriptContext>
+#include <QtScript/QScriptValue>
+#include <QtCore/QStringList>
+#include <QtCore/QDebug>
+#include <qmetaobject.h>
+
+#include <TorControl.h>
+#include <QVariant>
+#include <qbytearray.h>
+#include <qcoreevent.h>
+#include <qdatetime.h>
+#include <qhostaddress.h>
+#include <qlist.h>
+#include <qobject.h>
+#include <qstringlist.h>
+
+static const char * const qtscript_TorControl_function_names[] = {
+ "TorControl"
+ // static
+ // prototype
+ , "authenticate"
+ , "clearErrState"
+ , "closeTorStdout"
+ , "connect"
+ , "disconnect"
+ , "finished"
+ , "getConf"
+ , "getDescriptorAnnotations"
+ , "getHiddenServiceConf"
+ , "getInfo"
+ , "getRouterDescriptorText"
+ , "getSocksAddress"
+ , "getSocksAddressList"
+ , "getSocksPort"
+ , "getSocksPortList"
+ , "getTorVersion"
+ , "getTorVersionString"
+ , "ipToCountry"
+ , "isAuthenticated"
+ , "isCircuitEstablished"
+ , "isConnected"
+ , "isRunning"
+ , "isVidaliaRunningTor"
+ , "loadConf"
+ , "resetConf"
+ , "saveConf"
+ , "setEvents"
+ , "shouldContinue"
+ , "start"
+ , "stop"
+ , "takeOwnership"
+ , "useMicrodescriptors"
+ , "toString"
+};
+
+static const char * const qtscript_TorControl_function_signatures[] = {
+ ""
+ // static
+ // prototype
+ , "QByteArray cookie, String errmsg\nString password, String errmsg"
+ , ""
+ , ""
+ , "QHostAddress address, unsigned short port\nString path"
+ , ""
+ , "int exitCode, ExitStatus exitStatus"
+ , "HashMap map, String errmsg\nString key, List value, String errmsg\nString key, String errmsg\nList keys, String errmsg"
+ , "String id, String errmsg"
+ , "String key, String errmsg"
+ , "String key, String errmsg\nList keys, String errmsg"
+ , "String id, String errmsg"
+ , "String errmsg"
+ , "String errmsg"
+ , "String errmsg"
+ , "String errmsg"
+ , ""
+ , ""
+ , "QHostAddress ip, String errmsg"
+ , ""
+ , ""
+ , ""
+ , ""
+ , ""
+ , "String contents, String errmsg"
+ , "String key, String errmsg\nList keys, String errmsg"
+ , "String errmsg"
+ , "String errmsg"
+ , "String errmsg"
+ , "String tor, List args"
+ , "String errmsg"
+ , "String errmsg"
+ , "String errmsg"
+""
+};
+
+static const int qtscript_TorControl_function_lengths[] = {
+ 0
+ // static
+ // prototype
+ , 2
+ , 0
+ , 0
+ , 2
+ , 0
+ , 2
+ , 3
+ , 2
+ , 2
+ , 2
+ , 2
+ , 1
+ , 1
+ , 1
+ , 1
+ , 0
+ , 0
+ , 2
+ , 0
+ , 0
+ , 0
+ , 0
+ , 0
+ , 2
+ , 2
+ , 1
+ , 1
+ , 1
+ , 2
+ , 1
+ , 1
+ , 1
+ , 0
+};
+
+static QScriptValue qtscript_TorControl_throw_ambiguity_error_helper(
+ QScriptContext *context, const char *functionName, const char *signatures)
+{
+ QStringList lines = QString::fromLatin1(signatures).split(QLatin1Char('\n'));
+ QStringList fullSignatures;
+ for (int i = 0; i < lines.size(); ++i)
+ fullSignatures.append(QString::fromLatin1("%0(%1)").arg(functionName).arg(lines.at(i)));
+ return context->throwError(QString::fromLatin1("TorControl::%0(): could not find a function match; candidates are:\n%1")
+ .arg(functionName).arg(fullSignatures.join(QLatin1String("\n"))));
+}
+
+Q_DECLARE_METATYPE(TorControl*)
+Q_DECLARE_METATYPE(QString*)
+Q_DECLARE_METATYPE(QHostAddress)
+Q_DECLARE_METATYPE(int*)
+Q_DECLARE_METATYPE(QProcess::ExitStatus*)
+template <> \
+struct QMetaTypeId< QHash<QString,QStringList> > \
+{ \
+ enum { Defined = 1 }; \
+ static int qt_metatype_id() \
+ { \
+ static QBasicAtomicInt metatype_id = Q_BASIC_ATOMIC_INITIALIZER(0); \
+ if (!metatype_id) \
+ metatype_id = qRegisterMetaType< QHash<QString,QStringList> >("QHash<QString,QStringList>"); \
+ return metatype_id; \
+ } \
+};
+template <> \
+struct QMetaTypeId< QHash<QString,QString> > \
+{ \
+ enum { Defined = 1 }; \
+ static int qt_metatype_id() \
+ { \
+ static QBasicAtomicInt metatype_id = Q_BASIC_ATOMIC_INITIALIZER(0); \
+ if (!metatype_id) \
+ metatype_id = qRegisterMetaType< QHash<QString,QString> >("QHash<QString,QString>"); \
+ return metatype_id; \
+ } \
+};
+Q_DECLARE_METATYPE(QList<unsigned short>)
+
+//
+// TorControl
+//
+
+static QScriptValue qtscript_TorControl_prototype_call(QScriptContext *context, QScriptEngine *)
+{
+#if QT_VERSION > 0x040400
+ Q_ASSERT(context->callee().isFunction());
+ uint _id = context->callee().data().toUInt32();
+#else
+ uint _id;
+ if (context->callee().isFunction())
+ _id = context->callee().data().toUInt32();
+ else
+ _id = 0xBABE0000 + 32;
+#endif
+ Q_ASSERT((_id & 0xFFFF0000) == 0xBABE0000);
+ _id &= 0x0000FFFF;
+ TorControl* _q_self = qscriptvalue_cast<TorControl*>(context->thisObject());
+ if (!_q_self) {
+ return context->throwError(QScriptContext::TypeError,
+ QString::fromLatin1("TorControl.%0(): this object is not a TorControl")
+ .arg(qtscript_TorControl_function_names[_id+1]));
+ }
+
+ switch (_id) {
+ case 0:
+ if (context->argumentCount() == 0) {
+ bool _q_result = _q_self->authenticate();
+ return QScriptValue(context->engine(), _q_result);
+ }
+ if (context->argumentCount() == 1) {
+ if ((qMetaTypeId<QByteArray>() == context->argument(0).toVariant().userType())) {
+ QByteArray _q_arg0 = qscriptvalue_cast<QByteArray>(context->argument(0));
+ bool _q_result = _q_self->authenticate(_q_arg0);
+ return QScriptValue(context->engine(), _q_result);
+ } else if (context->argument(0).isString()) {
+ QString _q_arg0 = context->argument(0).toString();
+ bool _q_result = _q_self->authenticate(_q_arg0);
+ return QScriptValue(context->engine(), _q_result);
+ }
+ }
+ if (context->argumentCount() == 2) {
+ if ((qMetaTypeId<QByteArray>() == context->argument(0).toVariant().userType())
+ && qscriptvalue_cast<QString*>(context->argument(1))) {
+ QByteArray _q_arg0 = qscriptvalue_cast<QByteArray>(context->argument(0));
+ QString* _q_arg1 = qscriptvalue_cast<QString*>(context->argument(1));
+ bool _q_result = _q_self->authenticate(_q_arg0, false, _q_arg1);
+ return QScriptValue(context->engine(), _q_result);
+ } else if (context->argument(0).isString()
+ && qscriptvalue_cast<QString*>(context->argument(1))) {
+ QString _q_arg0 = context->argument(0).toString();
+ QString* _q_arg1 = qscriptvalue_cast<QString*>(context->argument(1));
+ bool _q_result = _q_self->authenticate(_q_arg0, _q_arg1);
+ return QScriptValue(context->engine(), _q_result);
+ }
+ }
+ break;
+
+ case 1:
+ if (context->argumentCount() == 0) {
+ _q_self->clearErrState();
+ return context->engine()->undefinedValue();
+ }
+ break;
+
+ case 2:
+ if (context->argumentCount() == 0) {
+ _q_self->closeTorStdout();
+ return context->engine()->undefinedValue();
+ }
+ break;
+
+ case 3:
+ if (context->argumentCount() == 1) {
+ QString _q_arg0 = context->argument(0).toString();
+ _q_self->connect(_q_arg0);
+ return context->engine()->undefinedValue();
+ }
+ if (context->argumentCount() == 2) {
+ QHostAddress _q_arg0 = qscriptvalue_cast<QHostAddress>(context->argument(0));
+ unsigned short _q_arg1 = qscriptvalue_cast<unsigned short>(context->argument(1));
+ _q_self->connect(_q_arg0, _q_arg1);
+ return context->engine()->undefinedValue();
+ }
+ break;
+
+ case 4:
+ if (context->argumentCount() == 0) {
+ _q_self->disconnect();
+ return context->engine()->undefinedValue();
+ }
+ break;
+
+ case 5:
+ if (context->argumentCount() == 2) {
+ int* _q_arg0 = qscriptvalue_cast<int*>(context->argument(0));
+ QProcess::ExitStatus* _q_arg1 = qscriptvalue_cast<QProcess::ExitStatus*>(context->argument(1));
+ bool _q_result = _q_self->finished(_q_arg0, _q_arg1);
+ return QScriptValue(context->engine(), _q_result);
+ }
+ break;
+
+ case 6:
+ if (context->argumentCount() == 1) {
+ if ((qMetaTypeId<QHash<QString,QStringList> >() == context->argument(0).toVariant().userType())) {
+ QHash<QString,QStringList> _q_arg0 = qscriptvalue_cast<QHash<QString,QStringList> >(context->argument(0));
+ bool _q_result = _q_self->getConf(_q_arg0);
+ return QScriptValue(context->engine(), _q_result);
+ } else if (context->argument(0).isString()) {
+ QString _q_arg0 = context->argument(0).toString();
+ QVariant _q_result = _q_self->getConf(_q_arg0);
+ return qScriptValueFromValue(context->engine(), _q_result);
+ } else if (context->argument(0).isArray()) {
+ QStringList _q_arg0;
+ qScriptValueToSequence(context->argument(0), _q_arg0);
+ QMap<QString,QVariant> _q_result = _q_self->getConf(_q_arg0);
+ return qScriptValueFromValue(context->engine(), _q_result);
+ }
+ }
+ if (context->argumentCount() == 2) {
+ if ((qMetaTypeId<QHash<QString,QStringList> >() == context->argument(0).toVariant().userType())
+ && qscriptvalue_cast<QString*>(context->argument(1))) {
+ QHash<QString,QStringList> _q_arg0 = qscriptvalue_cast<QHash<QString,QStringList> >(context->argument(0));
+ QString* _q_arg1 = qscriptvalue_cast<QString*>(context->argument(1));
+ bool _q_result = _q_self->getConf(_q_arg0, _q_arg1);
+ return QScriptValue(context->engine(), _q_result);
+ } else if (context->argument(0).isString()
+ && context->argument(1).isArray()) {
+ QString _q_arg0 = context->argument(0).toString();
+ QStringList _q_arg1;
+ qScriptValueToSequence(context->argument(1), _q_arg1);
+ bool _q_result = _q_self->getConf(_q_arg0, _q_arg1);
+ return QScriptValue(context->engine(), _q_result);
+ } else if (context->argument(0).isString()
+ && qscriptvalue_cast<QString*>(context->argument(1))) {
+ QString _q_arg0 = context->argument(0).toString();
+ QString* _q_arg1 = qscriptvalue_cast<QString*>(context->argument(1));
+ QVariant _q_result = _q_self->getConf(_q_arg0, _q_arg1);
+ return qScriptValueFromValue(context->engine(), _q_result);
+ } else if (context->argument(0).isArray()
+ && qscriptvalue_cast<QString*>(context->argument(1))) {
+ QStringList _q_arg0;
+ qScriptValueToSequence(context->argument(0), _q_arg0);
+ QString* _q_arg1 = qscriptvalue_cast<QString*>(context->argument(1));
+ QMap<QString,QVariant> _q_result = _q_self->getConf(_q_arg0, _q_arg1);
+ return qScriptValueFromValue(context->engine(), _q_result);
+ }
+ }
+ if (context->argumentCount() == 3) {
+ QString _q_arg0 = context->argument(0).toString();
+ QStringList _q_arg1;
+ qScriptValueToSequence(context->argument(1), _q_arg1);
+ QString* _q_arg2 = qscriptvalue_cast<QString*>(context->argument(2));
+ bool _q_result = _q_self->getConf(_q_arg0, _q_arg1, _q_arg2);
+ return QScriptValue(context->engine(), _q_result);
+ }
+ break;
+
+ case 7:
+ if (context->argumentCount() == 1) {
+ QString _q_arg0 = context->argument(0).toString();
+ QHash<QString,QString> _q_result = _q_self->getDescriptorAnnotations(_q_arg0);
+ return qScriptValueFromValue(context->engine(), _q_result);
+ }
+ if (context->argumentCount() == 2) {
+ QString _q_arg0 = context->argument(0).toString();
+ QString* _q_arg1 = qscriptvalue_cast<QString*>(context->argument(1));
+ QHash<QString,QString> _q_result = _q_self->getDescriptorAnnotations(_q_arg0, _q_arg1);
+ return qScriptValueFromValue(context->engine(), _q_result);
+ }
+ break;
+
+ case 8:
+ if (context->argumentCount() == 1) {
+ QString _q_arg0 = context->argument(0).toString();
+ QString _q_result = _q_self->getHiddenServiceConf(_q_arg0);
+ return QScriptValue(context->engine(), _q_result);
+ }
+ if (context->argumentCount() == 2) {
+ QString _q_arg0 = context->argument(0).toString();
+ QString* _q_arg1 = qscriptvalue_cast<QString*>(context->argument(1));
+ QString _q_result = _q_self->getHiddenServiceConf(_q_arg0, _q_arg1);
+ return QScriptValue(context->engine(), _q_result);
+ }
+ break;
+
+ case 9:
+ if (context->argumentCount() == 1) {
+ if (context->argument(0).isString()) {
+ QString _q_arg0 = context->argument(0).toString();
+ QVariant _q_result = _q_self->getInfo(_q_arg0);
+ return qScriptValueFromValue(context->engine(), _q_result);
+ } else if (context->argument(0).isArray()) {
+ QStringList _q_arg0;
+ qScriptValueToSequence(context->argument(0), _q_arg0);
+ QMap<QString,QVariant> _q_result = _q_self->getInfo(_q_arg0);
+ return qScriptValueFromValue(context->engine(), _q_result);
+ }
+ }
+ if (context->argumentCount() == 2) {
+ if (context->argument(0).isString()
+ && qscriptvalue_cast<QString*>(context->argument(1))) {
+ QString _q_arg0 = context->argument(0).toString();
+ QString* _q_arg1 = qscriptvalue_cast<QString*>(context->argument(1));
+ QVariant _q_result = _q_self->getInfo(_q_arg0, _q_arg1);
+ return qScriptValueFromValue(context->engine(), _q_result);
+ } else if (context->argument(0).isArray()
+ && qscriptvalue_cast<QString*>(context->argument(1))) {
+ QStringList _q_arg0;
+ qScriptValueToSequence(context->argument(0), _q_arg0);
+ QString* _q_arg1 = qscriptvalue_cast<QString*>(context->argument(1));
+ QMap<QString,QVariant> _q_result = _q_self->getInfo(_q_arg0, _q_arg1);
+ return qScriptValueFromValue(context->engine(), _q_result);
+ }
+ }
+ break;
+
+ case 10:
+ if (context->argumentCount() == 1) {
+ QString _q_arg0 = context->argument(0).toString();
+ QStringList _q_result = _q_self->getRouterDescriptorText(_q_arg0);
+ return qScriptValueFromSequence(context->engine(), _q_result);
+ }
+ if (context->argumentCount() == 2) {
+ QString _q_arg0 = context->argument(0).toString();
+ QString* _q_arg1 = qscriptvalue_cast<QString*>(context->argument(1));
+ QStringList _q_result = _q_self->getRouterDescriptorText(_q_arg0, _q_arg1);
+ return qScriptValueFromSequence(context->engine(), _q_result);
+ }
+ break;
+
+ case 11:
+ if (context->argumentCount() == 0) {
+ QHostAddress _q_result = _q_self->getSocksAddress();
+ return qScriptValueFromValue(context->engine(), _q_result);
+ }
+ if (context->argumentCount() == 1) {
+ QString* _q_arg0 = qscriptvalue_cast<QString*>(context->argument(0));
+ QHostAddress _q_result = _q_self->getSocksAddress(_q_arg0);
+ return qScriptValueFromValue(context->engine(), _q_result);
+ }
+ break;
+
+ case 12:
+ if (context->argumentCount() == 0) {
+ QStringList _q_result = _q_self->getSocksAddressList();
+ return qScriptValueFromSequence(context->engine(), _q_result);
+ }
+ if (context->argumentCount() == 1) {
+ QString* _q_arg0 = qscriptvalue_cast<QString*>(context->argument(0));
+ QStringList _q_result = _q_self->getSocksAddressList(_q_arg0);
+ return qScriptValueFromSequence(context->engine(), _q_result);
+ }
+ break;
+
+ case 13:
+ if (context->argumentCount() == 0) {
+ unsigned short _q_result = _q_self->getSocksPort();
+ return qScriptValueFromValue(context->engine(), _q_result);
+ }
+ if (context->argumentCount() == 1) {
+ QString* _q_arg0 = qscriptvalue_cast<QString*>(context->argument(0));
+ unsigned short _q_result = _q_self->getSocksPort(_q_arg0);
+ return qScriptValueFromValue(context->engine(), _q_result);
+ }
+ break;
+
+ case 14:
+ if (context->argumentCount() == 0) {
+ QList<unsigned short> _q_result = _q_self->getSocksPortList();
+ return qScriptValueFromSequence(context->engine(), _q_result);
+ }
+ if (context->argumentCount() == 1) {
+ QString* _q_arg0 = qscriptvalue_cast<QString*>(context->argument(0));
+ QList<unsigned short> _q_result = _q_self->getSocksPortList(_q_arg0);
+ return qScriptValueFromSequence(context->engine(), _q_result);
+ }
+ break;
+
+ case 15:
+ if (context->argumentCount() == 0) {
+ uint _q_result = _q_self->getTorVersion();
+ return QScriptValue(context->engine(), _q_result);
+ }
+ break;
+
+ case 16:
+ if (context->argumentCount() == 0) {
+ QString _q_result = _q_self->getTorVersionString();
+ return QScriptValue(context->engine(), _q_result);
+ }
+ break;
+
+ case 17:
+ if (context->argumentCount() == 1) {
+ QHostAddress _q_arg0 = qscriptvalue_cast<QHostAddress>(context->argument(0));
+ QString _q_result = _q_self->ipToCountry(_q_arg0);
+ return QScriptValue(context->engine(), _q_result);
+ }
+ if (context->argumentCount() == 2) {
+ QHostAddress _q_arg0 = qscriptvalue_cast<QHostAddress>(context->argument(0));
+ QString* _q_arg1 = qscriptvalue_cast<QString*>(context->argument(1));
+ QString _q_result = _q_self->ipToCountry(_q_arg0, _q_arg1);
+ return QScriptValue(context->engine(), _q_result);
+ }
+ break;
+
+ case 18:
+ if (context->argumentCount() == 0) {
+ bool _q_result = _q_self->isAuthenticated();
+ return QScriptValue(context->engine(), _q_result);
+ }
+ break;
+
+ case 19:
+ if (context->argumentCount() == 0) {
+ bool _q_result = _q_self->isCircuitEstablished();
+ return QScriptValue(context->engine(), _q_result);
+ }
+ break;
+
+ case 20:
+ if (context->argumentCount() == 0) {
+ bool _q_result = _q_self->isConnected();
+ return QScriptValue(context->engine(), _q_result);
+ }
+ break;
+
+ case 21:
+ if (context->argumentCount() == 0) {
+ bool _q_result = _q_self->isRunning();
+ return QScriptValue(context->engine(), _q_result);
+ }
+ break;
+
+ case 22:
+ if (context->argumentCount() == 0) {
+ bool _q_result = _q_self->isVidaliaRunningTor();
+ return QScriptValue(context->engine(), _q_result);
+ }
+ break;
+
+ case 23:
+ if (context->argumentCount() == 1) {
+ QString _q_arg0 = context->argument(0).toString();
+ bool _q_result = _q_self->loadConf(_q_arg0);
+ return QScriptValue(context->engine(), _q_result);
+ }
+ if (context->argumentCount() == 2) {
+ QString _q_arg0 = context->argument(0).toString();
+ QString* _q_arg1 = qscriptvalue_cast<QString*>(context->argument(1));
+ bool _q_result = _q_self->loadConf(_q_arg0, _q_arg1);
+ return QScriptValue(context->engine(), _q_result);
+ }
+ break;
+
+ case 24:
+ if (context->argumentCount() == 1) {
+ if (context->argument(0).isString()) {
+ QString _q_arg0 = context->argument(0).toString();
+ bool _q_result = _q_self->resetConf(_q_arg0);
+ return QScriptValue(context->engine(), _q_result);
+ } else if (context->argument(0).isArray()) {
+ QStringList _q_arg0;
+ qScriptValueToSequence(context->argument(0), _q_arg0);
+ bool _q_result = _q_self->resetConf(_q_arg0);
+ return QScriptValue(context->engine(), _q_result);
+ }
+ }
+ if (context->argumentCount() == 2) {
+ if (context->argument(0).isString()
+ && qscriptvalue_cast<QString*>(context->argument(1))) {
+ QString _q_arg0 = context->argument(0).toString();
+ QString* _q_arg1 = qscriptvalue_cast<QString*>(context->argument(1));
+ bool _q_result = _q_self->resetConf(_q_arg0, _q_arg1);
+ return QScriptValue(context->engine(), _q_result);
+ } else if (context->argument(0).isArray()
+ && qscriptvalue_cast<QString*>(context->argument(1))) {
+ QStringList _q_arg0;
+ qScriptValueToSequence(context->argument(0), _q_arg0);
+ QString* _q_arg1 = qscriptvalue_cast<QString*>(context->argument(1));
+ bool _q_result = _q_self->resetConf(_q_arg0, _q_arg1);
+ return QScriptValue(context->engine(), _q_result);
+ }
+ }
+ break;
+
+ case 25:
+ if (context->argumentCount() == 0) {
+ bool _q_result = _q_self->saveConf();
+ return QScriptValue(context->engine(), _q_result);
+ }
+ if (context->argumentCount() == 1) {
+ QString* _q_arg0 = qscriptvalue_cast<QString*>(context->argument(0));
+ bool _q_result = _q_self->saveConf(_q_arg0);
+ return QScriptValue(context->engine(), _q_result);
+ }
+ break;
+
+ case 26:
+ if (context->argumentCount() == 0) {
+ bool _q_result = _q_self->setEvents();
+ return QScriptValue(context->engine(), _q_result);
+ }
+ if (context->argumentCount() == 1) {
+ QString* _q_arg0 = qscriptvalue_cast<QString*>(context->argument(0));
+ bool _q_result = _q_self->setEvents(_q_arg0);
+ return QScriptValue(context->engine(), _q_result);
+ }
+ break;
+
+ case 27:
+ if (context->argumentCount() == 0) {
+ bool _q_result = _q_self->shouldContinue();
+ return QScriptValue(context->engine(), _q_result);
+ }
+ if (context->argumentCount() == 1) {
+ QString* _q_arg0 = qscriptvalue_cast<QString*>(context->argument(0));
+ bool _q_result = _q_self->shouldContinue(_q_arg0);
+ return QScriptValue(context->engine(), _q_result);
+ }
+ break;
+
+ case 28:
+ if (context->argumentCount() == 2) {
+ QString _q_arg0 = context->argument(0).toString();
+ QStringList _q_arg1;
+ qScriptValueToSequence(context->argument(1), _q_arg1);
+ _q_self->start(_q_arg0, _q_arg1);
+ return context->engine()->undefinedValue();
+ }
+ break;
+
+ case 29:
+ if (context->argumentCount() == 0) {
+ bool _q_result = _q_self->stop();
+ return QScriptValue(context->engine(), _q_result);
+ }
+ if (context->argumentCount() == 1) {
+ QString* _q_arg0 = qscriptvalue_cast<QString*>(context->argument(0));
+ bool _q_result = _q_self->stop(_q_arg0);
+ return QScriptValue(context->engine(), _q_result);
+ }
+ break;
+
+ case 30:
+ if (context->argumentCount() == 1) {
+ QString* _q_arg0 = qscriptvalue_cast<QString*>(context->argument(0));
+ bool _q_result = _q_self->takeOwnership(_q_arg0);
+ return QScriptValue(context->engine(), _q_result);
+ }
+ break;
+
+ case 31:
+ if (context->argumentCount() == 0) {
+ bool _q_result = _q_self->useMicrodescriptors();
+ return QScriptValue(context->engine(), _q_result);
+ }
+ if (context->argumentCount() == 1) {
+ QString* _q_arg0 = qscriptvalue_cast<QString*>(context->argument(0));
+ bool _q_result = _q_self->useMicrodescriptors(_q_arg0);
+ return QScriptValue(context->engine(), _q_result);
+ }
+ break;
+
+ case 32: {
+ QString result = QString::fromLatin1("TorControl");
+ return QScriptValue(context->engine(), result);
+ }
+
+ default:
+ Q_ASSERT(false);
+ }
+ return qtscript_TorControl_throw_ambiguity_error_helper(context,
+ qtscript_TorControl_function_names[_id+1],
+ qtscript_TorControl_function_signatures[_id+1]);
+}
+
+static QScriptValue qtscript_TorControl_static_call(QScriptContext *context, QScriptEngine *)
+{
+ uint _id = context->callee().data().toUInt32();
+ Q_ASSERT((_id & 0xFFFF0000) == 0xBABE0000);
+ _id &= 0x0000FFFF;
+ switch (_id) {
+ case 0:
+ return context->throwError(QScriptContext::TypeError,
+ QString::fromLatin1("TorControl cannot be constructed"));
+ break;
+
+ default:
+ Q_ASSERT(false);
+ }
+ return qtscript_TorControl_throw_ambiguity_error_helper(context,
+ qtscript_TorControl_function_names[_id],
+ qtscript_TorControl_function_signatures[_id]);
+}
+
+static QScriptValue qtscript_TorControl_toScriptValue(QScriptEngine *engine, TorControl* const &in)
+{
+ return engine->newQObject(in, QScriptEngine::QtOwnership, QScriptEngine::PreferExistingWrapperObject);
+}
+
+static void qtscript_TorControl_fromScriptValue(const QScriptValue &value, TorControl* &out)
+{
+ out = qobject_cast<TorControl*>(value.toQObject());
+}
+
+QScriptValue qtscript_create_TorControl_class(QScriptEngine *engine)
+{
+ engine->setDefaultPrototype(qMetaTypeId<TorControl*>(), QScriptValue());
+ QScriptValue proto = engine->newVariant(qVariantFromValue((TorControl*)0));
+ proto.setPrototype(engine->defaultPrototype(qMetaTypeId<QObject*>()));
+ for (int i = 0; i < 33; ++i) {
+ QScriptValue fun = engine->newFunction(qtscript_TorControl_prototype_call, qtscript_TorControl_function_lengths[i+1]);
+ fun.setData(QScriptValue(engine, uint(0xBABE0000 + i)));
+ proto.setProperty(QString::fromLatin1(qtscript_TorControl_function_names[i+1]),
+ fun, QScriptValue::SkipInEnumeration);
+ }
+
+ qScriptRegisterMetaType<TorControl*>(engine, qtscript_TorControl_toScriptValue,
+ qtscript_TorControl_fromScriptValue, proto);
+
+ QScriptValue ctor = engine->newFunction(qtscript_TorControl_static_call, proto, qtscript_TorControl_function_lengths[0]);
+ ctor.setData(QScriptValue(engine, uint(0xBABE0000 + 0)));
+
+ return ctor;
+}
diff --git a/src/vidalia/plugin/prototypes/HelperProcessPrototype.cpp b/src/vidalia/plugin/prototypes/HelperProcessPrototype.cpp
new file mode 100644
index 0000000..44f6c02
--- /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/TorrcPrototype.cpp b/src/vidalia/plugin/prototypes/TorrcPrototype.cpp
new file mode 100644
index 0000000..e2cbad1
--- /dev/null
+++ b/src/vidalia/plugin/prototypes/TorrcPrototype.cpp
@@ -0,0 +1,71 @@
+/*
+** 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 TorrcPrototype.cpp
+** \brief Prototype for Torrc class
+*/
+
+#include "TorrcPrototype.h"
+#include "prototypemacros.h"
+
+TorrcPrototype::TorrcPrototype()
+ : QObject(), QScriptable() {}
+
+int
+TorrcPrototype::metaTypeId()
+{
+ return qMetaTypeId<Torrc *>();
+}
+
+DEF_TYPE0(Torrc, void,
+ load(const QString &torrcPath, const QString &defaultsPath = ""),
+ load(torrcPath, defaultsPath))
+
+bool
+TorrcPrototype::apply(TorControl *tc, QString *errmsg){
+ Torrc *obj = qscriptvalue_cast<Torrc *>(thisObject());
+
+ if(obj)
+ return obj->apply(tc, errmsg);
+}
+
+DEF_TYPE0(Torrc, void,
+ clear(QStringList keys),
+ clear(keys))
+
+DEF_TYPE0(Torrc, void,
+ clearAll(),
+ clearAll())
+
+DEF_TYPE0(Torrc, QStringList,
+ value(const QString &key) const,
+ value(key))
+
+DEF_TYPE0(Torrc, void,
+ setValue(const QString &key, const QString &value, const QString &comment),
+ setValue(key, value, comment))
+
+DEF_TYPE0(Torrc, QString,
+ getTorrcPath() const,
+ getTorrcPath())
+
+DEF_TYPE0(Torrc, bool,
+ isValid(const QString &key, const QString &value),
+ isValid(key, value))
+
+
+bool
+TorrcPrototype::setRawContents(const QString &contents, QString *errmsg, TorControl *tc){
+ Torrc *obj = qscriptvalue_cast<Torrc *>(thisObject());
+
+ if(obj)
+ return obj->setRawContents(contents, errmsg, tc);
+}
diff --git a/src/vidalia/plugin/prototypes/TorrcPrototype.h b/src/vidalia/plugin/prototypes/TorrcPrototype.h
new file mode 100644
index 0000000..cf6f9fd
--- /dev/null
+++ b/src/vidalia/plugin/prototypes/TorrcPrototype.h
@@ -0,0 +1,63 @@
+/*
+** 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 TorrcPrototype.h
+** \brief Object for interacting with Torrc file
+*/
+
+#ifndef _TORRCPROTO_H
+#define _TORRCPROTO_H
+
+#include <QtGui>
+#include <QtScript>
+
+#include "Torrc.h"
+
+class TorrcPrototype : public QObject, QScriptable
+{
+ Q_OBJECT
+
+public:
+ TorrcPrototype();
+
+ static int metaTypeId();
+ static QString name();
+
+ /** Loads the torrc from the path provided and its defaults if provided */
+ Q_INVOKABLE void load(const QString &torrcPath, const QString &defaultsPath);
+ /** Applies the changes in configuration to the torrc file */
+ Q_INVOKABLE bool apply(TorControl *tc = 0, QString *errmsg = 0);
+
+ /** Clears the keys provided in the list */
+ Q_INVOKABLE void clear(QStringList keys);
+ /** Clears the _torrcMap and _lines values */
+ Q_INVOKABLE void clearAll();
+
+ /** Returns a list of values associated with the given key */
+ Q_INVOKABLE QStringList value(const QString &key) const;
+ /** Sets the value to the given key with a optional
+ * comment that will appear in the file */
+ Q_INVOKABLE void setValue(const QString &key, const QString &value, const QString &comment = "");
+
+ /** Returns the used torrc path */
+ Q_INVOKABLE QString getTorrcPath() const;
+
+ /** Returns true if the key=value is a valid config option */
+ Q_INVOKABLE bool isValid(const QString &key, const QString &value);
+
+ /** Resets the config values as if the torrc file contained the
+ * string in contents, and applies it. */
+ Q_INVOKABLE bool setRawContents(const QString &contents, QString *errmsg, TorControl *tc = 0);
+};
+
+Q_DECLARE_METATYPE(Torrc *);
+
+#endif
diff --git a/src/vidalia/plugin/prototypes/VidaliaTabPrototype.cpp b/src/vidalia/plugin/prototypes/VidaliaTabPrototype.cpp
new file mode 100644
index 0000000..6d902a3
--- /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..2a79a28
--- /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/plugin/prototypes/prototypemacros.h b/src/vidalia/plugin/prototypes/prototypemacros.h
new file mode 100644
index 0000000..907ea60
--- /dev/null
+++ b/src/vidalia/plugin/prototypes/prototypemacros.h
@@ -0,0 +1,49 @@
+#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; \
+}
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/16x16/detach-arrow.readme.txt b/src/vidalia/res/16x16/detach-arrow.readme.txt
new file mode 100644
index 0000000..88aa3d2
--- /dev/null
+++ b/src/vidalia/res/16x16/detach-arrow.readme.txt
@@ -0,0 +1,6 @@
+WooFunction Web Icon Set
+
+This icon set is released on the GNU General Public License.
+
+http://wefunction.com/
+http://www.woothemes.com140
\ No newline at end of file
diff --git a/src/vidalia/res/country-coordinates.csv b/src/vidalia/res/country-coordinates.csv
index f6415b1..fe806e7 100644
--- a/src/vidalia/res/country-coordinates.csv
+++ b/src/vidalia/res/country-coordinates.csv
@@ -1,249 +1,246 @@
-ad,42.50,1.50
-ae,24.00,54.00
-af,33.00,65.00
-ag,17.05,-61.80
-ai,18.22,-63.05
-al,41.00,20.00
-am,40.00,45.00
-an,12.17,-69.00
-ao,-12.50,18.50
-aq,-77.85,166.67
-ar,-34.00,-64.00
-as,-14.32,-170.50
-at,47.33,13.33
-au,-25.00,135.00
-aw,12.50,-69.97
-ax,60.12,19.90
-az,40.50,47.50
-ba,44.25,17.83
-bb,13.17,-59.53
-bd,24.00,90.00
-be,50.83,4.00
-bf,13.00,-2.00
-bg,43.00,25.00
-bh,26.00,50.50
-bi,-3.50,30.00
-bj,9.50,2.25
-bm,32.33,-64.75
-bn,4.50,114.67
-bo,-17.00,-65.00
-br,-10.00,-55.00
-bs,24.00,-76.00
-bt,27.50,90.50
-bv,-54.43,3.40
-bw,-22.00,24.00
-by,53.00,28.00
-bz,17.25,-88.75
-ca,60.00,-96.00
-cc,-12.17,96.83
-cd,-3.52,23.42
-cf,7.00,21.00
-cg,-1.00,15.00
-ch,47.00,8.00
-ci,8.00,-5.00
-ck,-20.00,-158.00
-cl,-30.00,-71.00
-cm,6.00,12.00
-cn,35.00,105.00
-co,4.00,-72.00
-cr,10.00,-84.00
-cs,44.8,20.5
-cu,21.50,-80.00
-cv,16.00,-24.00
-cx,-10.50,105.67
-cy,35.00,33.00
-cz,49.75,15.00
-de,51.50,10.50
-dj,11.50,42.50
-dk,56.00,10.00
-dm,15.50,-61.33
-do,19.00,-70.67
-dz,28.00,3.00
-ec,-2.00,-77.50
-ee,59.00,26.00
-eg,27.00,30.00
-eh,23.00,-14.00
-er,15.00,39.00
-es,40.00,-4.00
-et,8.00,39.00
-fi,64.00,26.00
-fj,-18.00,178.00
-fk,-51.75,-59.00
-fm,5.00,152.00
-fo,62.00,-7.00
-fr,46.00,2.00
-fx,48.87,2.33
-ga,-1.00,11.75
-gb,54.00,-4.50
-gd,12.12,-61.67
-ge,42.00,43.50
-gf,4.00,-53.00
-gg,49.45,-2.55
-gh,8.00,-2.00
-gi,36.13,-5.35
-gl,72.00,-40.00
-gm,13.50,-15.50
-gn,11.00,-10.00
-gp,16.25,-61.58
-gq,2.00,10.00
-gr,39.00,22.00
-gs,-54.50,-37.00
-gt,15.50,-90.25
-gu,13.47,144.83
-gw,12.00,-15.00
-gy,5.00,-59.00
-hk,22.25,114.17
-hm,-53.10,73.52
-hn,15.00,-86.50
-hr,45.17,15.50
-ht,19.00,-72.42
-hu,47.00,20.00
-id,-5.00,120.00
-ie,53.00,-8.00
-il,31.50,34.75
-im,54.23,-4.55
-in,20.00,77.00
-io,-6.00,71.50
-iq,33.00,44.00
-ir,32.00,53.00
-is,65.00,-18.00
-it,42.83,12.83
-je,49.19,-2.11
-jm,18.25,-77.50
-jo,31.00,36.00
-jp,36.00,138.00
-ke,1.00,38.00
-kg,41.00,75.00
-kh,13.00,105.00
-ki,-5.00,-170.00
-km,-12.17,44.25
-kn,17.33,-62.75
-kp,40.00,127.00
-kr,37.00,127.50
-kw,29.50,47.75
-ky,19.50,-80.67
-kz,48.00,68.00
-la,18.00,105.00
-lb,33.83,35.83
-lc,13.88,-60.97
-li,47.17,9.53
-lk,7.00,81.00
-lr,6.50,-9.50
-ls,-29.50,28.25
-lt,56.00,24.00
-lu,49.75,6.17
-lv,57.00,25.00
-ly,25.00,17.00
-ma,32.00,-5.00
-mc,43.73,7.42
-md,47.00,29.00
-me,42.80,19.20
-mg,-20.00,47.00
-mh,11.00,168.00
-mk,41.83,22.00
-ml,17.00,-4.00
-mm,22.00,98.00
-mn,46.00,105.00
-mo,22.00,113.00
-mp,15.12,145.67
-mq,14.67,-61.00
-mr,20.00,-12.00
-ms,16.75,-62.20
-mt,35.92,14.42
-mu,-20.30,57.58
-mv,3.20,73.00
-mw,-13.50,34.00
-mx,23.00,-102.00
-my,2.50,112.50
-mz,-18.25,35.00
-na,-22.00,17.00
-nc,-21.50,165.50
-ne,16.00,8.00
-nf,-29.08,167.92
-ng,10.00,8.00
-ni,13.00,-85.00
-nl,52.50,5.75
-no,62.00,10.00
-np,28.00,84.00
-nr,-0.53,166.92
-nu,-19.03,-169.87
-nz,-42.00,174.00
-om,21.00,57.00
-pa,9.00,-80.00
-pe,-10.00,-76.00
-pf,-15.00,-140.00
-pg,-6.00,147.00
-ph,13.00,122.00
-pk,30.00,70.00
-pl,52.00,20.00
-pm,46.83,-56.33
-pn,-25.07,-130.08
-pr,18.23,-66.55
-ps,32.0000,35.2500
-pt,39.50,-8.00
-pw,6.00,134.00
-py,-23.00,-58.00
-qa,25.50,51.25
-re,-21.10,55.60
-ro,46.00,25.00
-rs,43.80,21.00
-ru,60.00,47.00
-rw,-2.00,30.00
-sa,25.00,45.00
-sb,-8.00,159.00
-sc,-4.58,55.67
-sd,15.00,30.00
-se,62.00,15.00
-sg,1.37,103.80
-sh,-15.95,-5.70
-si,46.25,15.17
-sj,78.00,20.00
-sk,48.67,19.50
-sl,8.50,-11.50
-sm,43.93,12.42
-sn,14.00,-14.00
-so,6.00,48.00
-sr,4.00,-56.00
-st,1.00,7.00
-su,60.00,47.00
-sv,13.83,-88.92
-sy,35.00,38.00
-sz,-26.50,31.50
-tc,21.73,-71.58
-td,15.00,19.00
-tf,-43.00,67.00
-tg,8.00,1.17
-th,15.00,100.00
-tj,39.00,71.00
-tk,-9.00,-171.75
-tm,40.00,60.00
-tn,34.00,9.00
-to,-20.00,-175.00
-tp,-9.00,125.00
-tr,39.00,35.00
-tt,11.00,-61.00
-tv,-8.00,178.00
-tw,23.50,121.00
-tz,-6.00,35.00
-ua,49.00,32.00
-ug,2.00,33.00
-um,10.00,-175.00
-us,38.00,-98.00
-uy,-33.00,-56.00
-uz,41.00,64.00
-va,41.90,12.45
-vc,13.08,-61.20
-ve,8.00,-66.00
-vg,18.50,-64.50
-vi,18.50,-64.43
-vn,16.00,106.00
-vu,-16.00,167.00
-wf,-14.00,-177.00
-ws,-13.58,-172.33
-ye,15.50,47.50
-yt,-12.83,45.17
-yu,44.00,21.00
-za,-30.00,26.00
-zm,-15.00,30.00
-zr,-1.00,22.00
-zw,-19.00,29.00
+ad,42.50,1.50
+ae,24.00,54.00
+af,33.00,65.00
+ag,17.05,-61.80
+ai,18.22,-63.05
+al,41.00,20.00
+am,40.00,45.00
+an,12.17,-69.00
+ao,-12.50,18.50
+aq,-77.85,166.67
+ar,-34.00,-64.00
+as,-14.32,-170.50
+at,47.33,13.33
+au,-25.00,135.00
+aw,12.50,-69.97
+ax,60.12,19.90
+az,40.50,47.50
+ba,44.25,17.83
+bb,13.17,-59.53
+bd,24.00,90.00
+be,50.83,4.00
+bf,13.00,-2.00
+bg,43.00,25.00
+bh,26.00,50.50
+bi,-3.50,30.00
+bj,9.50,2.25
+bl,17.896,-62.828
+bm,32.33,-64.75
+bn,4.50,114.67
+bo,-17.00,-65.00
+br,-10.00,-55.00
+bs,24.00,-76.00
+bt,27.50,90.50
+bv,-54.43,3.40
+bw,-22.00,24.00
+by,53.00,28.00
+bz,17.25,-88.75
+ca,60.00,-96.00
+cc,-12.17,96.83
+cd,-3.52,23.42
+cf,7.00,21.00
+cg,-1.00,15.00
+ch,47.00,8.00
+ci,8.00,-5.00
+ck,-20.00,-158.00
+cl,-30.00,-71.00
+cm,6.00,12.00
+cn,35.00,105.00
+co,4.00,-72.00
+cr,10.00,-84.00
+cu,21.50,-80.00
+cv,16.00,-24.00
+cx,-10.50,105.67
+cy,35.00,33.00
+cz,49.75,15.00
+de,51.50,10.50
+dj,11.50,42.50
+dk,56.00,10.00
+dm,15.50,-61.33
+do,19.00,-70.67
+dz,28.00,3.00
+ec,-2.00,-77.50
+ee,59.00,26.00
+eg,27.00,30.00
+eh,23.00,-14.00
+er,15.00,39.00
+es,40.00,-4.00
+et,8.00,39.00
+fi,64.00,26.00
+fj,-18.00,178.00
+fk,-51.75,-59.00
+fm,5.00,152.00
+fo,62.00,-7.00
+fr,46.00,2.00
+ga,-1.00,11.75
+gb,54.00,-4.50
+gd,12.12,-61.67
+ge,42.00,43.50
+gf,4.00,-53.00
+gg,49.45,-2.55
+gh,8.00,-2.00
+gi,36.13,-5.35
+gl,72.00,-40.00
+gm,13.50,-15.50
+gn,11.00,-10.00
+gp,16.25,-61.58
+gq,2.00,10.00
+gr,39.00,22.00
+gs,-54.50,-37.00
+gt,15.50,-90.25
+gu,13.47,144.83
+gw,12.00,-15.00
+gy,5.00,-59.00
+hk,22.25,114.17
+hm,-53.10,73.52
+hn,15.00,-86.50
+hr,45.17,15.50
+ht,19.00,-72.42
+hu,47.00,20.00
+id,-5.00,120.00
+ie,53.00,-8.00
+il,31.50,34.75
+im,54.23,-4.55
+in,20.00,77.00
+io,-6.00,71.50
+iq,33.00,44.00
+ir,32.00,53.00
+is,65.00,-18.00
+it,42.83,12.83
+je,49.19,-2.11
+jm,18.25,-77.50
+jo,31.00,36.00
+jp,36.00,138.00
+ke,1.00,38.00
+kg,41.00,75.00
+kh,13.00,105.00
+ki,-5.00,-170.00
+km,-12.17,44.25
+kn,17.33,-62.75
+kp,40.00,127.00
+kr,37.00,127.50
+kw,29.50,47.75
+ky,19.50,-80.67
+kz,48.00,68.00
+la,18.00,105.00
+lb,33.83,35.83
+lc,13.88,-60.97
+li,47.17,9.53
+lk,7.00,81.00
+lr,6.50,-9.50
+ls,-29.50,28.25
+lt,56.00,24.00
+lu,49.75,6.17
+lv,57.00,25.00
+ly,25.00,17.00
+ma,32.00,-5.00
+mc,43.73,7.42
+md,47.00,29.00
+me,42.80,19.20
+mf,18.08,-63.05
+mg,-20.00,47.00
+mh,11.00,168.00
+mk,41.83,22.00
+ml,17.00,-4.00
+mm,22.00,98.00
+mn,46.00,105.00
+mo,22.00,113.00
+mp,15.12,145.67
+mq,14.67,-61.00
+mr,20.00,-12.00
+ms,16.75,-62.20
+mt,35.92,14.42
+mu,-20.30,57.58
+mv,3.20,73.00
+mw,-13.50,34.00
+mx,23.00,-102.00
+my,2.50,112.50
+mz,-18.25,35.00
+na,-22.00,17.00
+nc,-21.50,165.50
+ne,16.00,8.00
+nf,-29.08,167.92
+ng,10.00,8.00
+ni,13.00,-85.00
+nl,52.50,5.75
+no,62.00,10.00
+np,28.00,84.00
+nr,-0.53,166.92
+nu,-19.03,-169.87
+nz,-42.00,174.00
+om,21.00,57.00
+pa,9.00,-80.00
+pe,-10.00,-76.00
+pf,-15.00,-140.00
+pg,-6.00,147.00
+ph,13.00,122.00
+pk,30.00,70.00
+pl,52.00,20.00
+pm,46.83,-56.33
+pn,-25.07,-130.08
+pr,18.23,-66.55
+ps,32.0000,35.2500
+pt,39.50,-8.00
+pw,6.00,134.00
+py,-23.00,-58.00
+qa,25.50,51.25
+re,-21.10,55.60
+ro,46.00,25.00
+rs,43.80,21.00
+ru,60.00,47.00
+rw,-2.00,30.00
+sa,25.00,45.00
+sb,-8.00,159.00
+sc,-4.58,55.67
+sd,15.00,30.00
+se,62.00,15.00
+sg,1.37,103.80
+sh,-15.95,-5.70
+si,46.25,15.17
+sj,78.00,20.00
+sk,48.67,19.50
+sl,8.50,-11.50
+sm,43.93,12.42
+sn,14.00,-14.00
+so,6.00,48.00
+sr,4.00,-56.00
+st,1.00,7.00
+sv,13.83,-88.92
+sy,35.00,38.00
+sz,-26.50,31.50
+tc,21.73,-71.58
+td,15.00,19.00
+tf,-43.00,67.00
+tg,8.00,1.17
+th,15.00,100.00
+tj,39.00,71.00
+tk,-9.00,-171.75
+tl,-8.93,125.79
+tm,40.00,60.00
+tn,34.00,9.00
+to,-20.00,-175.00
+tr,39.00,35.00
+tt,11.00,-61.00
+tv,-8.00,178.00
+tw,23.50,121.00
+tz,-6.00,35.00
+ua,49.00,32.00
+ug,2.00,33.00
+um,10.00,-175.00
+us,38.00,-98.00
+uy,-33.00,-56.00
+uz,41.00,64.00
+va,41.90,12.45
+vc,13.08,-61.20
+ve,8.00,-66.00
+vg,18.50,-64.50
+vi,18.50,-64.43
+vn,16.00,106.00
+vu,-16.00,167.00
+wf,-14.00,-177.00
+ws,-13.58,-172.33
+ye,15.50,47.50
+yt,-12.83,45.17
+za,-30.00,26.00
+zm,-15.00,30.00
+zw,-19.00,29.00
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/flags/ad.png b/src/vidalia/res/flags/ad.png
new file mode 100644
index 0000000..1c5a5ae
Binary files /dev/null and b/src/vidalia/res/flags/ad.png differ
diff --git a/src/vidalia/res/flags/ae.png b/src/vidalia/res/flags/ae.png
index 407a5bb..ee61b7b 100644
Binary files a/src/vidalia/res/flags/ae.png and b/src/vidalia/res/flags/ae.png differ
diff --git a/src/vidalia/res/flags/af.png b/src/vidalia/res/flags/af.png
index ba01b2b..b68c442 100644
Binary files a/src/vidalia/res/flags/af.png and b/src/vidalia/res/flags/af.png differ
diff --git a/src/vidalia/res/flags/ag.png b/src/vidalia/res/flags/ag.png
new file mode 100644
index 0000000..c6e442f
Binary files /dev/null and b/src/vidalia/res/flags/ag.png differ
diff --git a/src/vidalia/res/flags/ai.png b/src/vidalia/res/flags/ai.png
new file mode 100644
index 0000000..c604f75
Binary files /dev/null and b/src/vidalia/res/flags/ai.png differ
diff --git a/src/vidalia/res/flags/al.png b/src/vidalia/res/flags/al.png
index 06e9cac..5a610f9 100644
Binary files a/src/vidalia/res/flags/al.png and b/src/vidalia/res/flags/al.png differ
diff --git a/src/vidalia/res/flags/am.png b/src/vidalia/res/flags/am.png
index d26210c..548097a 100644
Binary files a/src/vidalia/res/flags/am.png and b/src/vidalia/res/flags/am.png differ
diff --git a/src/vidalia/res/flags/an.png b/src/vidalia/res/flags/an.png
index e05e6f8..91661db 100644
Binary files a/src/vidalia/res/flags/an.png and b/src/vidalia/res/flags/an.png differ
diff --git a/src/vidalia/res/flags/ao.png b/src/vidalia/res/flags/ao.png
index 5652c15..825236d 100644
Binary files a/src/vidalia/res/flags/ao.png and b/src/vidalia/res/flags/ao.png differ
diff --git a/src/vidalia/res/flags/aq.png b/src/vidalia/res/flags/aq.png
new file mode 100644
index 0000000..3e38f98
Binary files /dev/null and b/src/vidalia/res/flags/aq.png differ
diff --git a/src/vidalia/res/flags/ar.png b/src/vidalia/res/flags/ar.png
index 95bfc28..ceb15a9 100644
Binary files a/src/vidalia/res/flags/ar.png and b/src/vidalia/res/flags/ar.png differ
diff --git a/src/vidalia/res/flags/as.png b/src/vidalia/res/flags/as.png
new file mode 100644
index 0000000..e22d480
Binary files /dev/null and b/src/vidalia/res/flags/as.png differ
diff --git a/src/vidalia/res/flags/at.png b/src/vidalia/res/flags/at.png
index 73c287e..3e6f853 100644
Binary files a/src/vidalia/res/flags/at.png and b/src/vidalia/res/flags/at.png differ
diff --git a/src/vidalia/res/flags/au.png b/src/vidalia/res/flags/au.png
index 11ae4ce..8a32372 100644
Binary files a/src/vidalia/res/flags/au.png and b/src/vidalia/res/flags/au.png differ
diff --git a/src/vidalia/res/flags/aw.png b/src/vidalia/res/flags/aw.png
index 5a3fbdd..4de8177 100644
Binary files a/src/vidalia/res/flags/aw.png and b/src/vidalia/res/flags/aw.png differ
diff --git a/src/vidalia/res/flags/ax.png b/src/vidalia/res/flags/ax.png
new file mode 100644
index 0000000..d2bd166
Binary files /dev/null and b/src/vidalia/res/flags/ax.png differ
diff --git a/src/vidalia/res/flags/az.png b/src/vidalia/res/flags/az.png
index e6482a6..584369a 100644
Binary files a/src/vidalia/res/flags/az.png and b/src/vidalia/res/flags/az.png differ
diff --git a/src/vidalia/res/flags/ba.png b/src/vidalia/res/flags/ba.png
index 765d125..d7c5e3c 100644
Binary files a/src/vidalia/res/flags/ba.png and b/src/vidalia/res/flags/ba.png differ
diff --git a/src/vidalia/res/flags/bb.png b/src/vidalia/res/flags/bb.png
index 31ec713..fc67712 100644
Binary files a/src/vidalia/res/flags/bb.png and b/src/vidalia/res/flags/bb.png differ
diff --git a/src/vidalia/res/flags/bd.png b/src/vidalia/res/flags/bd.png
index 3063438..620ec1e 100644
Binary files a/src/vidalia/res/flags/bd.png and b/src/vidalia/res/flags/bd.png differ
diff --git a/src/vidalia/res/flags/be.png b/src/vidalia/res/flags/be.png
index 6b6fe60..c1044f3 100644
Binary files a/src/vidalia/res/flags/be.png and b/src/vidalia/res/flags/be.png differ
diff --git a/src/vidalia/res/flags/bf.png b/src/vidalia/res/flags/bf.png
index 94802b8..a0bebc0 100644
Binary files a/src/vidalia/res/flags/bf.png and b/src/vidalia/res/flags/bf.png differ
diff --git a/src/vidalia/res/flags/bg.png b/src/vidalia/res/flags/bg.png
index 6572ba7..928f658 100644
Binary files a/src/vidalia/res/flags/bg.png and b/src/vidalia/res/flags/bg.png differ
diff --git a/src/vidalia/res/flags/bh.png b/src/vidalia/res/flags/bh.png
index 3461737..04421ce 100644
Binary files a/src/vidalia/res/flags/bh.png and b/src/vidalia/res/flags/bh.png differ
diff --git a/src/vidalia/res/flags/bi.png b/src/vidalia/res/flags/bi.png
index fc21beb..ee3b383 100644
Binary files a/src/vidalia/res/flags/bi.png and b/src/vidalia/res/flags/bi.png differ
diff --git a/src/vidalia/res/flags/bj.png b/src/vidalia/res/flags/bj.png
index ee88cdf..140276d 100644
Binary files a/src/vidalia/res/flags/bj.png and b/src/vidalia/res/flags/bj.png differ
diff --git a/src/vidalia/res/flags/bl.png b/src/vidalia/res/flags/bl.png
new file mode 100644
index 0000000..cd1743a
Binary files /dev/null and b/src/vidalia/res/flags/bl.png differ
diff --git a/src/vidalia/res/flags/bm.png b/src/vidalia/res/flags/bm.png
index 10defba..b4e2eef 100644
Binary files a/src/vidalia/res/flags/bm.png and b/src/vidalia/res/flags/bm.png differ
diff --git a/src/vidalia/res/flags/bn.png b/src/vidalia/res/flags/bn.png
index 3edc2f8..9a080e7 100644
Binary files a/src/vidalia/res/flags/bn.png and b/src/vidalia/res/flags/bn.png differ
diff --git a/src/vidalia/res/flags/bo.png b/src/vidalia/res/flags/bo.png
index bbfee3e..e007900 100644
Binary files a/src/vidalia/res/flags/bo.png and b/src/vidalia/res/flags/bo.png differ
diff --git a/src/vidalia/res/flags/br.png b/src/vidalia/res/flags/br.png
index 1b4a7ec..f2a04ca 100644
Binary files a/src/vidalia/res/flags/br.png and b/src/vidalia/res/flags/br.png differ
diff --git a/src/vidalia/res/flags/bs.png b/src/vidalia/res/flags/bs.png
index 32daa6d..9296b35 100644
Binary files a/src/vidalia/res/flags/bs.png and b/src/vidalia/res/flags/bs.png differ
diff --git a/src/vidalia/res/flags/bt.png b/src/vidalia/res/flags/bt.png
index 6d08ec1..0daede3 100644
Binary files a/src/vidalia/res/flags/bt.png and b/src/vidalia/res/flags/bt.png differ
diff --git a/src/vidalia/res/flags/bv.png b/src/vidalia/res/flags/bv.png
new file mode 100644
index 0000000..b7b6fd5
Binary files /dev/null and b/src/vidalia/res/flags/bv.png differ
diff --git a/src/vidalia/res/flags/bw.png b/src/vidalia/res/flags/bw.png
index b667c69..6bee7d6 100644
Binary files a/src/vidalia/res/flags/bw.png and b/src/vidalia/res/flags/bw.png differ
diff --git a/src/vidalia/res/flags/by.png b/src/vidalia/res/flags/by.png
index 4b3935d..aed37f1 100644
Binary files a/src/vidalia/res/flags/by.png and b/src/vidalia/res/flags/by.png differ
diff --git a/src/vidalia/res/flags/bz.png b/src/vidalia/res/flags/bz.png
index adf568f..6a6bbe0 100644
Binary files a/src/vidalia/res/flags/bz.png and b/src/vidalia/res/flags/bz.png differ
diff --git a/src/vidalia/res/flags/ca.png b/src/vidalia/res/flags/ca.png
index d5013db..362af4e 100644
Binary files a/src/vidalia/res/flags/ca.png and b/src/vidalia/res/flags/ca.png differ
diff --git a/src/vidalia/res/flags/cc.png b/src/vidalia/res/flags/cc.png
new file mode 100644
index 0000000..21aeee6
Binary files /dev/null and b/src/vidalia/res/flags/cc.png differ
diff --git a/src/vidalia/res/flags/cd.png b/src/vidalia/res/flags/cd.png
new file mode 100644
index 0000000..3699bcd
Binary files /dev/null and b/src/vidalia/res/flags/cd.png differ
diff --git a/src/vidalia/res/flags/cf.png b/src/vidalia/res/flags/cf.png
index 72e22a5..39f41f9 100644
Binary files a/src/vidalia/res/flags/cf.png and b/src/vidalia/res/flags/cf.png differ
diff --git a/src/vidalia/res/flags/cg.png b/src/vidalia/res/flags/cg.png
index fc32f71..1102672 100644
Binary files a/src/vidalia/res/flags/cg.png and b/src/vidalia/res/flags/cg.png differ
diff --git a/src/vidalia/res/flags/ch.png b/src/vidalia/res/flags/ch.png
index dc2323a..024ae45 100644
Binary files a/src/vidalia/res/flags/ch.png and b/src/vidalia/res/flags/ch.png differ
diff --git a/src/vidalia/res/flags/ci.png b/src/vidalia/res/flags/ci.png
index 710f35d..a005b50 100644
Binary files a/src/vidalia/res/flags/ci.png and b/src/vidalia/res/flags/ci.png differ
diff --git a/src/vidalia/res/flags/ck.png b/src/vidalia/res/flags/ck.png
index d43361c..d86c29f 100644
Binary files a/src/vidalia/res/flags/ck.png and b/src/vidalia/res/flags/ck.png differ
diff --git a/src/vidalia/res/flags/cl.png b/src/vidalia/res/flags/cl.png
index ea7b21b..740d122 100644
Binary files a/src/vidalia/res/flags/cl.png and b/src/vidalia/res/flags/cl.png differ
diff --git a/src/vidalia/res/flags/cm.png b/src/vidalia/res/flags/cm.png
index 318750f..8f6de19 100644
Binary files a/src/vidalia/res/flags/cm.png and b/src/vidalia/res/flags/cm.png differ
diff --git a/src/vidalia/res/flags/cn.png b/src/vidalia/res/flags/cn.png
index 2d1c880..bd88e1c 100644
Binary files a/src/vidalia/res/flags/cn.png and b/src/vidalia/res/flags/cn.png differ
diff --git a/src/vidalia/res/flags/co.png b/src/vidalia/res/flags/co.png
index 06ecdf3..9f34500 100644
Binary files a/src/vidalia/res/flags/co.png and b/src/vidalia/res/flags/co.png differ
diff --git a/src/vidalia/res/flags/cr.png b/src/vidalia/res/flags/cr.png
index 544333c..086b545 100644
Binary files a/src/vidalia/res/flags/cr.png and b/src/vidalia/res/flags/cr.png differ
diff --git a/src/vidalia/res/flags/cu.png b/src/vidalia/res/flags/cu.png
index c94f37f..2a947a3 100644
Binary files a/src/vidalia/res/flags/cu.png and b/src/vidalia/res/flags/cu.png differ
diff --git a/src/vidalia/res/flags/cv.png b/src/vidalia/res/flags/cv.png
index 08dd4d1..7cb10ed 100644
Binary files a/src/vidalia/res/flags/cv.png and b/src/vidalia/res/flags/cv.png differ
diff --git a/src/vidalia/res/flags/cx.png b/src/vidalia/res/flags/cx.png
new file mode 100644
index 0000000..842e872
Binary files /dev/null and b/src/vidalia/res/flags/cx.png differ
diff --git a/src/vidalia/res/flags/cy.png b/src/vidalia/res/flags/cy.png
index c8d32b1..521588c 100644
Binary files a/src/vidalia/res/flags/cy.png and b/src/vidalia/res/flags/cy.png differ
diff --git a/src/vidalia/res/flags/cz.png b/src/vidalia/res/flags/cz.png
index 69157da..8987b9b 100644
Binary files a/src/vidalia/res/flags/cz.png and b/src/vidalia/res/flags/cz.png differ
diff --git a/src/vidalia/res/flags/de.png b/src/vidalia/res/flags/de.png
index 3e4fa43..81f5bee 100644
Binary files a/src/vidalia/res/flags/de.png and b/src/vidalia/res/flags/de.png differ
diff --git a/src/vidalia/res/flags/dj.png b/src/vidalia/res/flags/dj.png
new file mode 100644
index 0000000..331fa26
Binary files /dev/null and b/src/vidalia/res/flags/dj.png differ
diff --git a/src/vidalia/res/flags/dk.png b/src/vidalia/res/flags/dk.png
index ba86668..61f9343 100644
Binary files a/src/vidalia/res/flags/dk.png and b/src/vidalia/res/flags/dk.png differ
diff --git a/src/vidalia/res/flags/dm.png b/src/vidalia/res/flags/dm.png
new file mode 100644
index 0000000..794fd52
Binary files /dev/null and b/src/vidalia/res/flags/dm.png differ
diff --git a/src/vidalia/res/flags/do.png b/src/vidalia/res/flags/do.png
new file mode 100644
index 0000000..78e33fb
Binary files /dev/null and b/src/vidalia/res/flags/do.png differ
diff --git a/src/vidalia/res/flags/dz.png b/src/vidalia/res/flags/dz.png
index fb4e7b9..8c9bf94 100644
Binary files a/src/vidalia/res/flags/dz.png and b/src/vidalia/res/flags/dz.png differ
diff --git a/src/vidalia/res/flags/ec.png b/src/vidalia/res/flags/ec.png
index 5da356a..4d0e7cf 100644
Binary files a/src/vidalia/res/flags/ec.png and b/src/vidalia/res/flags/ec.png differ
diff --git a/src/vidalia/res/flags/ee.png b/src/vidalia/res/flags/ee.png
index e5fe7f6..f8c298e 100644
Binary files a/src/vidalia/res/flags/ee.png and b/src/vidalia/res/flags/ee.png differ
diff --git a/src/vidalia/res/flags/eg.png b/src/vidalia/res/flags/eg.png
index 676be9d..971864e 100644
Binary files a/src/vidalia/res/flags/eg.png and b/src/vidalia/res/flags/eg.png differ
diff --git a/src/vidalia/res/flags/eh.png b/src/vidalia/res/flags/eh.png
new file mode 100644
index 0000000..98a4d2b
Binary files /dev/null and b/src/vidalia/res/flags/eh.png differ
diff --git a/src/vidalia/res/flags/er.png b/src/vidalia/res/flags/er.png
index 6d34be1..9c73973 100644
Binary files a/src/vidalia/res/flags/er.png and b/src/vidalia/res/flags/er.png differ
diff --git a/src/vidalia/res/flags/es.png b/src/vidalia/res/flags/es.png
index 6219730..deae319 100644
Binary files a/src/vidalia/res/flags/es.png and b/src/vidalia/res/flags/es.png differ
diff --git a/src/vidalia/res/flags/et.png b/src/vidalia/res/flags/et.png
index e54a004..3903e54 100644
Binary files a/src/vidalia/res/flags/et.png and b/src/vidalia/res/flags/et.png differ
diff --git a/src/vidalia/res/flags/eu.png b/src/vidalia/res/flags/eu.png
index aebdae1..ef8669a 100644
Binary files a/src/vidalia/res/flags/eu.png and b/src/vidalia/res/flags/eu.png differ
diff --git a/src/vidalia/res/flags/fi.png b/src/vidalia/res/flags/fi.png
index d515674..9d05d07 100644
Binary files a/src/vidalia/res/flags/fi.png and b/src/vidalia/res/flags/fi.png differ
diff --git a/src/vidalia/res/flags/fj.png b/src/vidalia/res/flags/fj.png
index 0b390f4..df0a329 100644
Binary files a/src/vidalia/res/flags/fj.png and b/src/vidalia/res/flags/fj.png differ
diff --git a/src/vidalia/res/flags/fk.png b/src/vidalia/res/flags/fk.png
new file mode 100644
index 0000000..dd95ec3
Binary files /dev/null and b/src/vidalia/res/flags/fk.png differ
diff --git a/src/vidalia/res/flags/fm.png b/src/vidalia/res/flags/fm.png
new file mode 100644
index 0000000..114eb4f
Binary files /dev/null and b/src/vidalia/res/flags/fm.png differ
diff --git a/src/vidalia/res/flags/fo.png b/src/vidalia/res/flags/fo.png
index 6e1f438..c42e693 100644
Binary files a/src/vidalia/res/flags/fo.png and b/src/vidalia/res/flags/fo.png differ
diff --git a/src/vidalia/res/flags/fr.png b/src/vidalia/res/flags/fr.png
index 7102174..f7863ee 100644
Binary files a/src/vidalia/res/flags/fr.png and b/src/vidalia/res/flags/fr.png differ
diff --git a/src/vidalia/res/flags/ga.png b/src/vidalia/res/flags/ga.png
index d913b2a..6a38e02 100644
Binary files a/src/vidalia/res/flags/ga.png and b/src/vidalia/res/flags/ga.png differ
diff --git a/src/vidalia/res/flags/gb.png b/src/vidalia/res/flags/gb.png
index a2ad00c..3542857 100644
Binary files a/src/vidalia/res/flags/gb.png and b/src/vidalia/res/flags/gb.png differ
diff --git a/src/vidalia/res/flags/gd.png b/src/vidalia/res/flags/gd.png
new file mode 100644
index 0000000..8705625
Binary files /dev/null and b/src/vidalia/res/flags/gd.png differ
diff --git a/src/vidalia/res/flags/ge.png b/src/vidalia/res/flags/ge.png
index bc55add..f0870da 100644
Binary files a/src/vidalia/res/flags/ge.png and b/src/vidalia/res/flags/ge.png differ
diff --git a/src/vidalia/res/flags/gf.png b/src/vidalia/res/flags/gf.png
new file mode 100644
index 0000000..a88dcef
Binary files /dev/null and b/src/vidalia/res/flags/gf.png differ
diff --git a/src/vidalia/res/flags/gg.png b/src/vidalia/res/flags/gg.png
new file mode 100644
index 0000000..12f12b7
Binary files /dev/null and b/src/vidalia/res/flags/gg.png differ
diff --git a/src/vidalia/res/flags/gh.png b/src/vidalia/res/flags/gh.png
new file mode 100644
index 0000000..8d60865
Binary files /dev/null and b/src/vidalia/res/flags/gh.png differ
diff --git a/src/vidalia/res/flags/gi.png b/src/vidalia/res/flags/gi.png
index 82d49a9..14032d6 100644
Binary files a/src/vidalia/res/flags/gi.png and b/src/vidalia/res/flags/gi.png differ
diff --git a/src/vidalia/res/flags/gl.png b/src/vidalia/res/flags/gl.png
index cba805a..48e4d9e 100644
Binary files a/src/vidalia/res/flags/gl.png and b/src/vidalia/res/flags/gl.png differ
diff --git a/src/vidalia/res/flags/gm.png b/src/vidalia/res/flags/gm.png
new file mode 100644
index 0000000..3ad65e9
Binary files /dev/null and b/src/vidalia/res/flags/gm.png differ
diff --git a/src/vidalia/res/flags/gn.png b/src/vidalia/res/flags/gn.png
new file mode 100644
index 0000000..b12383e
Binary files /dev/null and b/src/vidalia/res/flags/gn.png differ
diff --git a/src/vidalia/res/flags/gp.png b/src/vidalia/res/flags/gp.png
index 887316a..742390b 100644
Binary files a/src/vidalia/res/flags/gp.png and b/src/vidalia/res/flags/gp.png differ
diff --git a/src/vidalia/res/flags/gq.png b/src/vidalia/res/flags/gq.png
new file mode 100644
index 0000000..bd44e93
Binary files /dev/null and b/src/vidalia/res/flags/gq.png differ
diff --git a/src/vidalia/res/flags/gr.png b/src/vidalia/res/flags/gr.png
index 7803cb4..5fd7010 100644
Binary files a/src/vidalia/res/flags/gr.png and b/src/vidalia/res/flags/gr.png differ
diff --git a/src/vidalia/res/flags/gs.png b/src/vidalia/res/flags/gs.png
new file mode 100644
index 0000000..e0f8673
Binary files /dev/null and b/src/vidalia/res/flags/gs.png differ
diff --git a/src/vidalia/res/flags/gt.png b/src/vidalia/res/flags/gt.png
index 31c79c2..3cd36d6 100644
Binary files a/src/vidalia/res/flags/gt.png and b/src/vidalia/res/flags/gt.png differ
diff --git a/src/vidalia/res/flags/gu.png b/src/vidalia/res/flags/gu.png
index c842809..0a5351c 100644
Binary files a/src/vidalia/res/flags/gu.png and b/src/vidalia/res/flags/gu.png differ
diff --git a/src/vidalia/res/flags/gw.png b/src/vidalia/res/flags/gw.png
new file mode 100644
index 0000000..e4d6333
Binary files /dev/null and b/src/vidalia/res/flags/gw.png differ
diff --git a/src/vidalia/res/flags/gy.png b/src/vidalia/res/flags/gy.png
index 8e56db0..48acf0c 100644
Binary files a/src/vidalia/res/flags/gy.png and b/src/vidalia/res/flags/gy.png differ
diff --git a/src/vidalia/res/flags/hk.png b/src/vidalia/res/flags/hk.png
index fe3e357..1e0c80f 100644
Binary files a/src/vidalia/res/flags/hk.png and b/src/vidalia/res/flags/hk.png differ
diff --git a/src/vidalia/res/flags/hm.png b/src/vidalia/res/flags/hm.png
new file mode 100644
index 0000000..b6e9ad1
Binary files /dev/null and b/src/vidalia/res/flags/hm.png differ
diff --git a/src/vidalia/res/flags/hn.png b/src/vidalia/res/flags/hn.png
new file mode 100644
index 0000000..5cd9019
Binary files /dev/null and b/src/vidalia/res/flags/hn.png differ
diff --git a/src/vidalia/res/flags/hr.png b/src/vidalia/res/flags/hr.png
index c6b8ce7..726a689 100644
Binary files a/src/vidalia/res/flags/hr.png and b/src/vidalia/res/flags/hr.png differ
diff --git a/src/vidalia/res/flags/ht.png b/src/vidalia/res/flags/ht.png
index 5b67b34..a5962fa 100644
Binary files a/src/vidalia/res/flags/ht.png and b/src/vidalia/res/flags/ht.png differ
diff --git a/src/vidalia/res/flags/hu.png b/src/vidalia/res/flags/hu.png
index 9eac7cf..df2ff03 100644
Binary files a/src/vidalia/res/flags/hu.png and b/src/vidalia/res/flags/hu.png differ
diff --git a/src/vidalia/res/flags/id.png b/src/vidalia/res/flags/id.png
index 57de136..02c9b3b 100644
Binary files a/src/vidalia/res/flags/id.png and b/src/vidalia/res/flags/id.png differ
diff --git a/src/vidalia/res/flags/ie.png b/src/vidalia/res/flags/ie.png
index 692c6b0..db98844 100644
Binary files a/src/vidalia/res/flags/ie.png and b/src/vidalia/res/flags/ie.png differ
diff --git a/src/vidalia/res/flags/il.png b/src/vidalia/res/flags/il.png
index 8acc027..64f4669 100644
Binary files a/src/vidalia/res/flags/il.png and b/src/vidalia/res/flags/il.png differ
diff --git a/src/vidalia/res/flags/im.png b/src/vidalia/res/flags/im.png
new file mode 100644
index 0000000..867db64
Binary files /dev/null and b/src/vidalia/res/flags/im.png differ
diff --git a/src/vidalia/res/flags/in.png b/src/vidalia/res/flags/in.png
index 9b7dc40..d0bba11 100644
Binary files a/src/vidalia/res/flags/in.png and b/src/vidalia/res/flags/in.png differ
diff --git a/src/vidalia/res/flags/io.png b/src/vidalia/res/flags/io.png
new file mode 100644
index 0000000..b36a84f
Binary files /dev/null and b/src/vidalia/res/flags/io.png differ
diff --git a/src/vidalia/res/flags/iq.png b/src/vidalia/res/flags/iq.png
index 131af96..116593d 100644
Binary files a/src/vidalia/res/flags/iq.png and b/src/vidalia/res/flags/iq.png differ
diff --git a/src/vidalia/res/flags/ir.png b/src/vidalia/res/flags/ir.png
index 4495d84..656dc83 100644
Binary files a/src/vidalia/res/flags/ir.png and b/src/vidalia/res/flags/ir.png differ
diff --git a/src/vidalia/res/flags/is.png b/src/vidalia/res/flags/is.png
index a8cd1d4..3439561 100644
Binary files a/src/vidalia/res/flags/is.png and b/src/vidalia/res/flags/is.png differ
diff --git a/src/vidalia/res/flags/it.png b/src/vidalia/res/flags/it.png
index 0d68791..5d0c801 100644
Binary files a/src/vidalia/res/flags/it.png and b/src/vidalia/res/flags/it.png differ
diff --git a/src/vidalia/res/flags/je.png b/src/vidalia/res/flags/je.png
new file mode 100644
index 0000000..7bfcc42
Binary files /dev/null and b/src/vidalia/res/flags/je.png differ
diff --git a/src/vidalia/res/flags/jm.png b/src/vidalia/res/flags/jm.png
index 2e3db29..86a3f4b 100644
Binary files a/src/vidalia/res/flags/jm.png and b/src/vidalia/res/flags/jm.png differ
diff --git a/src/vidalia/res/flags/jo.png b/src/vidalia/res/flags/jo.png
index 8f1270d..103344d 100644
Binary files a/src/vidalia/res/flags/jo.png and b/src/vidalia/res/flags/jo.png differ
diff --git a/src/vidalia/res/flags/jp.png b/src/vidalia/res/flags/jp.png
index b656389..5026d41 100644
Binary files a/src/vidalia/res/flags/jp.png and b/src/vidalia/res/flags/jp.png differ
diff --git a/src/vidalia/res/flags/ke.png b/src/vidalia/res/flags/ke.png
index 69f742b..c818bd4 100644
Binary files a/src/vidalia/res/flags/ke.png and b/src/vidalia/res/flags/ke.png differ
diff --git a/src/vidalia/res/flags/kg.png b/src/vidalia/res/flags/kg.png
index c455107..7619f35 100644
Binary files a/src/vidalia/res/flags/kg.png and b/src/vidalia/res/flags/kg.png differ
diff --git a/src/vidalia/res/flags/kh.png b/src/vidalia/res/flags/kh.png
index b80b8c4..e842e45 100644
Binary files a/src/vidalia/res/flags/kh.png and b/src/vidalia/res/flags/kh.png differ
diff --git a/src/vidalia/res/flags/ki.png b/src/vidalia/res/flags/ki.png
index a3eac22..294d1ea 100644
Binary files a/src/vidalia/res/flags/ki.png and b/src/vidalia/res/flags/ki.png differ
diff --git a/src/vidalia/res/flags/km.png b/src/vidalia/res/flags/km.png
new file mode 100644
index 0000000..8c8cf19
Binary files /dev/null and b/src/vidalia/res/flags/km.png differ
diff --git a/src/vidalia/res/flags/kn.png b/src/vidalia/res/flags/kn.png
new file mode 100644
index 0000000..e573100
Binary files /dev/null and b/src/vidalia/res/flags/kn.png differ
diff --git a/src/vidalia/res/flags/kp.png b/src/vidalia/res/flags/kp.png
index 7bce15c..6f0f496 100644
Binary files a/src/vidalia/res/flags/kp.png and b/src/vidalia/res/flags/kp.png differ
diff --git a/src/vidalia/res/flags/kr.png b/src/vidalia/res/flags/kr.png
index e2edef5..3fa3026 100644
Binary files a/src/vidalia/res/flags/kr.png and b/src/vidalia/res/flags/kr.png differ
diff --git a/src/vidalia/res/flags/kw.png b/src/vidalia/res/flags/kw.png
index 8654623..83e4c3f 100644
Binary files a/src/vidalia/res/flags/kw.png and b/src/vidalia/res/flags/kw.png differ
diff --git a/src/vidalia/res/flags/ky.png b/src/vidalia/res/flags/ky.png
index d7f8a81..0816456 100644
Binary files a/src/vidalia/res/flags/ky.png and b/src/vidalia/res/flags/ky.png differ
diff --git a/src/vidalia/res/flags/kz.png b/src/vidalia/res/flags/kz.png
index aab3cfb..c81803f 100644
Binary files a/src/vidalia/res/flags/kz.png and b/src/vidalia/res/flags/kz.png differ
diff --git a/src/vidalia/res/flags/la.png b/src/vidalia/res/flags/la.png
new file mode 100644
index 0000000..6ce46b8
Binary files /dev/null and b/src/vidalia/res/flags/la.png differ
diff --git a/src/vidalia/res/flags/lb.png b/src/vidalia/res/flags/lb.png
index c20823c..684dd59 100644
Binary files a/src/vidalia/res/flags/lb.png and b/src/vidalia/res/flags/lb.png differ
diff --git a/src/vidalia/res/flags/lc.png b/src/vidalia/res/flags/lc.png
index ba202aa..0b7c709 100644
Binary files a/src/vidalia/res/flags/lc.png and b/src/vidalia/res/flags/lc.png differ
diff --git a/src/vidalia/res/flags/li.png b/src/vidalia/res/flags/li.png
new file mode 100644
index 0000000..7236eea
Binary files /dev/null and b/src/vidalia/res/flags/li.png differ
diff --git a/src/vidalia/res/flags/lk.png b/src/vidalia/res/flags/lk.png
index e8610a0..5e6e23a 100644
Binary files a/src/vidalia/res/flags/lk.png and b/src/vidalia/res/flags/lk.png differ
diff --git a/src/vidalia/res/flags/lr.png b/src/vidalia/res/flags/lr.png
new file mode 100644
index 0000000..cc76a79
Binary files /dev/null and b/src/vidalia/res/flags/lr.png differ
diff --git a/src/vidalia/res/flags/ls.png b/src/vidalia/res/flags/ls.png
new file mode 100644
index 0000000..06c5636
Binary files /dev/null and b/src/vidalia/res/flags/ls.png differ
diff --git a/src/vidalia/res/flags/lt.png b/src/vidalia/res/flags/lt.png
index 553b510..b362877 100644
Binary files a/src/vidalia/res/flags/lt.png and b/src/vidalia/res/flags/lt.png differ
diff --git a/src/vidalia/res/flags/lu.png b/src/vidalia/res/flags/lu.png
index ca3c4e4..eb9e46a 100644
Binary files a/src/vidalia/res/flags/lu.png and b/src/vidalia/res/flags/lu.png differ
diff --git a/src/vidalia/res/flags/lv.png b/src/vidalia/res/flags/lv.png
index 3f250a6..e675f31 100644
Binary files a/src/vidalia/res/flags/lv.png and b/src/vidalia/res/flags/lv.png differ
diff --git a/src/vidalia/res/flags/ly.png b/src/vidalia/res/flags/ly.png
index 1bf8ede..d7b0beb 100644
Binary files a/src/vidalia/res/flags/ly.png and b/src/vidalia/res/flags/ly.png differ
diff --git a/src/vidalia/res/flags/ma.png b/src/vidalia/res/flags/ma.png
index d98045e..a77731c 100644
Binary files a/src/vidalia/res/flags/ma.png and b/src/vidalia/res/flags/ma.png differ
diff --git a/src/vidalia/res/flags/mc.png b/src/vidalia/res/flags/mc.png
index d398b4a..02c9b3b 100644
Binary files a/src/vidalia/res/flags/mc.png and b/src/vidalia/res/flags/mc.png differ
diff --git a/src/vidalia/res/flags/md.png b/src/vidalia/res/flags/md.png
index 81c6d19..d7cb653 100644
Binary files a/src/vidalia/res/flags/md.png and b/src/vidalia/res/flags/md.png differ
diff --git a/src/vidalia/res/flags/me.png b/src/vidalia/res/flags/me.png
new file mode 100644
index 0000000..5abbdbb
Binary files /dev/null and b/src/vidalia/res/flags/me.png differ
diff --git a/src/vidalia/res/flags/mf.png b/src/vidalia/res/flags/mf.png
new file mode 100644
index 0000000..b7af15a
Binary files /dev/null and b/src/vidalia/res/flags/mf.png differ
diff --git a/src/vidalia/res/flags/mg.png b/src/vidalia/res/flags/mg.png
index 67753ea..e670827 100644
Binary files a/src/vidalia/res/flags/mg.png and b/src/vidalia/res/flags/mg.png differ
diff --git a/src/vidalia/res/flags/mh.png b/src/vidalia/res/flags/mh.png
new file mode 100644
index 0000000..fc68177
Binary files /dev/null and b/src/vidalia/res/flags/mh.png differ
diff --git a/src/vidalia/res/flags/mk.png b/src/vidalia/res/flags/mk.png
index 0de419c..49ae623 100644
Binary files a/src/vidalia/res/flags/mk.png and b/src/vidalia/res/flags/mk.png differ
diff --git a/src/vidalia/res/flags/ml.png b/src/vidalia/res/flags/ml.png
new file mode 100644
index 0000000..20d776b
Binary files /dev/null and b/src/vidalia/res/flags/ml.png differ
diff --git a/src/vidalia/res/flags/mm.png b/src/vidalia/res/flags/mm.png
new file mode 100644
index 0000000..c10ec90
Binary files /dev/null and b/src/vidalia/res/flags/mm.png differ
diff --git a/src/vidalia/res/flags/mn.png b/src/vidalia/res/flags/mn.png
index 917fd18..3a5bcac 100644
Binary files a/src/vidalia/res/flags/mn.png and b/src/vidalia/res/flags/mn.png differ
diff --git a/src/vidalia/res/flags/mo.png b/src/vidalia/res/flags/mo.png
index b51ede3..46f4562 100644
Binary files a/src/vidalia/res/flags/mo.png and b/src/vidalia/res/flags/mo.png differ
diff --git a/src/vidalia/res/flags/mp.png b/src/vidalia/res/flags/mp.png
index 8260b90..2eba39d 100644
Binary files a/src/vidalia/res/flags/mp.png and b/src/vidalia/res/flags/mp.png differ
diff --git a/src/vidalia/res/flags/mq.png b/src/vidalia/res/flags/mq.png
new file mode 100644
index 0000000..ae4df57
Binary files /dev/null and b/src/vidalia/res/flags/mq.png differ
diff --git a/src/vidalia/res/flags/mr.png b/src/vidalia/res/flags/mr.png
new file mode 100644
index 0000000..39c729a
Binary files /dev/null and b/src/vidalia/res/flags/mr.png differ
diff --git a/src/vidalia/res/flags/ms.png b/src/vidalia/res/flags/ms.png
index 77e0d1b..b27335c 100644
Binary files a/src/vidalia/res/flags/ms.png and b/src/vidalia/res/flags/ms.png differ
diff --git a/src/vidalia/res/flags/mt.png b/src/vidalia/res/flags/mt.png
index e0b456f..8ce3af3 100644
Binary files a/src/vidalia/res/flags/mt.png and b/src/vidalia/res/flags/mt.png differ
diff --git a/src/vidalia/res/flags/mu.png b/src/vidalia/res/flags/mu.png
new file mode 100644
index 0000000..e9d8808
Binary files /dev/null and b/src/vidalia/res/flags/mu.png differ
diff --git a/src/vidalia/res/flags/mv.png b/src/vidalia/res/flags/mv.png
new file mode 100644
index 0000000..a1bcb64
Binary files /dev/null and b/src/vidalia/res/flags/mv.png differ
diff --git a/src/vidalia/res/flags/mw.png b/src/vidalia/res/flags/mw.png
new file mode 100644
index 0000000..c6e0626
Binary files /dev/null and b/src/vidalia/res/flags/mw.png differ
diff --git a/src/vidalia/res/flags/mx.png b/src/vidalia/res/flags/mx.png
index 67db550..04317c2 100644
Binary files a/src/vidalia/res/flags/mx.png and b/src/vidalia/res/flags/mx.png differ
diff --git a/src/vidalia/res/flags/my.png b/src/vidalia/res/flags/my.png
index c95ae6f..5d07170 100644
Binary files a/src/vidalia/res/flags/my.png and b/src/vidalia/res/flags/my.png differ
diff --git a/src/vidalia/res/flags/mz.png b/src/vidalia/res/flags/mz.png
index 3ec9414..c5c2dd6 100644
Binary files a/src/vidalia/res/flags/mz.png and b/src/vidalia/res/flags/mz.png differ
diff --git a/src/vidalia/res/flags/na.png b/src/vidalia/res/flags/na.png
index f87051b..3b90654 100644
Binary files a/src/vidalia/res/flags/na.png and b/src/vidalia/res/flags/na.png differ
diff --git a/src/vidalia/res/flags/nc.png b/src/vidalia/res/flags/nc.png
index ddd33f3..10efee8 100644
Binary files a/src/vidalia/res/flags/nc.png and b/src/vidalia/res/flags/nc.png differ
diff --git a/src/vidalia/res/flags/ne.png b/src/vidalia/res/flags/ne.png
new file mode 100644
index 0000000..3fe9546
Binary files /dev/null and b/src/vidalia/res/flags/ne.png differ
diff --git a/src/vidalia/res/flags/nf.png b/src/vidalia/res/flags/nf.png
index 2b7d702..f992e88 100644
Binary files a/src/vidalia/res/flags/nf.png and b/src/vidalia/res/flags/nf.png differ
diff --git a/src/vidalia/res/flags/ng.png b/src/vidalia/res/flags/ng.png
new file mode 100644
index 0000000..e95039f
Binary files /dev/null and b/src/vidalia/res/flags/ng.png differ
diff --git a/src/vidalia/res/flags/ni.png b/src/vidalia/res/flags/ni.png
new file mode 100644
index 0000000..ae70194
Binary files /dev/null and b/src/vidalia/res/flags/ni.png differ
diff --git a/src/vidalia/res/flags/nl.png b/src/vidalia/res/flags/nl.png
index 3542a57..4736b63 100644
Binary files a/src/vidalia/res/flags/nl.png and b/src/vidalia/res/flags/nl.png differ
diff --git a/src/vidalia/res/flags/no.png b/src/vidalia/res/flags/no.png
index ededb0d..b773600 100644
Binary files a/src/vidalia/res/flags/no.png and b/src/vidalia/res/flags/no.png differ
diff --git a/src/vidalia/res/flags/np.png b/src/vidalia/res/flags/np.png
index d98045e..42ba009 100644
Binary files a/src/vidalia/res/flags/np.png and b/src/vidalia/res/flags/np.png differ
diff --git a/src/vidalia/res/flags/nr.png b/src/vidalia/res/flags/nr.png
index 642b2f6..928ab92 100644
Binary files a/src/vidalia/res/flags/nr.png and b/src/vidalia/res/flags/nr.png differ
diff --git a/src/vidalia/res/flags/nu.png b/src/vidalia/res/flags/nu.png
new file mode 100644
index 0000000..0e2abf0
Binary files /dev/null and b/src/vidalia/res/flags/nu.png differ
diff --git a/src/vidalia/res/flags/nz.png b/src/vidalia/res/flags/nz.png
index c5a5c9f..5245e27 100644
Binary files a/src/vidalia/res/flags/nz.png and b/src/vidalia/res/flags/nz.png differ
diff --git a/src/vidalia/res/flags/om.png b/src/vidalia/res/flags/om.png
index 814c1d9..357062c 100644
Binary files a/src/vidalia/res/flags/om.png and b/src/vidalia/res/flags/om.png differ
diff --git a/src/vidalia/res/flags/pa.png b/src/vidalia/res/flags/pa.png
index fd99701..5a9f3d4 100644
Binary files a/src/vidalia/res/flags/pa.png and b/src/vidalia/res/flags/pa.png differ
diff --git a/src/vidalia/res/flags/pe.png b/src/vidalia/res/flags/pe.png
index ac0b03f..29054b4 100644
Binary files a/src/vidalia/res/flags/pe.png and b/src/vidalia/res/flags/pe.png differ
diff --git a/src/vidalia/res/flags/pf.png b/src/vidalia/res/flags/pf.png
index 11434d0..ebe3418 100644
Binary files a/src/vidalia/res/flags/pf.png and b/src/vidalia/res/flags/pf.png differ
diff --git a/src/vidalia/res/flags/pg.png b/src/vidalia/res/flags/pg.png
new file mode 100644
index 0000000..d9da2d2
Binary files /dev/null and b/src/vidalia/res/flags/pg.png differ
diff --git a/src/vidalia/res/flags/ph.png b/src/vidalia/res/flags/ph.png
index a5b331f..d8a21db 100644
Binary files a/src/vidalia/res/flags/ph.png and b/src/vidalia/res/flags/ph.png differ
diff --git a/src/vidalia/res/flags/pk.png b/src/vidalia/res/flags/pk.png
index 922ab5d..0ca0e54 100644
Binary files a/src/vidalia/res/flags/pk.png and b/src/vidalia/res/flags/pk.png differ
diff --git a/src/vidalia/res/flags/pl.png b/src/vidalia/res/flags/pl.png
index 8f89576..10a7b8f 100644
Binary files a/src/vidalia/res/flags/pl.png and b/src/vidalia/res/flags/pl.png differ
diff --git a/src/vidalia/res/flags/pm.png b/src/vidalia/res/flags/pm.png
index 9ce2d60..8a06ab8 100644
Binary files a/src/vidalia/res/flags/pm.png and b/src/vidalia/res/flags/pm.png differ
diff --git a/src/vidalia/res/flags/pn.png b/src/vidalia/res/flags/pn.png
new file mode 100644
index 0000000..1df26af
Binary files /dev/null and b/src/vidalia/res/flags/pn.png differ
diff --git a/src/vidalia/res/flags/pr.png b/src/vidalia/res/flags/pr.png
index 98c28b9..dec21e9 100644
Binary files a/src/vidalia/res/flags/pr.png and b/src/vidalia/res/flags/pr.png differ
diff --git a/src/vidalia/res/flags/ps.png b/src/vidalia/res/flags/ps.png
new file mode 100644
index 0000000..605746c
Binary files /dev/null and b/src/vidalia/res/flags/ps.png differ
diff --git a/src/vidalia/res/flags/pt.png b/src/vidalia/res/flags/pt.png
index 9d3aa9b..874a756 100644
Binary files a/src/vidalia/res/flags/pt.png and b/src/vidalia/res/flags/pt.png differ
diff --git a/src/vidalia/res/flags/pw.png b/src/vidalia/res/flags/pw.png
new file mode 100644
index 0000000..d4bfb51
Binary files /dev/null and b/src/vidalia/res/flags/pw.png differ
diff --git a/src/vidalia/res/flags/py.png b/src/vidalia/res/flags/py.png
index b43dfc2..a7968c0 100644
Binary files a/src/vidalia/res/flags/py.png and b/src/vidalia/res/flags/py.png differ
diff --git a/src/vidalia/res/flags/qa.png b/src/vidalia/res/flags/qa.png
index 327c604..5a2ef3d 100644
Binary files a/src/vidalia/res/flags/qa.png and b/src/vidalia/res/flags/qa.png differ
diff --git a/src/vidalia/res/flags/re.png b/src/vidalia/res/flags/re.png
new file mode 100644
index 0000000..4613b15
Binary files /dev/null and b/src/vidalia/res/flags/re.png differ
diff --git a/src/vidalia/res/flags/ro.png b/src/vidalia/res/flags/ro.png
index ef0d190..20087fd 100644
Binary files a/src/vidalia/res/flags/ro.png and b/src/vidalia/res/flags/ro.png differ
diff --git a/src/vidalia/res/flags/rs.png b/src/vidalia/res/flags/rs.png
new file mode 100644
index 0000000..4db8055
Binary files /dev/null and b/src/vidalia/res/flags/rs.png differ
diff --git a/src/vidalia/res/flags/ru.png b/src/vidalia/res/flags/ru.png
index d0ce881..2d750f8 100644
Binary files a/src/vidalia/res/flags/ru.png and b/src/vidalia/res/flags/ru.png differ
diff --git a/src/vidalia/res/flags/rw.png b/src/vidalia/res/flags/rw.png
new file mode 100644
index 0000000..1bdaa5b
Binary files /dev/null and b/src/vidalia/res/flags/rw.png differ
diff --git a/src/vidalia/res/flags/sa.png b/src/vidalia/res/flags/sa.png
index f30f75e..4abe18a 100644
Binary files a/src/vidalia/res/flags/sa.png and b/src/vidalia/res/flags/sa.png differ
diff --git a/src/vidalia/res/flags/sb.png b/src/vidalia/res/flags/sb.png
index ce219d1..3cbb73b 100644
Binary files a/src/vidalia/res/flags/sb.png and b/src/vidalia/res/flags/sb.png differ
diff --git a/src/vidalia/res/flags/sc.png b/src/vidalia/res/flags/sc.png
new file mode 100644
index 0000000..bc34a02
Binary files /dev/null and b/src/vidalia/res/flags/sc.png differ
diff --git a/src/vidalia/res/flags/sd.png b/src/vidalia/res/flags/sd.png
index 01a54cb..d9d6e5c 100644
Binary files a/src/vidalia/res/flags/sd.png and b/src/vidalia/res/flags/sd.png differ
diff --git a/src/vidalia/res/flags/se.png b/src/vidalia/res/flags/se.png
index 463382f..a26499b 100644
Binary files a/src/vidalia/res/flags/se.png and b/src/vidalia/res/flags/se.png differ
diff --git a/src/vidalia/res/flags/sg.png b/src/vidalia/res/flags/sg.png
index ef5a448..83beb94 100644
Binary files a/src/vidalia/res/flags/sg.png and b/src/vidalia/res/flags/sg.png differ
diff --git a/src/vidalia/res/flags/sh.png b/src/vidalia/res/flags/sh.png
new file mode 100644
index 0000000..8d3bf23
Binary files /dev/null and b/src/vidalia/res/flags/sh.png differ
diff --git a/src/vidalia/res/flags/si.png b/src/vidalia/res/flags/si.png
index 3f1c159..50be6af 100644
Binary files a/src/vidalia/res/flags/si.png and b/src/vidalia/res/flags/si.png differ
diff --git a/src/vidalia/res/flags/sj.png b/src/vidalia/res/flags/sj.png
new file mode 100644
index 0000000..b773600
Binary files /dev/null and b/src/vidalia/res/flags/sj.png differ
diff --git a/src/vidalia/res/flags/sk.png b/src/vidalia/res/flags/sk.png
index 6f1bc96..e864fa2 100644
Binary files a/src/vidalia/res/flags/sk.png and b/src/vidalia/res/flags/sk.png differ
diff --git a/src/vidalia/res/flags/sl.png b/src/vidalia/res/flags/sl.png
index 4daf7d4..c5ab8a5 100644
Binary files a/src/vidalia/res/flags/sl.png and b/src/vidalia/res/flags/sl.png differ
diff --git a/src/vidalia/res/flags/sm.png b/src/vidalia/res/flags/sm.png
index d3c3691..28caa09 100644
Binary files a/src/vidalia/res/flags/sm.png and b/src/vidalia/res/flags/sm.png differ
diff --git a/src/vidalia/res/flags/sn.png b/src/vidalia/res/flags/sn.png
new file mode 100644
index 0000000..7792b03
Binary files /dev/null and b/src/vidalia/res/flags/sn.png differ
diff --git a/src/vidalia/res/flags/so.png b/src/vidalia/res/flags/so.png
index 175d407..4d05e52 100644
Binary files a/src/vidalia/res/flags/so.png and b/src/vidalia/res/flags/so.png differ
diff --git a/src/vidalia/res/flags/sr.png b/src/vidalia/res/flags/sr.png
new file mode 100644
index 0000000..2159e01
Binary files /dev/null and b/src/vidalia/res/flags/sr.png differ
diff --git a/src/vidalia/res/flags/st.png b/src/vidalia/res/flags/st.png
new file mode 100644
index 0000000..1bccc1a
Binary files /dev/null and b/src/vidalia/res/flags/st.png differ
diff --git a/src/vidalia/res/flags/sv.png b/src/vidalia/res/flags/sv.png
new file mode 100644
index 0000000..7722f4b
Binary files /dev/null and b/src/vidalia/res/flags/sv.png differ
diff --git a/src/vidalia/res/flags/sy.png b/src/vidalia/res/flags/sy.png
index d98045e..a12fa21 100644
Binary files a/src/vidalia/res/flags/sy.png and b/src/vidalia/res/flags/sy.png differ
diff --git a/src/vidalia/res/flags/sz.png b/src/vidalia/res/flags/sz.png
new file mode 100644
index 0000000..aca0675
Binary files /dev/null and b/src/vidalia/res/flags/sz.png differ
diff --git a/src/vidalia/res/flags/tc.png b/src/vidalia/res/flags/tc.png
index 56dff7a..cbdb899 100644
Binary files a/src/vidalia/res/flags/tc.png and b/src/vidalia/res/flags/tc.png differ
diff --git a/src/vidalia/res/flags/td.png b/src/vidalia/res/flags/td.png
new file mode 100644
index 0000000..3edd20b
Binary files /dev/null and b/src/vidalia/res/flags/td.png differ
diff --git a/src/vidalia/res/flags/tf.png b/src/vidalia/res/flags/tf.png
new file mode 100644
index 0000000..e2bb58d
Binary files /dev/null and b/src/vidalia/res/flags/tf.png differ
diff --git a/src/vidalia/res/flags/tg.png b/src/vidalia/res/flags/tg.png
index 19a8da2..c49c466 100644
Binary files a/src/vidalia/res/flags/tg.png and b/src/vidalia/res/flags/tg.png differ
diff --git a/src/vidalia/res/flags/th.png b/src/vidalia/res/flags/th.png
index ac82f5f..1d888f9 100644
Binary files a/src/vidalia/res/flags/th.png and b/src/vidalia/res/flags/th.png differ
diff --git a/src/vidalia/res/flags/tj.png b/src/vidalia/res/flags/tj.png
new file mode 100644
index 0000000..e063d43
Binary files /dev/null and b/src/vidalia/res/flags/tj.png differ
diff --git a/src/vidalia/res/flags/tk.png b/src/vidalia/res/flags/tk.png
new file mode 100644
index 0000000..9787413
Binary files /dev/null and b/src/vidalia/res/flags/tk.png differ
diff --git a/src/vidalia/res/flags/tl.png b/src/vidalia/res/flags/tl.png
new file mode 100644
index 0000000..a008b7e
Binary files /dev/null and b/src/vidalia/res/flags/tl.png differ
diff --git a/src/vidalia/res/flags/tm.png b/src/vidalia/res/flags/tm.png
new file mode 100644
index 0000000..4089f2e
Binary files /dev/null and b/src/vidalia/res/flags/tm.png differ
diff --git a/src/vidalia/res/flags/tn.png b/src/vidalia/res/flags/tn.png
index c03002c..166cec2 100644
Binary files a/src/vidalia/res/flags/tn.png and b/src/vidalia/res/flags/tn.png differ
diff --git a/src/vidalia/res/flags/to.png b/src/vidalia/res/flags/to.png
index be306fc..a9fd505 100644
Binary files a/src/vidalia/res/flags/to.png and b/src/vidalia/res/flags/to.png differ
diff --git a/src/vidalia/res/flags/tr.png b/src/vidalia/res/flags/tr.png
index f799e03..c10cdbd 100644
Binary files a/src/vidalia/res/flags/tr.png and b/src/vidalia/res/flags/tr.png differ
diff --git a/src/vidalia/res/flags/tt.png b/src/vidalia/res/flags/tt.png
index b6fddae..59c6566 100644
Binary files a/src/vidalia/res/flags/tt.png and b/src/vidalia/res/flags/tt.png differ
diff --git a/src/vidalia/res/flags/tv.png b/src/vidalia/res/flags/tv.png
index df60d61..06d4c0d 100644
Binary files a/src/vidalia/res/flags/tv.png and b/src/vidalia/res/flags/tv.png differ
diff --git a/src/vidalia/res/flags/tw.png b/src/vidalia/res/flags/tw.png
index 27de646..df42200 100644
Binary files a/src/vidalia/res/flags/tw.png and b/src/vidalia/res/flags/tw.png differ
diff --git a/src/vidalia/res/flags/tz.png b/src/vidalia/res/flags/tz.png
index 12832d6..ed9b3e2 100644
Binary files a/src/vidalia/res/flags/tz.png and b/src/vidalia/res/flags/tz.png differ
diff --git a/src/vidalia/res/flags/ua.png b/src/vidalia/res/flags/ua.png
index 9b560a3..c8fc5ab 100644
Binary files a/src/vidalia/res/flags/ua.png and b/src/vidalia/res/flags/ua.png differ
diff --git a/src/vidalia/res/flags/ug.png b/src/vidalia/res/flags/ug.png
index f01a8a8..4fae0ca 100644
Binary files a/src/vidalia/res/flags/ug.png and b/src/vidalia/res/flags/ug.png differ
diff --git a/src/vidalia/res/flags/um.png b/src/vidalia/res/flags/um.png
new file mode 100644
index 0000000..022aeeb
Binary files /dev/null and b/src/vidalia/res/flags/um.png differ
diff --git a/src/vidalia/res/flags/us.png b/src/vidalia/res/flags/us.png
index e203915..022aeeb 100644
Binary files a/src/vidalia/res/flags/us.png and b/src/vidalia/res/flags/us.png differ
diff --git a/src/vidalia/res/flags/uy.png b/src/vidalia/res/flags/uy.png
index 580f53e..6701b26 100644
Binary files a/src/vidalia/res/flags/uy.png and b/src/vidalia/res/flags/uy.png differ
diff --git a/src/vidalia/res/flags/uz.png b/src/vidalia/res/flags/uz.png
new file mode 100644
index 0000000..107ddc4
Binary files /dev/null and b/src/vidalia/res/flags/uz.png differ
diff --git a/src/vidalia/res/flags/va.png b/src/vidalia/res/flags/va.png
index 1517d77..6f6e033 100644
Binary files a/src/vidalia/res/flags/va.png and b/src/vidalia/res/flags/va.png differ
diff --git a/src/vidalia/res/flags/vc.png b/src/vidalia/res/flags/vc.png
new file mode 100644
index 0000000..1e0e20d
Binary files /dev/null and b/src/vidalia/res/flags/vc.png differ
diff --git a/src/vidalia/res/flags/ve.png b/src/vidalia/res/flags/ve.png
index 35a1b81..6f8a61e 100644
Binary files a/src/vidalia/res/flags/ve.png and b/src/vidalia/res/flags/ve.png differ
diff --git a/src/vidalia/res/flags/vg.png b/src/vidalia/res/flags/vg.png
index c841cbc..8c8a132 100644
Binary files a/src/vidalia/res/flags/vg.png and b/src/vidalia/res/flags/vg.png differ
diff --git a/src/vidalia/res/flags/vi.png b/src/vidalia/res/flags/vi.png
index 6152a6b..db4b526 100644
Binary files a/src/vidalia/res/flags/vi.png and b/src/vidalia/res/flags/vi.png differ
diff --git a/src/vidalia/res/flags/vn.png b/src/vidalia/res/flags/vn.png
index 175b652..4dde3d7 100644
Binary files a/src/vidalia/res/flags/vn.png and b/src/vidalia/res/flags/vn.png differ
diff --git a/src/vidalia/res/flags/vu.png b/src/vidalia/res/flags/vu.png
new file mode 100644
index 0000000..ca83105
Binary files /dev/null and b/src/vidalia/res/flags/vu.png differ
diff --git a/src/vidalia/res/flags/wf.png b/src/vidalia/res/flags/wf.png
new file mode 100644
index 0000000..1149100
Binary files /dev/null and b/src/vidalia/res/flags/wf.png differ
diff --git a/src/vidalia/res/flags/ws.png b/src/vidalia/res/flags/ws.png
index a912d36..ed9ea0e 100644
Binary files a/src/vidalia/res/flags/ws.png and b/src/vidalia/res/flags/ws.png differ
diff --git a/src/vidalia/res/flags/ye.png b/src/vidalia/res/flags/ye.png
index deab0e6..dcaa423 100644
Binary files a/src/vidalia/res/flags/ye.png and b/src/vidalia/res/flags/ye.png differ
diff --git a/src/vidalia/res/flags/yt.png b/src/vidalia/res/flags/yt.png
new file mode 100644
index 0000000..e81c622
Binary files /dev/null and b/src/vidalia/res/flags/yt.png differ
diff --git a/src/vidalia/res/flags/za.png b/src/vidalia/res/flags/za.png
index 3d07dbb..3f89499 100644
Binary files a/src/vidalia/res/flags/za.png and b/src/vidalia/res/flags/za.png differ
diff --git a/src/vidalia/res/flags/zm.png b/src/vidalia/res/flags/zm.png
new file mode 100644
index 0000000..f9e386f
Binary files /dev/null and b/src/vidalia/res/flags/zm.png differ
diff --git a/src/vidalia/res/flags/zw.png b/src/vidalia/res/flags/zw.png
index b1bf791..262e16e 100644
Binary files a/src/vidalia/res/flags/zw.png and b/src/vidalia/res/flags/zw.png differ
diff --git a/src/vidalia/res/vidalia.qrc b/src/vidalia/res/vidalia.qrc
index 7f84a17..c1c52c7 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